From fb9d19c2d844c415d612bb93c231abf2ccf2a821 Mon Sep 17 00:00:00 2001 From: Leon Romanovsky Date: Tue, 26 Oct 2021 22:40:41 +0300 Subject: [PATCH 1/2] Revert "devlink: Remove not-executed trap group notifications" This reverts commit 8bbeed4858239ac956a78e5cbaf778bd6f3baef8 as it revealed that mlxsw and netdevsim (copy/paste from mlxsw) reregisters devlink objects during another devlink user triggered command. Fixes: 22849b5ea595 ("devlink: Remove not-executed trap policer notifications") Reported-by: syzbot+93d5accfaefceedf43c1@syzkaller.appspotmail.com Signed-off-by: Leon Romanovsky Signed-off-by: Jakub Kicinski --- net/core/devlink.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index f38ef4b26f70b..4dac53c77842b 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -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]); From c5e0321e43deed0512b34d8d8d40a16c0e22b541 Mon Sep 17 00:00:00 2001 From: Leon Romanovsky Date: Tue, 26 Oct 2021 22:40:42 +0300 Subject: [PATCH 2/2] Revert "devlink: Remove not-executed trap policer notifications" This reverts commit 22849b5ea5952d853547cc5e0651f34a246b2a4f 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 Signed-off-by: Jakub Kicinski --- net/core/devlink.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 4dac53c77842b..0de679c4313ca 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -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) @@ -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: @@ -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); @@ -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]; @@ -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]);