File nfsstat01-Read-client-stats-from-netns-rhost.patch of Package ltp-stable

Overview Repositories Revisions Requests Users Attributes Meta

File nfsstat01-Read-client-stats-from-netns-rhost.patch of Package ltp-stable (Revision 308feaae5861d621db0deb7f5213e7a8)

Currently displaying revision 308feaae5861d621db0deb7f5213e7a8 , Show latest

From 6c3293c6fc20e7753433df9b7e0cd4107904bde3 Mon Sep 17 00:00:00 2001
From: Martin Doucha <mdoucha@suse.cz>
Date: Wed, 28 Aug 2024 15:23:05 +0200
Subject: [PATCH] nfsstat01: Read client stats from netns rhost
Git-commit: 6c3293c6fc20e7753433df9b7e0cd4107904bde3
References: bsc#1229646

On newer kernels (6.9, backported up to 5.15), network namespaces have
separate NFS stats. Detect support for per-NS files and read stats from
the correct NS.

Link: https://lore.kernel.org/ltp/20240828132325.23111-1-mdoucha@suse.cz/
Reviewed-by: Petr Vorel <pvorel@suse.cz>
Tested-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Martin Doucha <mdoucha@suse.cz>
---
 testcases/network/nfs/nfsstat01/nfsstat01.sh | 24 +++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/testcases/network/nfs/nfsstat01/nfsstat01.sh b/testcases/network/nfs/nfsstat01/nfsstat01.sh
index c2856eff1f..8d7202cf3b 100755
--- a/testcases/network/nfs/nfsstat01/nfsstat01.sh
+++ b/testcases/network/nfs/nfsstat01/nfsstat01.sh
@@ -3,8 +3,19 @@
 # Copyright (c) 2016-2018 Oracle and/or its affiliates. All Rights Reserved.
 # Copyright (c) International Business Machines  Corp., 2001
 
+TST_SETUP="nfsstat_setup"
 TST_TESTFUNC="do_test"
 TST_NEEDS_CMDS="nfsstat"
+NS_STAT_RHOST=0
+
+nfsstat_setup()
+{
+	nfs_setup
+
+	if tst_net_use_netns && [ -z "$LTP_NFS_NETNS_USE_LO" ]; then
+		tst_rhost_run -c "test -r /proc/net/rpc/nfs" && NS_STAT_RHOST=1
+	fi
+}
 
 get_calls()
 {
@@ -15,15 +26,22 @@ get_calls()
 	local calls opt
 
 	[ "$name" = "rpc" ] && opt="r" || opt="n"
-	! tst_net_use_netns && [ "$nfs_f" != "nfs" ] && type="rhost"
+	[ "$nfs_f" = "nfsd" ] && opt="-s$opt" || opt="-c$opt"
+
+	if tst_net_use_netns; then
+		# In netns setup, rhost is the client
+		[ "$nfs_f" = "nfs" ] && [ $NS_STAT_RHOST -ne 0 ] && type="rhost"
+	else
+		[ "$nfs_f" != "nfs" ] && type="rhost"
+	fi
 
 	if [ "$type" = "lhost" ]; then
 		calls="$(grep $name /proc/net/rpc/$nfs_f | cut -d' ' -f$field)"
-		ROD nfsstat -c$opt | grep -q "$calls"
+		ROD nfsstat $opt | grep -q "$calls"
 	else
 		calls=$(tst_rhost_run -c "grep $name /proc/net/rpc/$nfs_f" | \
 			cut -d' ' -f$field)
-		tst_rhost_run -s -c "nfsstat -s$opt" | grep -q "$calls"
+		tst_rhost_run -s -c "nfsstat $opt" | grep -q "$calls"
 	fi
 
 	if ! tst_is_int "$calls"; then
-- 
2.45.2

Places

File nfsstat01-Read-client-stats-from-netns-rhost.patch of Package ltp-stable (Revision 308feaae5861d621db0deb7f5213e7a8)

Places