Commit b24e9de3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlxsw-misc-devlink-changes' 

Petr Machata says:

====================
mlxsw: Misc devlink changes

This patchset adjusts mlxsw to recent devlink changes in net-next.

Patch #1 removes a devl_param_driverinit_value_set() call that was
unnecessary, but now additionally triggers a WARN_ON.

Patches #2-#4 are non-functional preparations for the following patches.

Patch #5 fixes a use-after-free that is triggered while changing network
namespaces.

Patch #6 makes mlxsw consistent with netdevsim by having mlxsw register
its devlink instance before its sub-objects. It helps us avoid a warning
described in the commit message.
====================

Link: https://lore.kernel.org/r/cover.1675692666.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents cf52bd23 9d9a90cd

drivers/net/ethernet/mellanox/mlxsw/core.c

+7 −24
Original line number Diff line number Diff line
@@ -1750,29 +1750,12 @@ static const struct devlink_ops mlxsw_devlink_ops = { 


static int mlxsw_core_params_register(struct mlxsw_core *mlxsw_core)

{

	int err;



	err = mlxsw_core_fw_params_register(mlxsw_core);

	if (err)

		return err;



	if (mlxsw_core->driver->params_register) {

		err = mlxsw_core->driver->params_register(mlxsw_core);

		if (err)

			goto err_params_register;

	}

	return 0;



err_params_register:

	mlxsw_core_fw_params_unregister(mlxsw_core);

	return err;

	return mlxsw_core_fw_params_register(mlxsw_core);

}



static void mlxsw_core_params_unregister(struct mlxsw_core *mlxsw_core)

{

	mlxsw_core_fw_params_unregister(mlxsw_core);

	if (mlxsw_core->driver->params_register)

		mlxsw_core->driver->params_unregister(mlxsw_core);

}



struct mlxsw_core_health_event {
@@ -2201,6 +2184,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
			goto err_devlink_alloc;

		}

		devl_lock(devlink);

		devl_register(devlink);

	}



	mlxsw_core = devlink_priv(devlink);
@@ -2284,10 +2268,8 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
			goto err_driver_init;

	}



	if (!reload) {

	if (!reload)

		devl_unlock(devlink);

		devlink_register(devlink);

	}

	return 0;



err_driver_init:
@@ -2319,6 +2301,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
err_bus_init:

	mlxsw_core_irq_event_handler_fini(mlxsw_core);

	if (!reload) {

		devl_unregister(devlink);

		devl_unlock(devlink);

		devlink_free(devlink);

	}
@@ -2357,10 +2340,8 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	if (!reload) {

		devlink_unregister(devlink);

	if (!reload)

		devl_lock(devlink);

	}



	if (devlink_is_reload_failed(devlink)) {

		if (!reload)
@@ -2389,6 +2370,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
	mlxsw_core->bus->fini(mlxsw_core->bus_priv);

	mlxsw_core_irq_event_handler_fini(mlxsw_core);

	if (!reload) {

		devl_unregister(devlink);

		devl_unlock(devlink);

		devlink_free(devlink);

	}
@@ -2398,6 +2380,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
reload_fail_deinit:

	mlxsw_core_params_unregister(mlxsw_core);

	devl_resources_unregister(devlink);

	devl_unregister(devlink);

	devl_unlock(devlink);

	devlink_free(devlink);

}

drivers/net/ethernet/mellanox/mlxsw/core.h

+0 −2
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ struct mlxsw_driver { 
			     const struct mlxsw_config_profile *profile,

			     u64 *p_single_size, u64 *p_double_size,

			     u64 *p_linear_size);

	int (*params_register)(struct mlxsw_core *mlxsw_core);

	void (*params_unregister)(struct mlxsw_core *mlxsw_core);



	/* Notify a driver that a timestamped packet was transmitted. Driver

	 * is responsible for freeing the passed-in SKB.

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+0 −62
Original line number Diff line number Diff line
@@ -3861,62 +3861,6 @@ static int mlxsw_sp_kvd_sizes_get(struct mlxsw_core *mlxsw_core, 
	return 0;

}



static int

mlxsw_sp_params_acl_region_rehash_intrvl_get(struct devlink *devlink, u32 id,

					     struct devlink_param_gset_ctx *ctx)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);



	ctx->val.vu32 = mlxsw_sp_acl_region_rehash_intrvl_get(mlxsw_sp);

	return 0;

}



static int

mlxsw_sp_params_acl_region_rehash_intrvl_set(struct devlink *devlink, u32 id,

					     struct devlink_param_gset_ctx *ctx)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);



	return mlxsw_sp_acl_region_rehash_intrvl_set(mlxsw_sp, ctx->val.vu32);

}



static const struct devlink_param mlxsw_sp2_devlink_params[] = {

	DEVLINK_PARAM_DRIVER(MLXSW_DEVLINK_PARAM_ID_ACL_REGION_REHASH_INTERVAL,

			     "acl_region_rehash_interval",

			     DEVLINK_PARAM_TYPE_U32,

			     BIT(DEVLINK_PARAM_CMODE_RUNTIME),

			     mlxsw_sp_params_acl_region_rehash_intrvl_get,

			     mlxsw_sp_params_acl_region_rehash_intrvl_set,

			     NULL),

};



static int mlxsw_sp2_params_register(struct mlxsw_core *mlxsw_core)

{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);

	union devlink_param_value value;

	int err;



	err = devl_params_register(devlink, mlxsw_sp2_devlink_params,

				   ARRAY_SIZE(mlxsw_sp2_devlink_params));

	if (err)

		return err;



	value.vu32 = 0;

	devl_param_driverinit_value_set(devlink,

					MLXSW_DEVLINK_PARAM_ID_ACL_REGION_REHASH_INTERVAL,

					value);

	return 0;

}



static void mlxsw_sp2_params_unregister(struct mlxsw_core *mlxsw_core)

{

	devl_params_unregister(priv_to_devlink(mlxsw_core),

			       mlxsw_sp2_devlink_params,

			       ARRAY_SIZE(mlxsw_sp2_devlink_params));

}



static void mlxsw_sp_ptp_transmitted(struct mlxsw_core *mlxsw_core,

				     struct sk_buff *skb, u16 local_port)

{
@@ -3994,8 +3938,6 @@ static struct mlxsw_driver mlxsw_sp2_driver = { 
	.trap_policer_counter_get	= mlxsw_sp_trap_policer_counter_get,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp2_resources_register,

	.params_register		= mlxsw_sp2_params_register,

	.params_unregister		= mlxsw_sp2_params_unregister,

	.ptp_transmitted		= mlxsw_sp_ptp_transmitted,

	.txhdr_len			= MLXSW_TXHDR_LEN,

	.profile			= &mlxsw_sp2_config_profile,
@@ -4033,8 +3975,6 @@ static struct mlxsw_driver mlxsw_sp3_driver = { 
	.trap_policer_counter_get	= mlxsw_sp_trap_policer_counter_get,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp2_resources_register,

	.params_register		= mlxsw_sp2_params_register,

	.params_unregister		= mlxsw_sp2_params_unregister,

	.ptp_transmitted		= mlxsw_sp_ptp_transmitted,

	.txhdr_len			= MLXSW_TXHDR_LEN,

	.profile			= &mlxsw_sp2_config_profile,
@@ -4070,8 +4010,6 @@ static struct mlxsw_driver mlxsw_sp4_driver = { 
	.trap_policer_counter_get	= mlxsw_sp_trap_policer_counter_get,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp2_resources_register,

	.params_register		= mlxsw_sp2_params_register,

	.params_unregister		= mlxsw_sp2_params_unregister,

	.ptp_transmitted		= mlxsw_sp_ptp_transmitted,

	.txhdr_len			= MLXSW_TXHDR_LEN,

	.profile			= &mlxsw_sp4_config_profile,

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+1 −2
Original line number Diff line number Diff line
@@ -973,6 +973,7 @@ enum mlxsw_sp_acl_profile { 
};



struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl);

struct mlxsw_sp_acl_tcam *mlxsw_sp_acl_to_tcam(struct mlxsw_sp_acl *acl);



int mlxsw_sp_acl_ruleset_bind(struct mlxsw_sp *mlxsw_sp,

			      struct mlxsw_sp_flow_block *block,
@@ -1096,8 +1097,6 @@ mlxsw_sp_acl_act_cookie_lookup(struct mlxsw_sp *mlxsw_sp, u32 cookie_index) 


int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp);

void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp);

u32 mlxsw_sp_acl_region_rehash_intrvl_get(struct mlxsw_sp *mlxsw_sp);

int mlxsw_sp_acl_region_rehash_intrvl_set(struct mlxsw_sp *mlxsw_sp, u32 val);



struct mlxsw_sp_acl_mangle_action;

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+5 −16
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ struct mlxsw_afk *mlxsw_sp_acl_afk(struct mlxsw_sp_acl *acl) 
	return acl->afk;

}



struct mlxsw_sp_acl_tcam *mlxsw_sp_acl_to_tcam(struct mlxsw_sp_acl *acl)

{

	return &acl->tcam;

}



struct mlxsw_sp_acl_ruleset_ht_key {

	struct mlxsw_sp_flow_block *block;

	u32 chain_index;
@@ -1099,22 +1104,6 @@ void mlxsw_sp_acl_fini(struct mlxsw_sp *mlxsw_sp) 
	kfree(acl);

}



u32 mlxsw_sp_acl_region_rehash_intrvl_get(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_acl *acl = mlxsw_sp->acl;



	return mlxsw_sp_acl_tcam_vregion_rehash_intrvl_get(mlxsw_sp,

							   &acl->tcam);

}



int mlxsw_sp_acl_region_rehash_intrvl_set(struct mlxsw_sp *mlxsw_sp, u32 val)

{

	struct mlxsw_sp_acl *acl = mlxsw_sp->acl;



	return mlxsw_sp_acl_tcam_vregion_rehash_intrvl_set(mlxsw_sp,

							   &acl->tcam, val);

}



struct mlxsw_sp_acl_rulei_ops mlxsw_sp1_acl_rulei_ops = {

	.act_mangle_field = mlxsw_sp1_acl_rulei_act_mangle_field,

};