NFSD: net ref data still needs to be freed even if net hasn't startup
Subsystems (3)
PATCH 1/1 NFSD: net ref data still needs to be freed even if net hasn't startup
From: Edward Adam Davis <[email protected]>
When the NFSD instance doesn't to startup, the net ref data memory is not properly reclaimed, which triggers the memory leak issue reported by syzbot [1].
To avoid the problem reported in [1], the net ref data memory reclamation action is moved outside of nfsd_net_up when the net is shutdown.
[1]
unreferenced object 0xffff88812a39dfc0 (size 64):
backtrace (crc a2262fc6):
percpu_ref_init+0x94/0x1e0 lib/percpu-refcount.c:76
nfsd_create_serv+0xbe/0x260 fs/nfsd/nfssvc.c:605
nfsd_nl_listener_set_doit+0x62/0xb00 fs/nfsd/nfsctl.c:1882
genl_family_rcv_msg_doit+0x11e/0x190 net/netlink/genetlink.c:1115
genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline]
genl_rcv_msg+0x2fd/0x440 net/netlink/genetlink.c:1210
BUG: memory leak--- fs/nfsd/nfssvc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
fs/nfsd/nfssvc.c +15 -15
@@ -434,26 +434,26 @@ static void nfsd_shutdown_net(struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -if (!nn->nfsd_net_up) -return ; - -percpu_ref_kill_and_confirm (&nn->nfsd_net_ref, nfsd_net_done); -wait_for_completion (&nn->nfsd_net_confirm_done); - -nfsd_export_flush (net); -nfs4_state_shutdown_net (net); -nfsd_reply_cache_shutdown (nn); -nfsd_file_cache_shutdown_net (net); -if (nn->lockd_up) { -lockd_down (net); - nn->lockd_up = false; +if (nn->nfsd_net_up) { +percpu_ref_kill_and_confirm (&nn->nfsd_net_ref, nfsd_net_done); +wait_for_completion (&nn->nfsd_net_confirm_done); + +nfsd_export_flush (net); +nfs4_state_shutdown_net (net); +nfsd_reply_cache_shutdown (nn); +nfsd_file_cache_shutdown_net (net); +if (nn->lockd_up) { +lockd_down (net); + nn->lockd_up = false; + } +wait_for_completion (&nn->nfsd_net_free_done); } -wait_for_completion (&nn->nfsd_net_free_done);percpu_ref_exit (&nn->nfsd_net_ref); +if (nn->nfsd_net_up) +nfsd_shutdown_generic (); nn->nfsd_net_up = false; -nfsd_shutdown_generic (); }static DEFINE_SPINLOCK (nfsd_notifier_lock);
Signature · 1 line
2.47.3
Hi Jay,
Quoted 21 lines · Jay Wang
From: Edward Adam Davis <[email protected]>
When the NFSD instance doesn't to startup, the net ref data memory is not properly reclaimed, which triggers the memory leak issue reported by syzbot [1].
To avoid the problem reported in [1], the net ref data memory reclamation action is moved outside of
nfsd_net_upwhen the net is shutdown.[1]
unreferenced object0xffff88812a39dfc0(size 64):backtrace (crc a2262fc6): percpu_ref_init+0x94/0x1e0 lib/percpu-refcount.c:76 nfsd_create_serv+0xbe/0x260 fs/nfsd/nfssvc.c:605 nfsd_nl_listener_set_doit+0x62/0xb00 fs/nfsd/nfsctl.c:1882 genl_family_rcv_msg_doit+0x11e/0x190 net/netlink/genetlink.c:1115 genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline] genl_rcv_msg+0x2fd/0x440 net/netlink/genetlink.c:1210BUG: memory leak
Quoted 7 lines
Reported-by [email protected]Fixes 39972494e318 ("nfsd: update percpu_ref to manage references on nfsd_net")Signed-off-by Edward Adam Davis <[email protected]>Signed-off-by Chuck Lever <[email protected]>Signed-off-by Jay Wang <[email protected]>
You need to mention the upstream commit while cherry-picking/backporting a commit to stable/lts kernels.
it could either be of format:
[Upstream commit 0b88bfa42e5468baff71909c2f324a495318532b]
or
commit 0b88bfa42e5468baff71909c2f324a495318532b upstream.
on the first line of the backport. [1]
Looks like this is this commit in mainline : v6.19-rc5 - 0b88bfa42e54 NFSD: net ref data still needs to be freed even if net hasn't startup
Also, while backporting to a long-term-stable kernel also please ensure the backport is present in all higher/newer stable/LTS version, so we don't let our stable tree consumers run into regressions when they update to newer releases. So in this case, 6.18.y also needs to be patched.
[1] https://www.kernel.org/doc/html/v6.18/process/stable-kernel-rules.html
Thanks,
Harshit
Quoted 50 lines
--- fs/nfsd/nfssvc.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)fs/nfsd/nfssvc.c +15
-15@@ -434,26 +434,26 @@ static void nfsd_shutdown_net(struct net *net) {struct nfsd_net *nn =net_generic (net, nfsd_net_id); -if (!nn->nfsd_net_up) -return ; - -percpu_ref_kill_and_confirm (&nn->nfsd_net_ref, nfsd_net_done); -wait_for_completion (&nn->nfsd_net_confirm_done); - -nfsd_export_flush (net); -nfs4_state_shutdown_net (net); -nfsd_reply_cache_shutdown (nn); -nfsd_file_cache_shutdown_net (net); -if (nn->lockd_up) { -lockd_down (net); - nn->lockd_up = false; +if (nn->nfsd_net_up) { +percpu_ref_kill_and_confirm (&nn->nfsd_net_ref, nfsd_net_done); +wait_for_completion (&nn->nfsd_net_confirm_done); + +nfsd_export_flush (net); +nfs4_state_shutdown_net (net); +nfsd_reply_cache_shutdown (nn); +nfsd_file_cache_shutdown_net (net); +if (nn->lockd_up) { +lockd_down (net); + nn->lockd_up = false; + } +wait_for_completion (&nn->nfsd_net_free_done); } -wait_for_completion (&nn->nfsd_net_free_done);percpu_ref_exit (&nn->nfsd_net_ref); +if (nn->nfsd_net_up) +nfsd_shutdown_generic (); nn->nfsd_net_up = false; -nfsd_shutdown_generic (); }static DEFINE_SPINLOCK (nfsd_notifier_lock);