History

net/mlx5: E-Switch, Properly refer to host PF vport as other vport

Commands referring to vports use the following scheme: 1. When referring to my own vport, put 0 in vport and 0 in other_vport. 2. When referring to another vport, put the vport number of the referred vport and put 1 in other_vport. It was assumed that driver is accessing other vport when vport number is greater than 0. With the above scheme, the case that ECPF eswitch manager is trying to access host PF vport will fall over with scheme 1 as the vport number is 0. This is apparently wrong as driver is trying to refer other vport. As such usage can only happen in the eswitch context, change relevant functions to provide other vport input properly.

Bodong Wang committed 7 years ago

Commit cbc44e71 parent a1b38394 files · +16 −17Browse files

Unified · Split

4 files
  1. drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +4 −2
  2. drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +6 −7
  3. drivers/net/ethernet/mellanox/mlx5/core/vport.c +4 −6
  4. include/linux/mlx5/vport.h +2 −2
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c+4−2
@@ -1083,7 +1083,8 @@ static int mlx5e_vf_rep_open(struct net_device *dev) · 1082 unmodified lines
10831083
10841084 if (!mlx5_modify_vport_admin_state(priv->mdev,
10851085 MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1086− rep->vport, MLX5_VPORT_ADMIN_STATE_UP))
1086+ rep->vport, 1,
1087+ MLX5_VPORT_ADMIN_STATE_UP))
10871088 netif_carrier_on(dev);
10881089
10891090 unlock:
@@ -1101,7 +1102,8 @@ static int mlx5e_vf_rep_close(struct net_device *dev) · 11 unmodified lines
11011102 mutex_lock(&priv->state_lock);
11021103 mlx5_modify_vport_admin_state(priv->mdev,
11031104 MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1104− rep->vport, MLX5_VPORT_ADMIN_STATE_DOWN);
1105+ rep->vport, 1,
1106+ MLX5_VPORT_ADMIN_STATE_DOWN);
11051107 ret = mlx5e_close_locked(dev);
11061108 mutex_unlock(&priv->state_lock);
11071109 return ret;
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c+6−7
@@ -1462,7 +1462,7 @@ static void esw_apply_vport_conf(struct mlx5_eswitch *esw, · 1461 unmodified lines
14621462
14631463 mlx5_modify_vport_admin_state(esw->dev,
14641464 MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1465− vport_num,
1465+ vport_num, 1,
14661466 vport->info.link_state);
14671467
14681468 /* Host PF has its own mac/guid. */
@@ -1581,10 +1581,10 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, int vport_num) · 112 unmodified lines
15811581 esw_vport_change_handle_locked(vport);
15821582 vport->enabled_events = 0;
15831583 esw_vport_disable_qos(esw, vport_num);
1584− if (vport_num && esw->mode == SRIOV_LEGACY) {
1584+ if (esw->mode == SRIOV_LEGACY) {
15851585 mlx5_modify_vport_admin_state(esw->dev,
15861586 MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1587− vport_num,
1587+ vport_num, 1,
15881588 MLX5_VPORT_ADMIN_STATE_DOWN);
15891589 esw_vport_disable_egress_acl(esw, vport);
15901590 esw_vport_disable_ingress_acl(esw, vport);
@@ -1875,7 +1875,7 @@ int mlx5_eswitch_set_vport_state(struct mlx5_eswitch *esw, · 284 unmodified lines
18751875
18761876 err = mlx5_modify_vport_admin_state(esw->dev,
18771877 MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,
1878− vport, link_state);
1878+ vport, 1, link_state);
18791879 if (err) {
18801880 mlx5_core_warn(esw->dev,
18811881 "Failed to set vport %d link state, err = %d",
@@ -2137,7 +2137,7 @@ static int mlx5_eswitch_query_vport_drop_stats(struct mlx5_core_dev *dev, · 255 unmodified lines
21372137 !MLX5_CAP_GEN(dev, transmit_discard_vport_down))
21382138 return 0;
21392139
2140− err = mlx5_query_vport_down_stats(dev, vport_idx,
2140+ err = mlx5_query_vport_down_stats(dev, vport_idx, 1,
21412141 &rx_discard_vport_down,
21422142 &tx_discard_vport_down);
21432143 if (err)
@@ -2174,8 +2174,7 @@ int mlx5_eswitch_get_vport_stats(struct mlx5_eswitch *esw, · 30 unmodified lines
21742174 MLX5_CMD_OP_QUERY_VPORT_COUNTER);
21752175 MLX5_SET(query_vport_counter_in, in, op_mod, 0);
21762176 MLX5_SET(query_vport_counter_in, in, vport_number, vport);
2177− if (vport)
2178− MLX5_SET(query_vport_counter_in, in, other_vport, 1);
2177+ MLX5_SET(query_vport_counter_in, in, other_vport, 1);
21792178
21802179 memset(out, 0, outlen);
21812180 err = mlx5_cmd_exec(esw->dev, in, sizeof(in), out, outlen);
drivers/net/ethernet/mellanox/mlx5/core/vport.c+4−6
@@ -64,7 +64,7 @@ u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport) · 63 unmodified lines
6464 }
6565
6666 int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,
67− u16 vport, u8 state)
67+ u16 vport, u8 other_vport, u8 state)
6868 {
6969 u32 in[MLX5_ST_SZ_DW(modify_vport_state_in)] = {0};
7070 u32 out[MLX5_ST_SZ_DW(modify_vport_state_out)] = {0};
@@ -73,8 +73,7 @@ int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod, · 2 unmodified lines
7373 MLX5_CMD_OP_MODIFY_VPORT_STATE);
7474 MLX5_SET(modify_vport_state_in, in, op_mod, opmod);
7575 MLX5_SET(modify_vport_state_in, in, vport_number, vport);
76− if (vport)
77− MLX5_SET(modify_vport_state_in, in, other_vport, 1);
76+ MLX5_SET(modify_vport_state_in, in, other_vport, other_vport);
7877 MLX5_SET(modify_vport_state_in, in, admin_state, state);
7978
8079 return mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
@@ -1057,7 +1056,7 @@ free: · 976 unmodified lines
10571056 EXPORT_SYMBOL_GPL(mlx5_core_query_vport_counter);
10581057
10591058 int mlx5_query_vport_down_stats(struct mlx5_core_dev *mdev, u16 vport,
1060− u64 *rx_discard_vport_down,
1059+ u8 other_vport, u64 *rx_discard_vport_down,
10611060 u64 *tx_discard_vport_down)
10621061 {
10631062 u32 out[MLX5_ST_SZ_DW(query_vnic_env_out)] = {0};
@@ -1068,8 +1067,7 @@ int mlx5_query_vport_down_stats(struct mlx5_core_dev *mdev, u16 vport, · 4 unmodified lines
10681067 MLX5_CMD_OP_QUERY_VNIC_ENV);
10691068 MLX5_SET(query_vnic_env_in, in, op_mod, 0);
10701069 MLX5_SET(query_vnic_env_in, in, vport_number, vport);
1071− if (vport)
1072− MLX5_SET(query_vnic_env_in, in, other_vport, 1);
1070+ MLX5_SET(query_vnic_env_in, in, other_vport, other_vport);
10731071
10741072 err = mlx5_cmd_exec(mdev, in, sizeof(in), out, sizeof(out));
10751073 if (err)
include/linux/mlx5/vport.h+2−2
@@ -59,7 +59,7 @@ enum { · 58 unmodified lines
5959
6060 u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport);
6161 int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,
62− u16 vport, u8 state);
62+ u16 vport, u8 other_vport, u8 state);
6363 int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev,
6464 u16 vport, u8 *addr);
6565 int mlx5_query_nic_vport_min_inline(struct mlx5_core_dev *mdev,
@@ -121,7 +121,7 @@ int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev, · 55 unmodified lines
121121 int mlx5_nic_vport_enable_roce(struct mlx5_core_dev *mdev);
122122 int mlx5_nic_vport_disable_roce(struct mlx5_core_dev *mdev);
123123 int mlx5_query_vport_down_stats(struct mlx5_core_dev *mdev, u16 vport,
124− u64 *rx_discard_vport_down,
124+ u8 other_vport, u64 *rx_discard_vport_down,
125125 u64 *tx_discard_vport_down);
126126 int mlx5_core_query_vport_counter(struct mlx5_core_dev *dev, u8 other_vport,
127127 int vf, u8 port_num, void *out,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t