Commit 4796e251 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'two-reverts-to-calm-down-devlink-discussion' 

Leon Romanovsky says:

====================
Two reverts to calm down devlink discussion

Two reverts as was discussed in [1], fast, easy and wrong in long run
solution to syzkaller bug [2].

[1] https://lore.kernel.org/all/20211026120234.3408fbcc@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com
[2] https://lore.kernel.org/netdev/000000000000af277405cf0a7ef0@google.com/
====================

Link: https://lore.kernel.org/r/cover.1635276828.git.leonro@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6487c819 c5e0321e

net/core/devlink.c

+14 −10
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]);
@@ -11178,7 +11180,8 @@ devlink_trap_policer_notify(struct devlink *devlink, 


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&

		     cmd != DEVLINK_CMD_TRAP_POLICER_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)
@@ -11220,6 +11223,9 @@ 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:
@@ -11237,6 +11243,8 @@ 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);
@@ -11258,8 +11266,6 @@ 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];
@@ -11301,8 +11307,6 @@ 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]);