devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
Subsystems (3)
Jiri Pirko
maintainerPATCH 1/1 devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
From: Jiri Pirko <[email protected]>
In case devlink_rel_nested_in_notify_work() can not take the devlink lock mutex. Convert the work to delayed work and in case of reschedule do it jiffie later and avoid potential looping.
--- net/devlink/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/devlink/core.c +6 -6
@@ -46,7 +46,7 @@ struct devlink_rel {u32 obj_index;devlink_rel_notify_cb_t *notify_cb;devlink_rel_cleanup_cb_t *cleanup_cb; -struct work_struct notify_work; +struct delayed_work notify_work; } nested_in; };
@@ -70,7 +70,7 @@ static void __devlink_rel_put(struct devlink_rel *rel)static void devlink_rel_nested_in_notify_work (struct work_struct *work) { struct devlink_rel *rel = container_of(work, struct devlink_rel, - nested_in.notify_work); + nested_in.notify_work.work);struct devlink *devlink; devlink =devlinks_xa_get (rel->nested_in.devlink_index);
@@ -96,13 +96,13 @@ static void devlink_rel_nested_in_notify_work(struct work_struct *work)return ; reschedule_work: -schedule_work (&rel->nested_in.notify_work); +schedule_delayed_work (&rel->nested_in.notify_work,1 ); }static void devlink_rel_nested_in_notify_work_schedule (struct devlink_rel *rel) {__devlink_rel_get (rel); -schedule_work (&rel->nested_in.notify_work); +schedule_delayed_work (&rel->nested_in.notify_work,0 ); }static struct devlink_rel *devlink_rel_alloc (void )
@@ -123,8 +123,8 @@ static struct devlink_rel *devlink_rel_alloc(void) }refcount_set (&rel->refcount,1 ); -INIT_WORK (&rel->nested_in.notify_work, - &devlink_rel_nested_in_notify_work); +INIT_DELAYED_WORK (&rel->nested_in.notify_work, + &devlink_rel_nested_in_notify_work);return rel; }
Signature · 1 line
2.43.0
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Mon, 5 Feb 2024 18:11:14 +0100 you wrote:
From: Jiri Pirko <[email protected]>
In case
devlink_rel_nested_in_notify_work()can not take the devlink lock mutex. Convert the work to delayed work and in case of reschedule do it jiffie later and avoid potential looping.Suggested-by Paolo Abeni <[email protected]>Fixes c137743bce02 ("devlink: introduce object and nested devlink relationship infra")Signed-off-by Jiri Pirko <[email protected]>[...]
Here is the summary with links:
- [net] devlink: avoid potential loop in devlink_rel_nested_in_notify_work()
https://git.kernel.org/netdev/net/c/58086721b778
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html