d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: support new representor naming format

Browse Source 
Kernel update [1] introduce new format of representors names.
This patch implements RFC [2], updating MLX5 PMD to support the new
format, while maintaining support of the existing format.

[1] https://github.com/torvalds/linux/commit/c12ecc2
[2] http://mails.dpdk.org/archives/dev/2019-March/125676.html

Signed-off-by: Dekel Peled <dekelp@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
This commit is contained in:
Dekel Peled 2019-03-17 08:23:03 +02:00 committed by Ferruh Yigit
parent 761186fc7b
commit b2f3a38101
3 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/mlx5/mlx5.h
View File

@ -60,6 +60,7 @@ enum {
struct mlx5_switch_info {
uint32_t master:1; /**< Master device. */
uint32_t representor:1; /**< Representor device. */
uint32_t port_name_new:1; /**< Rep. port name is in new format. */
int32_t port_name; /**< Representor port name. */
uint64_t switch_id; /**< Switch identifier. */
};
@ -300,6 +301,8 @@ unsigned int mlx5_dev_to_port_id(const struct rte_device *dev,
unsigned int port_list_n);
int mlx5_sysfs_switch_info(unsigned int ifindex,
struct mlx5_switch_info *info);
bool mlx5_translate_port_name(const char *port_name_in,
struct mlx5_switch_info *port_info_out);
/* mlx5_mac.c */

54
drivers/net/mlx5/mlx5_ethdev.c
View File

@ -1353,8 +1353,15 @@ int
mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
{
char ifname[IF_NAMESIZE];
char port_name[IF_NAMESIZE];
FILE *file;
struct mlx5_switch_info data = { .master = 0, };
struct mlx5_switch_info data = {
.master = 0,
.representor = 0,
.port_name_new = 0,
.port_name = 0,
.switch_id = 0,
};
bool port_name_set = false;
bool port_switch_id_set = false;
char c;
@ -1371,10 +1378,9 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
file = fopen(phys_port_name, "rb");
if (file != NULL) {
port_name_set =
fscanf(file, "%d%c", &data.port_name, &c) == 2 &&
c == '\n';
fscanf(file, "%s", port_name);
fclose(file);
port_name_set = mlx5_translate_port_name(port_name, &data);
}
file = fopen(phys_switch_id, "rb");
if (file == NULL) {
@ -1390,3 +1396,43 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
*info = data;
return 0;
}
/**
* Extract port name, as a number, from sysfs or netlink information.
*
* @param[in] port_name_in
* String representing the port name.
* @param[out] port_info_out
* Port information, including port name as a number.
*
* @return
* true on success, false otherwise.
*/
bool
mlx5_translate_port_name(const char *port_name_in,
struct mlx5_switch_info *port_info_out)
{
char pf_c1, pf_c2, vf_c1, vf_c2;
char *end;
int32_t pf_num;
bool port_name_set = false;
/*
* Check for port-name as a string of the form pf0vf0
* (support kernel ver >= 5.0)
*/
port_name_set = (sscanf(port_name_in, "%c%c%d%c%c%d", &pf_c1, &pf_c2,
&pf_num, &vf_c1, &vf_c2,
&port_info_out->port_name) == 6);
if (port_name_set) {
port_info_out->port_name_new = 1;
} else {
/* Check for port-name as a number (support kernel ver < 5.0 */
errno = 0;
port_info_out->port_name = strtol(port_name_in, &end, 0);
if (!errno &&
(size_t)(end - port_name_in) == strlen(port_name_in))
port_name_set = true;
}
return port_name_set;
}

11
drivers/net/mlx5/mlx5_nl.c
View File

@ -830,6 +830,7 @@ mlx5_nl_switch_info_cb(struct nlmsghdr *nh, void *arg)
struct mlx5_switch_info info = {
.master = 0,
.representor = 0,
.port_name_new = 0,
.port_name = 0,
.switch_id = 0,
};
@ -842,19 +843,15 @@ mlx5_nl_switch_info_cb(struct nlmsghdr *nh, void *arg)
while (off < nh->nlmsg_len) {
struct rtattr *ra = (void *)((uintptr_t)nh + off);
void *payload = RTA_DATA(ra);
char *end;
unsigned int i;
if (ra->rta_len > nh->nlmsg_len - off)
goto error;
switch (ra->rta_type) {
case IFLA_PHYS_PORT_NAME:
errno = 0;
info.port_name = strtol(payload, &end, 0);
if (errno ||
(size_t)(end - (char *)payload) != strlen(payload))
goto error;
port_name_set = true;
port_name_set =
mlx5_translate_port_name((char *)payload,
&info);
break;
case IFLA_PHYS_SWITCH_ID:
info.switch_id = 0;