From: Jeff Layton <jlayton@kernel.org>
To: Chuck Lever <cel@kernel.org>, NeilBrown <neil@brown.name>,
Olga Kornievskaia <okorniev@redhat.com>,
Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
Trond Myklebust <trondmy@kernel.org>,
Anna Schumaker <anna@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
Shuah Khan <shuah@kernel.org>
Cc: Slawomir Stepien <sst@poczta.fm>,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org, Trond Myklebust <trondmy@gmail.com>,
linux-kselftest@vger.kernel.org,
Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v5 15/15] selftests/nfsd: check that listener removal asks rpcbind once
Date: Tue, 01 Sep 2026 09:39:53 -0400 [thread overview]
Message-ID: <20260901-nfsd-nl-hang-v5-15-a540d86668b0@kernel.org> (raw)
In-Reply-To: <20260901-nfsd-nl-hang-v5-0-a540d86668b0@kernel.org>
Cover the teardown side of the same rule. Remove one listener, then three,
with the stub silent, and compare what it saw. Three removals must not cost
three timeouts.
Both measurements also pay the svc_unregister() sweep that
nfsd_destroy_serv() runs once the last listener is gone, so that cancels
out of the comparison. The listeners are registered with the stub
answering, so each one has an entry to remove.
Assisted-by: LLM
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
.../testing/selftests/nfsd/nfsd_netlink_listener.c | 39 ++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/tools/testing/selftests/nfsd/nfsd_netlink_listener.c b/tools/testing/selftests/nfsd/nfsd_netlink_listener.c
index d0f4258f905d..106360f87b99 100644
--- a/tools/testing/selftests/nfsd/nfsd_netlink_listener.c
+++ b/tools/testing/selftests/nfsd/nfsd_netlink_listener.c
@@ -1243,6 +1243,45 @@ TEST_F(nfsd_listener, rpcb_retry_next_request)
EXPECT_STREQ("", last_extack);
}
+/*
+ * The same rule on the way out. Removing a listener unregisters it, so a
+ * rpcbind that stops answering used to cost one timeout for each listener
+ * removed. Register one listener while the stub answers, silence the stub,
+ * remove it and count; then do the same with three.
+ *
+ * Both measurements also pay the svc_unregister() sweep that
+ * nfsd_destroy_serv() runs once the last listener is gone, so that cancels
+ * out of the comparison.
+ */
+TEST_F(nfsd_listener, rpcb_unreg_stop_after_failure)
+{
+ int before, one, three, off;
+ char attrs[192];
+
+ off = put_listener(attrs, 0, "tcp", TEST_PORT);
+ ASSERT_EQ(0, listener_set(attrs, off));
+
+ rpcb_stub_set_mode(RPCB_STUB_SILENT);
+ before = rpcb_calls();
+ ASSERT_EQ(0, listener_set(NULL, 0));
+ one = rpcb_calls() - before;
+ ASSERT_GT(one, 0);
+
+ rpcb_stub_set_mode(RPCB_STUB_ACCEPT);
+ off = put_listener(attrs, 0, "tcp", TEST_PORT);
+ off = put_listener(attrs, off, "tcp", TEST_PORT + 1);
+ off = put_listener(attrs, off, "tcp", TEST_PORT + 2);
+ ASSERT_EQ(0, listener_set(attrs, off));
+
+ rpcb_stub_set_mode(RPCB_STUB_SILENT);
+ before = rpcb_calls();
+ ASSERT_EQ(0, listener_set(NULL, 0));
+ three = rpcb_calls() - before;
+
+ /* the second and third removals must not reach rpcbind at all */
+ EXPECT_LE(three, one);
+}
+
/* ===================== threads / -EBUSY semantics ===================== */
TEST_F(nfsd_listener, sem_busy_on_change)
--
2.55.0
next prev parent reply other threads:[~2026-09-01 13:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 13:39 [PATCH v5 00/15] nfsd/sunrpc: harden the netlink listener set interface Jeff Layton
2026-09-01 13:39 ` [PATCH v5 01/15] NFSD: cap the number of listeners accepted in listener_set Jeff Layton
2026-09-01 13:39 ` [PATCH v5 02/15] NFSD: validate transport name in listener_set before serv creation Jeff Layton
2026-09-01 13:39 ` [PATCH v5 03/15] SUNRPC: keep the first error in svc_register() Jeff Layton
2026-09-01 13:39 ` [PATCH v5 04/15] SUNRPC: bound the local rpcbind client timeout to 1s Jeff Layton
2026-09-01 13:39 ` [PATCH v5 05/15] NFSD: report listener creation failures through extack Jeff Layton
2026-09-01 13:39 ` [PATCH v5 06/15] SUNRPC: report local rpcbind calls that get no answer Jeff Layton
2026-09-01 13:39 ` [PATCH v5 07/15] SUNRPC: stop svc_register() once rpcbind stops answering Jeff Layton
2026-09-01 13:39 ` [PATCH v5 08/15] SUNRPC: stop the svc_unregister() sweep " Jeff Layton
2026-09-01 13:39 ` [PATCH v5 09/15] SUNRPC: stop unregistering listeners " Jeff Layton
2026-09-01 13:39 ` [PATCH v5 10/15] NFSD: stop registering with rpcbind after a failure in listener_set Jeff Layton
2026-09-01 13:39 ` [PATCH v5 11/15] SUNRPC: check rpc_sockaddr2uaddr() for failure when registering Jeff Layton
2026-09-01 13:39 ` [PATCH v5 12/15] selftests/nfsd: exercise listener_set request validation Jeff Layton
2026-09-01 13:39 ` [PATCH v5 13/15] selftests/nfsd: add a per-netns rpcbind stub and the listener round-trips Jeff Layton
2026-09-01 13:39 ` [PATCH v5 14/15] selftests/nfsd: check that listener_set asks rpcbind once Jeff Layton
2026-09-01 13:39 ` Jeff Layton [this message]
2026-09-02 13:59 ` [PATCH v5 00/15] nfsd/sunrpc: harden the netlink listener set interface Chuck Lever
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=20260901-nfsd-nl-hang-v5-15-a540d86668b0@kernel.org \
--to=jlayton@kernel.org \
--cc=Dai.Ngo@oracle.com \
--cc=anna@kernel.org \
--cc=cel@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=netdev@vger.kernel.org \
--cc=okorniev@redhat.com \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=sst@poczta.fm \
--cc=tom@talpey.com \
--cc=trondmy@gmail.com \
--cc=trondmy@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