Commit 22849b5e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jakub Kicinski
Browse files

devlink: Remove not-executed trap policer notifications 



The trap policer logic is registered before devlink_register() and all the
notifications are delayed. This patch removes not-possible notifications
along with addition of code annotation logic.

Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 99ad92ef

net/core/devlink.c

+5 −7
Original line number Diff line number Diff line
@@ -11173,8 +11173,7 @@ devlink_trap_policer_notify(struct devlink *devlink, 


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&

		     cmd != DEVLINK_CMD_TRAP_POLICER_DEL);

	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))

		return;

	ASSERT_DEVLINK_REGISTERED(devlink);



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)
@@ -11216,9 +11215,6 @@ devlink_trap_policer_register(struct devlink *devlink, 
	}



	list_add_tail(&policer_item->list, &devlink->trap_policer_list);

	devlink_trap_policer_notify(devlink, policer_item,

				    DEVLINK_CMD_TRAP_POLICER_NEW);



	return 0;



err_policer_init:
@@ -11236,8 +11232,6 @@ devlink_trap_policer_unregister(struct devlink *devlink, 
	if (WARN_ON_ONCE(!policer_item))

		return;



	devlink_trap_policer_notify(devlink, policer_item,

				    DEVLINK_CMD_TRAP_POLICER_DEL);

	list_del(&policer_item->list);

	if (devlink->ops->trap_policer_fini)

		devlink->ops->trap_policer_fini(devlink, policer);
@@ -11259,6 +11253,8 @@ devlink_trap_policers_register(struct devlink *devlink, 
{

	int i, err;



	ASSERT_DEVLINK_NOT_REGISTERED(devlink);



	mutex_lock(&devlink->lock);

	for (i = 0; i < policers_count; i++) {

		const struct devlink_trap_policer *policer = &policers[i];
@@ -11300,6 +11296,8 @@ devlink_trap_policers_unregister(struct devlink *devlink, 
{

	int i;



	ASSERT_DEVLINK_NOT_REGISTERED(devlink);



	mutex_lock(&devlink->lock);

	for (i = policers_count - 1; i >= 0; i--)

		devlink_trap_policer_unregister(devlink, &policers[i]);