Commit 5fe2a6b4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2021-08-26' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes 2021-08-26

This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d0efb162 6cc64770

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

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ int mlx5_register_device(struct mlx5_core_dev *dev) 
void mlx5_unregister_device(struct mlx5_core_dev *dev)

{

	mutex_lock(&mlx5_intf_mutex);

	dev->priv.flags |= MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV;

	dev->priv.flags = MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV;

	mlx5_rescan_drivers_locked(dev);

	mutex_unlock(&mlx5_intf_mutex);

}

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, 
	mlx5e_rep_queue_neigh_stats_work(priv);



	list_for_each_entry(flow, flow_list, tmp_list) {

		if (!mlx5e_is_offloaded_flow(flow))

		if (!mlx5e_is_offloaded_flow(flow) || !flow_flag_test(flow, SLOW))

			continue;

		attr = flow->attr;

		esw_attr = attr->esw_attr;
@@ -188,7 +188,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, 
	int err;



	list_for_each_entry(flow, flow_list, tmp_list) {

		if (!mlx5e_is_offloaded_flow(flow))

		if (!mlx5e_is_offloaded_flow(flow) || flow_flag_test(flow, SLOW))

			continue;

		attr = flow->attr;

		esw_attr = attr->esw_attr;

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

+18 −0
Original line number Diff line number Diff line
@@ -1338,6 +1338,7 @@ bool mlx5e_tc_is_vf_tunnel(struct net_device *out_dev, struct net_device *route_ 
int mlx5e_tc_query_route_vport(struct net_device *out_dev, struct net_device *route_dev, u16 *vport)

{

	struct mlx5e_priv *out_priv, *route_priv;

	struct mlx5_devcom *devcom = NULL;

	struct mlx5_core_dev *route_mdev;

	struct mlx5_eswitch *esw;

	u16 vhca_id;
@@ -1349,7 +1350,24 @@ int mlx5e_tc_query_route_vport(struct net_device *out_dev, struct net_device *ro 
	route_mdev = route_priv->mdev;



	vhca_id = MLX5_CAP_GEN(route_mdev, vhca_id);

	if (mlx5_lag_is_active(out_priv->mdev)) {

		/* In lag case we may get devices from different eswitch instances.

		 * If we failed to get vport num, it means, mostly, that we on the wrong

		 * eswitch.

		 */

		err = mlx5_eswitch_vhca_id_to_vport(esw, vhca_id, vport);

		if (err != -ENOENT)

			return err;



		devcom = out_priv->mdev->priv.devcom;

		esw = mlx5_devcom_get_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);

		if (!esw)

			return -ENODEV;

	}



	err = mlx5_eswitch_vhca_id_to_vport(esw, vhca_id, vport);

	if (devcom)

		mlx5_devcom_release_peer_data(devcom, MLX5_DEVCOM_ESW_OFFLOADS);

	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ static int mlx5_create_indir_fwd_group(struct mlx5_eswitch *esw, 
	dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;

	dest.vport.num = e->vport;

	dest.vport.vhca_id = MLX5_CAP_GEN(esw->dev, vhca_id);

	dest.vport.flags = MLX5_FLOW_DEST_VPORT_VHCA_ID;

	e->fwd_rule = mlx5_add_flow_rules(e->ft, spec, &flow_act, &dest, 1);

	if (IS_ERR(e->fwd_rule)) {

		mlx5_destroy_flow_group(e->fwd_grp);

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

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ static int mlx5_deactivate_lag(struct mlx5_lag *ldev) 
	int err;



	ldev->flags &= ~MLX5_LAG_MODE_FLAGS;

	mlx5_lag_mp_reset(ldev);



	MLX5_SET(destroy_lag_in, in, opcode, MLX5_CMD_OP_DESTROY_LAG);

	err = mlx5_cmd_exec_in(dev0, destroy_lag, in);