devlink: Release nested relation on devlink free
Subsystems (4)
PATCH 1/1 devlink: Release nested relation on devlink free
devlink relation state is normally released from devl_unregister(), which calls devlink_rel_put(). This misses devlink instances that get a nested relation before registration and then fail probe before devl_register() is reached.
That flow can happen for SFs. The child devlink gets linked to its parent before registration, then a later probe error calls devlink_free() directly. Since the instance was never registered, devl_unregister() is not called and devlink->rel is leaked.
Release any pending relation from devlink_free() as well. The registered path is unchanged because devl_unregister() already clears devlink->rel before devlink_free() runs.
--- net/devlink/core.c | 2 ++ 1 file changed, 2 insertions(+)
net/devlink/core.c +2 -0
@@ -518,6 +518,8 @@ void devlink_free(struct devlink *devlink) {ASSERT_DEVLINK_NOT_REGISTERED (devlink); +devlink_rel_put (devlink); +WARN_ON (!list_empty (&devlink->trap_policer_list));WARN_ON (!list_empty (&devlink->trap_group_list));WARN_ON (!list_empty (&devlink->trap_list));
base-commit: 8d26955ea5a4697c1e21a3869ceb36b90389b051
Signature · 1 line
2.34.1
Quoted 10 lines · Thu, May 28, 2026 at 09:14:10PM +0200, [email protected] wrote:
devlink relation state is normally released from
devl_unregister(), which callsdevlink_rel_put(). This misses devlink instances that get a nested relation before registration and then fail probe beforedevl_register()is reached.That flow can happen for SFs. The child devlink gets linked to its parent before registration, then a later probe error calls
devlink_free()directly. Since the instance was never registered,devl_unregister()is not called anddevlink->relis leaked.
Quoted 6 lines
Release any pending relation from
devlink_free()as well. The registered path is unchanged becausedevl_unregister()already clearsdevlink->relbeforedevlink_free()runs.Fixes c137743bce02 ("devlink: introduce object and nested devlink relationship infra")Signed-off-by Mark Bloch <[email protected]>
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 Thu, 28 May 2026 22:14:10 +0300 you wrote:
devlink relation state is normally released from
devl_unregister(), which callsdevlink_rel_put(). This misses devlink instances that get a nested relation before registration and then fail probe beforedevl_register()is reached.That flow can happen for SFs. The child devlink gets linked to its parent before registration, then a later probe error calls
devlink_free()directly. Since the instance was never registered,devl_unregister()is not called anddevlink->relis leaked.[...]
Here is the summary with links:
- [net] devlink: Release nested relation on devlink free
https://git.kernel.org/netdev/net/c/3522b21fd7e1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html