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

Revert "devlink: Remove not-executed trap group notifications" 



This reverts commit 8bbeed48 as it
revealed that mlxsw and netdevsim (copy/paste from mlxsw) reregisters
devlink objects during another devlink user triggered command.

Fixes: 22849b5e ("devlink: Remove not-executed trap policer notifications")
Reported-by: default avatar <syzbot+93d5accfaefceedf43c1@syzkaller.appspotmail.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6487c819

net/core/devlink.c

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


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&

		     cmd != DEVLINK_CMD_TRAP_GROUP_DEL);

	ASSERT_DEVLINK_REGISTERED(devlink);

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

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)
@@ -11081,6 +11082,9 @@ devlink_trap_group_register(struct devlink *devlink, 
	}



	list_add_tail(&group_item->list, &devlink->trap_group_list);

	devlink_trap_group_notify(devlink, group_item,

				  DEVLINK_CMD_TRAP_GROUP_NEW);



	return 0;



err_group_init:
@@ -11101,6 +11105,8 @@ devlink_trap_group_unregister(struct devlink *devlink, 
	if (WARN_ON_ONCE(!group_item))

		return;



	devlink_trap_group_notify(devlink, group_item,

				  DEVLINK_CMD_TRAP_GROUP_DEL);

	list_del(&group_item->list);

	free_percpu(group_item->stats);

	kfree(group_item);
@@ -11120,8 +11126,6 @@ int devlink_trap_groups_register(struct devlink *devlink, 
{

	int i, err;



	ASSERT_DEVLINK_NOT_REGISTERED(devlink);



	mutex_lock(&devlink->lock);

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

		const struct devlink_trap_group *group = &groups[i];
@@ -11159,8 +11163,6 @@ void devlink_trap_groups_unregister(struct devlink *devlink, 
{

	int i;



	ASSERT_DEVLINK_NOT_REGISTERED(devlink);



	mutex_lock(&devlink->lock);

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

		devlink_trap_group_unregister(devlink, &groups[i]);