devlink: Remove not-executed trap policer notifications
The trap policer logic is registered before devlink_register() and all the notifications are delayed. This patch removes not-possible notifications along with addition of code annotation logic. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Родитель
99ad92eff7
Коммит
22849b5ea5
|
@ -11173,8 +11173,7 @@ 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);
|
||||||
if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
|
ASSERT_DEVLINK_REGISTERED(devlink);
|
||||||
return;
|
|
||||||
|
|
||||||
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
||||||
if (!msg)
|
if (!msg)
|
||||||
|
@ -11216,9 +11215,6 @@ 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:
|
||||||
|
@ -11236,8 +11232,6 @@ 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);
|
||||||
|
@ -11259,6 +11253,8 @@ 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];
|
||||||
|
@ -11300,6 +11296,8 @@ 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]);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче