Commit c5e0321e authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jakub Kicinski

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

This reverts commit 22849b5e as it
revealed that mlxsw and netdevsim (copy/paste from mlxsw) reregisters
devlink objects during another devlink user triggered command.
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fb9d19c2
...@@ -11180,7 +11180,8 @@ devlink_trap_policer_notify(struct devlink *devlink, ...@@ -11180,7 +11180,8 @@ devlink_trap_policer_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW && WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&
cmd != DEVLINK_CMD_TRAP_POLICER_DEL); 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); msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg) if (!msg)
...@@ -11222,6 +11223,9 @@ devlink_trap_policer_register(struct devlink *devlink, ...@@ -11222,6 +11223,9 @@ devlink_trap_policer_register(struct devlink *devlink,
} }
list_add_tail(&policer_item->list, &devlink->trap_policer_list); list_add_tail(&policer_item->list, &devlink->trap_policer_list);
devlink_trap_policer_notify(devlink, policer_item,
DEVLINK_CMD_TRAP_POLICER_NEW);
return 0; return 0;
err_policer_init: err_policer_init:
...@@ -11239,6 +11243,8 @@ devlink_trap_policer_unregister(struct devlink *devlink, ...@@ -11239,6 +11243,8 @@ devlink_trap_policer_unregister(struct devlink *devlink,
if (WARN_ON_ONCE(!policer_item)) if (WARN_ON_ONCE(!policer_item))
return; return;
devlink_trap_policer_notify(devlink, policer_item,
DEVLINK_CMD_TRAP_POLICER_DEL);
list_del(&policer_item->list); list_del(&policer_item->list);
if (devlink->ops->trap_policer_fini) if (devlink->ops->trap_policer_fini)
devlink->ops->trap_policer_fini(devlink, policer); devlink->ops->trap_policer_fini(devlink, policer);
...@@ -11260,8 +11266,6 @@ devlink_trap_policers_register(struct devlink *devlink, ...@@ -11260,8 +11266,6 @@ devlink_trap_policers_register(struct devlink *devlink,
{ {
int i, err; int i, err;
ASSERT_DEVLINK_NOT_REGISTERED(devlink);
mutex_lock(&devlink->lock); mutex_lock(&devlink->lock);
for (i = 0; i < policers_count; i++) { for (i = 0; i < policers_count; i++) {
const struct devlink_trap_policer *policer = &policers[i]; const struct devlink_trap_policer *policer = &policers[i];
...@@ -11303,8 +11307,6 @@ devlink_trap_policers_unregister(struct devlink *devlink, ...@@ -11303,8 +11307,6 @@ devlink_trap_policers_unregister(struct devlink *devlink,
{ {
int i; int i;
ASSERT_DEVLINK_NOT_REGISTERED(devlink);
mutex_lock(&devlink->lock); mutex_lock(&devlink->lock);
for (i = policers_count - 1; i >= 0; i--) for (i = policers_count - 1; i >= 0; i--)
devlink_trap_policer_unregister(devlink, &policers[i]); devlink_trap_policer_unregister(devlink, &policers[i]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment