Skip to content

Commit

Permalink
Revert "devlink: Remove not-executed trap policer notifications"
Browse files Browse the repository at this point in the history
This reverts commit 22849b5 as it
revealed that mlxsw and netdevsim (copy/paste from mlxsw) reregisters
devlink objects during another devlink user triggered command.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Leon Romanovsky authored and Jakub Kicinski committed Oct 27, 2021
1 parent fb9d19c commit c5e0321
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions net/core/devlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -11180,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)
Expand Down Expand Up @@ -11222,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:
Expand All @@ -11239,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);
Expand All @@ -11260,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];
Expand Down Expand Up @@ -11303,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]);
Expand Down

0 comments on commit c5e0321

Please sign in to comment.