Commit eea31f21 authored by Adithya Jayachandran's avatar Adithya Jayachandran Committed by Saeed Mahameed
Browse files

{rdma,net}/mlx5: Query vports mac address from device 



Before this patch during either switchdev or legacy mode enablement we
cleared the mac address of vports between changes. This change allows us
to preserve the vports mac address between eswitch mode changes.

Vports hold information for VFs/SFs such as the permanent mac address.
VF/SF mac can be set either by iproute vf interface or devlink function
interface. For no obvious reason we reset it to 0 on switchdev/legacy
mode changes, this patch is fixing that, to align with other vport
information that are never reset, e.g GUID,mtu,promisc mode, etc ..

Signed-off-by: default avatarAdithya Jayachandran <ajayachandra@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Acked-by: Leon Romanovsky <leon@kernel.org> # RDMA
parent 3a866087

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int mlx5_query_node_guid(struct mlx5_ib_dev *dev, 
		break;



	case MLX5_VPORT_ACCESS_METHOD_NIC:

		err = mlx5_query_nic_vport_node_guid(dev->mdev, &tmp);

		err = mlx5_query_nic_vport_node_guid(dev->mdev, 0, false, &tmp);

		break;



	default:

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+7 −13
Original line number Diff line number Diff line
@@ -875,13 +875,10 @@ static int esw_vport_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport) 
				      vport_num, 1,

				      vport->info.link_state);



	/* Host PF has its own mac/guid. */

	if (vport_num) {

		mlx5_modify_nic_vport_mac_address(esw->dev, vport_num,

	mlx5_query_nic_vport_mac_address(esw->dev, vport_num, true,

					 vport->info.mac);

		mlx5_modify_nic_vport_node_guid(esw->dev, vport_num,

						vport->info.node_guid);

	}

	mlx5_query_nic_vport_node_guid(esw->dev, vport_num, true,

				       &vport->info.node_guid);



	flags = (vport->info.vlan || vport->info.qos) ?

		SET_VLAN_STRIP | SET_VLAN_INSERT : 0;
@@ -947,12 +944,6 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, struct mlx5_vport *vport, 
			goto err_vhca_mapping;

	}



	/* External controller host PF has factory programmed MAC.

	 * Read it from the device.

	 */

	if (mlx5_core_is_ecpf(esw->dev) && vport_num == MLX5_VPORT_PF)

		mlx5_query_nic_vport_mac_address(esw->dev, vport_num, true, vport->info.mac);



	esw_vport_change_handle_locked(vport);



	esw->enabled_vports++;
@@ -2235,6 +2226,9 @@ int mlx5_eswitch_get_vport_config(struct mlx5_eswitch *esw, 
	ivi->vf = vport - 1;



	mutex_lock(&esw->state_lock);



	mlx5_query_nic_vport_mac_address(esw->dev, vport, true,

					 evport->info.mac);

	ether_addr_copy(ivi->mac, evport->info.mac);

	ivi->linkstate = evport->info.link_state;

	ivi->vlan = evport->info.vlan;

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+3 −0
Original line number Diff line number Diff line
@@ -4303,6 +4303,9 @@ int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port, 
	struct mlx5_vport *vport = mlx5_devlink_port_vport_get(port);



	mutex_lock(&esw->state_lock);



	mlx5_query_nic_vport_mac_address(esw->dev, vport->vport, true,

					 vport->info.mac);

	ether_addr_copy(hw_addr, vport->info.mac);

	*hw_addr_len = ETH_ALEN;

	mutex_unlock(&esw->state_lock);

drivers/net/ethernet/mellanox/mlx5/core/vport.c

+12 −12
Original line number Diff line number Diff line
@@ -78,15 +78,14 @@ int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod, 
}



static int mlx5_query_nic_vport_context(struct mlx5_core_dev *mdev, u16 vport,

					u32 *out)

					bool other_vport, u32 *out)

{

	u32 in[MLX5_ST_SZ_DW(query_nic_vport_context_in)] = {};



	MLX5_SET(query_nic_vport_context_in, in, opcode,

		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);

	MLX5_SET(query_nic_vport_context_in, in, vport_number, vport);

	if (vport)

		MLX5_SET(query_nic_vport_context_in, in, other_vport, 1);

	MLX5_SET(query_nic_vport_context_in, in, other_vport, other_vport);



	return mlx5_cmd_exec_inout(mdev, query_nic_vport_context, in, out);

}
@@ -97,7 +96,7 @@ int mlx5_query_nic_vport_min_inline(struct mlx5_core_dev *mdev, 
	u32 out[MLX5_ST_SZ_DW(query_nic_vport_context_out)] = {};

	int err;



	err = mlx5_query_nic_vport_context(mdev, vport, out);

	err = mlx5_query_nic_vport_context(mdev, vport, vport > 0, out);

	if (!err)

		*min_inline = MLX5_GET(query_nic_vport_context_out, out,

				       nic_vport_context.min_wqe_inline_mode);
@@ -219,7 +218,7 @@ int mlx5_query_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 *mtu) 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, 0, false, out);

	if (!err)

		*mtu = MLX5_GET(query_nic_vport_context_out, out,

				nic_vport_context.mtu);
@@ -429,7 +428,7 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev, 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, 0, false, out);

	if (err)

		goto out;
@@ -451,7 +450,7 @@ int mlx5_query_nic_vport_sd_group(struct mlx5_core_dev *mdev, u8 *sd_group) 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, 0, false, out);

	if (err)

		goto out;
@@ -462,7 +461,8 @@ int mlx5_query_nic_vport_sd_group(struct mlx5_core_dev *mdev, u8 *sd_group) 
	return err;

}



int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid)

int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev,

				   u16 vport, bool other_vport, u64 *node_guid)

{

	u32 *out;

	int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);
@@ -472,7 +472,7 @@ int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid) 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, vport, other_vport, out);

	if (err)

		goto out;
@@ -529,7 +529,7 @@ int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev, 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, 0, false, out);

	if (err)

		goto out;
@@ -804,7 +804,7 @@ int mlx5_query_nic_vport_promisc(struct mlx5_core_dev *mdev, 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, vport, out);

	err = mlx5_query_nic_vport_context(mdev, vport, vport > 0, out);

	if (err)

		goto out;
@@ -908,7 +908,7 @@ int mlx5_nic_vport_query_local_lb(struct mlx5_core_dev *mdev, bool *status) 
	if (!out)

		return -ENOMEM;



	err = mlx5_query_nic_vport_context(mdev, 0, out);

	err = mlx5_query_nic_vport_context(mdev, 0, false, out);

	if (err)

		goto out;

include/linux/mlx5/vport.h

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu); 
int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,

					   u64 *system_image_guid);

int mlx5_query_nic_vport_sd_group(struct mlx5_core_dev *mdev, u8 *sd_group);

int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid);

int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev,

				   u16 vport, bool other_vport, u64 *node_guid);

int mlx5_modify_nic_vport_node_guid(struct mlx5_core_dev *mdev,

				    u16 vport, u64 node_guid);

int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,