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

Merge tag 'mlx5-updates-2020-03-25' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2020-03-25

1) Cleanups from Dan Carpenter and wenxu.

2) Paul and Roi, Some minor updates and fixes to E-Switch to address
issues introduced in the previous reg_c0 updates series.

3) Eli Cohen simplifies and improves flow steering matching group searches
and flow table entries version management.

4) Parav Pandit, improves devlink eswitch mode changes thread safety.
By making devlink rely on driver for thread safety and introducing mlx5
eswitch mode change protection.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9d6a36c7 8e0aa4bc

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

+1 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ bool mlx5_device_registered(struct mlx5_core_dev *dev) 
	return found;

}



int mlx5_register_device(struct mlx5_core_dev *dev)

void mlx5_register_device(struct mlx5_core_dev *dev)

{

	struct mlx5_priv *priv = &dev->priv;

	struct mlx5_interface *intf;
@@ -203,8 +203,6 @@ int mlx5_register_device(struct mlx5_core_dev *dev) 
	list_for_each_entry(intf, &intf_list, list)

		mlx5_add_device(intf, priv);

	mutex_unlock(&mlx5_intf_mutex);



	return 0;

}



void mlx5_unregister_device(struct mlx5_core_dev *dev)

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

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change, 
{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	return mlx5_unload_one(dev, false);

	mlx5_unload_one(dev, false);

	return 0;

}



static int mlx5_devlink_reload_up(struct devlink *devlink,

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

+1 −2
Original line number Diff line number Diff line
@@ -1246,8 +1246,7 @@ static int mlx5e_rep_setup_ft_cb(enum tc_setup_type type, void *type_data, 
	case TC_SETUP_CLSFLOWER:

		memcpy(&tmp, f, sizeof(*f));



		if (!mlx5_esw_chains_prios_supported(esw) ||

		    tmp.common.chain_index)

		if (!mlx5_esw_chains_prios_supported(esw))

			return -EOPNOTSUPP;



		/* Re-use tc offload path by moving the ft flow to the

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

+1 −1
Original line number Diff line number Diff line
@@ -3058,7 +3058,7 @@ static bool actions_match_supported(struct mlx5e_priv *priv, 
			 */

			NL_SET_ERR_MSG_MOD(extack,

					   "Can't offload mirroring with action ct");

			return -EOPNOTSUPP;

			return false;

		}

	} else {

		actions = flow->nic_attr->action;

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

+84 −23
Original line number Diff line number Diff line
@@ -2067,12 +2067,54 @@ static void mlx5_eswitch_get_devlink_param(struct mlx5_eswitch *esw) 
	}

}



int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int mode)

static void

mlx5_eswitch_update_num_of_vfs(struct mlx5_eswitch *esw, int num_vfs)

{

	const u32 *out;



	WARN_ON_ONCE(esw->mode != MLX5_ESWITCH_NONE);



	if (num_vfs < 0)

		return;



	if (!mlx5_core_is_ecpf_esw_manager(esw->dev)) {

		esw->esw_funcs.num_vfs = num_vfs;

		return;

	}



	out = mlx5_esw_query_functions(esw->dev);

	if (IS_ERR(out))

		return;



	esw->esw_funcs.num_vfs = MLX5_GET(query_esw_functions_out, out,

					  host_params_context.host_num_of_vfs);

	kvfree(out);

}



/**

 * mlx5_eswitch_enable_locked - Enable eswitch

 * @esw:	Pointer to eswitch

 * @mode:	Eswitch mode to enable

 * @num_vfs:	Enable eswitch for given number of VFs. This is optional.

 *		Valid value are 0, > 0 and MLX5_ESWITCH_IGNORE_NUM_VFS.

 *		Caller should pass num_vfs > 0 when enabling eswitch for

 *		vf vports. Caller should pass num_vfs = 0, when eswitch

 *		is enabled without sriov VFs or when caller

 *		is unaware of the sriov state of the host PF on ECPF based

 *		eswitch. Caller should pass < 0 when num_vfs should be

 *		completely ignored. This is typically the case when eswitch

 *		is enabled without sriov regardless of PF/ECPF system.

 * mlx5_eswitch_enable_locked() Enables eswitch in either legacy or offloads

 * mode. If num_vfs >=0 is provided, it setup VF related eswitch vports.

 * It returns 0 on success or error code on failure.

 */

int mlx5_eswitch_enable_locked(struct mlx5_eswitch *esw, int mode, int num_vfs)

{

	int err;



	if (!ESW_ALLOWED(esw) ||

	    !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {

	lockdep_assert_held(&esw->mode_lock);



	if (!MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {

		esw_warn(esw->dev, "FDB is not supported, aborting ...\n");

		return -EOPNOTSUPP;

	}
@@ -2085,6 +2127,8 @@ int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int mode) 


	mlx5_eswitch_get_devlink_param(esw);



	mlx5_eswitch_update_num_of_vfs(esw, num_vfs);



	esw_create_tsar(esw);



	esw->mode = mode;
@@ -2121,11 +2165,34 @@ abort: 
	return err;

}



void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf)

/**

 * mlx5_eswitch_enable - Enable eswitch

 * @esw:	Pointer to eswitch

 * @num_vfs:	Enable eswitch swich for given number of VFs.

 *		Caller must pass num_vfs > 0 when enabling eswitch for

 *		vf vports.

 * mlx5_eswitch_enable() returns 0 on success or error code on failure.

 */

int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int num_vfs)

{

	int ret;



	if (!ESW_ALLOWED(esw))

		return 0;



	mutex_lock(&esw->mode_lock);

	ret = mlx5_eswitch_enable_locked(esw, MLX5_ESWITCH_LEGACY, num_vfs);

	mutex_unlock(&esw->mode_lock);

	return ret;

}



void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw, bool clear_vf)

{

	int old_mode;



	if (!ESW_ALLOWED(esw) || esw->mode == MLX5_ESWITCH_NONE)

	lockdep_assert_held_write(&esw->mode_lock);



	if (esw->mode == MLX5_ESWITCH_NONE)

		return;



	esw_info(esw->dev, "Disable: mode(%s), nvfs(%d), active vports(%d)\n",
@@ -2154,6 +2221,16 @@ void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf) 
		mlx5_eswitch_clear_vf_vports_info(esw);

}



void mlx5_eswitch_disable(struct mlx5_eswitch *esw, bool clear_vf)

{

	if (!ESW_ALLOWED(esw))

		return;



	mutex_lock(&esw->mode_lock);

	mlx5_eswitch_disable_locked(esw, clear_vf);

	mutex_unlock(&esw->mode_lock);

}



int mlx5_eswitch_init(struct mlx5_core_dev *dev)

{

	struct mlx5_eswitch *esw;
@@ -2205,6 +2282,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev) 
	hash_init(esw->offloads.mod_hdr.hlist);

	atomic64_set(&esw->offloads.num_flows, 0);

	mutex_init(&esw->state_lock);

	mutex_init(&esw->mode_lock);



	mlx5_esw_for_all_vports(esw, i, vport) {

		vport->vport = mlx5_eswitch_index_to_vport_num(esw, i);
@@ -2239,6 +2317,7 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw) 
	esw->dev->priv.eswitch = NULL;

	destroy_workqueue(esw->work_queue);

	esw_offloads_cleanup_reps(esw);

	mutex_destroy(&esw->mode_lock);

	mutex_destroy(&esw->state_lock);

	mutex_destroy(&esw->offloads.mod_hdr.lock);

	mutex_destroy(&esw->offloads.encap_tbl_lock);
@@ -2811,22 +2890,4 @@ bool mlx5_esw_multipath_prereq(struct mlx5_core_dev *dev0, 
		dev1->priv.eswitch->mode == MLX5_ESWITCH_OFFLOADS);

}



void mlx5_eswitch_update_num_of_vfs(struct mlx5_eswitch *esw, const int num_vfs)

{

	const u32 *out;

	WARN_ON_ONCE(esw->mode != MLX5_ESWITCH_NONE);



	if (!mlx5_core_is_ecpf_esw_manager(esw->dev)) {

		esw->esw_funcs.num_vfs = num_vfs;

		return;

	}



	out = mlx5_esw_query_functions(esw->dev);

	if (IS_ERR(out))

		return;



	esw->esw_funcs.num_vfs = MLX5_GET(query_esw_functions_out, out,

					  host_params_context.host_num_of_vfs);

	kvfree(out);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE