6.6-stable patches

added patches:
	sunrpc-remove-bug_on-call-sites.patch

diff --git a/queue-6.6/series b/queue-6.6/series
index 76315edf7a19f1e875e38a8669b7376fd310eabb..c4e930aebb20bbe100c920162b1cd15e9cf1fc12 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -143,3 +143,4 @@ wifi-iwlwifi-mvm-fix-6-ghz-scan-construction.patch
 mm-huge_memory-add-vma_thp_disabled-and-thp_disabled_by_hw.patch
 mm-don-t-install-pmd-mappings-when-thps-are-disabled-by-the-hw-process-vma.patch
 mtd-spi-nor-winbond-fix-w25q128-regression.patch
+sunrpc-remove-bug_on-call-sites.patch

diff --git a/queue-6.6/sunrpc-remove-bug_on-call-sites.patch b/queue-6.6/sunrpc-remove-bug_on-call-sites.patch
new file mode 100644 (file)
index 0000000..7522d47
--- /dev/null
+++ b/queue-6.6/sunrpc-remove-bug_on-call-sites.patch
@@ -0,0 +1,44 @@
+From 789ce196a31dd13276076762204bee87df893e53 Mon Sep 17 00:00:00 2001
+From: Chuck Lever <chuck.lever@oracle.com>
+Date: Tue, 19 Sep 2023 11:35:15 -0400
+Subject: SUNRPC: Remove BUG_ON call sites
+
+From: Chuck Lever <chuck.lever@oracle.com>
+
+commit 789ce196a31dd13276076762204bee87df893e53 upstream.
+
+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>
+Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/sunrpc/svc.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- 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);
+