From: Dominique Martinet <asmadeus@codewreck.org>
To: stable@vger.kernel.org
Cc: gregkh@linuxfoundation.org, Chuck Lever <chuck.lever@oracle.com>,
Christian Brauner <brauner@kernel.org>, NeilBrown <neilb@suse.de>,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 6.6] SUNRPC: Remove BUG_ON call sites
Date: Sat, 2 Nov 2024 15:52:03 +0900 [thread overview]
Message-ID: <20241102065203.13291-1-asmadeus@codewreck.org> (raw)
From: Chuck Lever <chuck.lever@oracle.com>
[ Upstream commit 789ce196a31dd13276076762204bee87df893e53 ]
There is no need to take down the whole system for these assertions.
I'd rather not attempt a heroic save here, as some bug has occurred
that has left the transport data structures in an unknown state.
Just warn and then leak the left-over resources.
Acked-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: NeilBrown <neilb@suse.de>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
I've hit this BUG at home when restarting the nfs-server service and
while that didn't bring the whole system down it did kill a thread with
the nfsd_mutex lock held, making exportfs & other related commands all
hang in unkillable state trying to grab the lock.
So this is purely selfish so that this won't happen again next time I
upgrade :-)
I'd like to say I have any idea why the bug hit on that 6.6.42 (the
sv_permsocks one did) and help with the underlying issue, but I honestly
didn't do anything fancy and don't have anything interesting in logs
(except the bug itself, happy to forward it if someone cares); would
have been possible to debug this if I had a crash dump but it's not
setup on this machine and just having this down to WARN if probably
good enough...
Cheers,
net/sunrpc/svc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 029c49065016..b43dc8409b1f 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -577,11 +577,12 @@ svc_destroy(struct kref *ref)
timer_shutdown_sync(&serv->sv_temptimer);
/*
- * The last user is gone and thus all sockets have to be destroyed to
- * the point. Check this.
+ * Remaining transports at this point are not expected.
*/
- BUG_ON(!list_empty(&serv->sv_permsocks));
- BUG_ON(!list_empty(&serv->sv_tempsocks));
+ WARN_ONCE(!list_empty(&serv->sv_permsocks),
+ "SVC: permsocks remain for %s\n", serv->sv_program->pg_name);
+ WARN_ONCE(!list_empty(&serv->sv_tempsocks),
+ "SVC: tempsocks remain for %s\n", serv->sv_program->pg_name);
cache_clean_deferred(serv);
--
2.46.1
next reply other threads:[~2024-11-02 6:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-02 6:52 Dominique Martinet [this message]
2024-11-02 7:02 ` [PATCH 6.6] SUNRPC: Remove BUG_ON call sites Dominique Martinet
2024-11-06 6:13 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241102065203.13291-1-asmadeus@codewreck.org \
--to=asmadeus@codewreck.org \
--cc=brauner@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=jlayton@kernel.org \
--cc=neilb@suse.de \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).