[PATCH 0/4] nfsstat: Test also on NFSv4*

[PATCH 0/4] nfsstat: Test also on NFSv4*

[Petr Vorel]

Petr Vorel (4):
  runtest/net.nfs: Rename test names
  nfsstat01.sh: Validate parsing /proc/net/rpc/nfs{,d}
  nfsstat01.sh: Add support for NFSv4*
  nfsstat01.sh: Run on all NFS versions, TCP and UDP

 runtest/net.nfs                              | 197 ++++++++++---------
 testcases/network/nfs/nfsstat01/nfsstat01.sh |  47 +++--
 2 files changed, 135 insertions(+), 109 deletions(-)

-- 
2.43.0

[PATCH 1/4 v2] runtest/net.nfs: Rename test names

[Petr Vorel]

Test names weren't obvious, rename to be more descriptive.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
NFS developers can ignore this patch (LTP specific).

changes v1->v2:
* Use simpler names (Martin's suggestion).

 runtest/net.nfs | 188 ++++++++++++++++++++++++------------------------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/runtest/net.nfs b/runtest/net.nfs
index 3461807cf..463c95c37 100644
--- a/runtest/net.nfs
+++ b/runtest/net.nfs
@@ -2,107 +2,107 @@
 #
 # PLEASE READ THE README FILE network/README.md BEFORE RUNNING THESE.
 #
-nfs3_01 nfs01.sh -v 3 -t udp
-nfs3t_01 nfs01.sh -v 3 -t tcp
-nfs4_01 nfs01.sh -v 4 -t tcp
-nfs41_01 nfs01.sh -v 4.1 -t tcp
-nfs42_01 nfs01.sh -v 4.2 -t tcp
-nfs3_ipv6_01 nfs01.sh -6 -v 3 -t udp
-nfs3t_ipv6_01 nfs01.sh -6 -v 3 -t tcp
-nfs4_ipv6_01 nfs01.sh -6 -v 4 -t tcp
-nfs41_ipv6_01 nfs01.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_01 nfs01.sh -6 -v 4.2 -t tcp
+nfs01_v30_ip4u nfs01.sh -v 3 -t udp
+nfs01_v30_ip4t nfs01.sh -v 3 -t tcp
+nfs01_v40_ip4t nfs01.sh -v 4 -t tcp
+nfs01_v41_ip4t nfs01.sh -v 4.1 -t tcp
+nfs01_v42_ip4t nfs01.sh -v 4.2 -t tcp
+nfs01_v30_ip6u nfs01.sh -6 -v 3 -t udp
+nfs01_v30_ip6t nfs01.sh -6 -v 3 -t tcp
+nfs01_v40_ip6t nfs01.sh -6 -v 4 -t tcp
+nfs01_v41_ip6t nfs01.sh -6 -v 4.1 -t tcp
+nfs01_v42_ip6t nfs01.sh -6 -v 4.2 -t tcp
 
-nfs3_02 nfs02.sh -v 3 -t udp
-nfs3t_02 nfs02.sh -v 3 -t tcp
-nfs4_02 nfs02.sh -v 4 -t tcp
-nfs41_02 nfs02.sh -v 4.1 -t tcp
-nfs42_02 nfs02.sh -v 4.2 -t tcp
-nfs3_ipv6_02 nfs02.sh -6 -v 3 -t udp
-nfs3t_ipv6_02 nfs02.sh -6 -v 3 -t tcp
-nfs4_ipv6_02 nfs02.sh -6 -v 4 -t tcp
-nfs41_ipv6_02 nfs02.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_02 nfs02.sh -6 -v 4.2 -t tcp
+nfs02_v30_ip4u nfs02.sh -v 3 -t udp
+nfs02_v30_ip4t nfs02.sh -v 3 -t tcp
+nfs02_v40_ip4t nfs02.sh -v 4 -t tcp
+nfs02_v41_ip4t nfs02.sh -v 4.1 -t tcp
+nfs02_v42_ip4t nfs02.sh -v 4.2 -t tcp
+nfs02_v30_ip6u nfs02.sh -6 -v 3 -t udp
+nfs02_v30_ip6t nfs02.sh -6 -v 3 -t tcp
+nfs02_v40_ip6t nfs02.sh -6 -v 4 -t tcp
+nfs02_v41_ip6t nfs02.sh -6 -v 4.1 -t tcp
+nfs02_v42_ip6t nfs02.sh -6 -v 4.2 -t tcp
 
-nfs3_03 nfs03.sh -v 3 -t udp
-nfs3t_03 nfs03.sh -v 3 -t tcp
-nfs4_03 nfs03.sh -v 4 -t tcp
-nfs41_03 nfs03.sh -v 4.1 -t tcp
-nfs42_03 nfs03.sh -v 4.2 -t tcp
-nfs3_ipv6_03 nfs03.sh -6 -v 3 -t udp
-nfs3t_ipv6_03 nfs03.sh -6 -v 3 -t tcp
-nfs4_ipv6_03 nfs03.sh -6 -v 4 -t tcp
-nfs41_ipv6_03 nfs03.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_03 nfs03.sh -6 -v 4.2 -t tcp
+nfs03_v30_ip4u nfs03.sh -v 3 -t udp
+nfs03_v30_ip4t nfs03.sh -v 3 -t tcp
+nfs03_v40_ip4t nfs03.sh -v 4 -t tcp
+nfs03_v41_ip4t nfs03.sh -v 4.1 -t tcp
+nfs03_v42_ip4t nfs03.sh -v 4.2 -t tcp
+nfs03_v30_ip6u nfs03.sh -6 -v 3 -t udp
+nfs03_v30_ip6t nfs03.sh -6 -v 3 -t tcp
+nfs03_v40_ip6t nfs03.sh -6 -v 4 -t tcp
+nfs03_v41_ip6t nfs03.sh -6 -v 4.1 -t tcp
+nfs03_v42_ip6t nfs03.sh -6 -v 4.2 -t tcp
 
-nfs3_04 nfs04.sh -v 3 -t udp
-nfs3t_04 nfs04.sh -v 3 -t tcp
-nfs4_04 nfs04.sh -v 4 -t tcp
-nfs41_04 nfs04.sh -v 4.1 -t tcp
-nfs42_04 nfs04.sh -v 4.2 -t tcp
-nfs3_ipv6_04 nfs04.sh -6 -v 3 -t udp
-nfs3t_ipv6_04 nfs04.sh -6 -v 3 -t tcp
-nfs4_ipv6_04 nfs04.sh -6 -v 4 -t tcp
-nfs41_ipv6_04 nfs04.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_04 nfs04.sh -6 -v 4.2 -t tcp
+nfs04_v30_ip4u nfs04.sh -v 3 -t udp
+nfs04_v30_ip4t nfs04.sh -v 3 -t tcp
+nfs04_v40_ip4t nfs04.sh -v 4 -t tcp
+nfs04_v41_ip4t nfs04.sh -v 4.1 -t tcp
+nfs04_v42_ip4t nfs04.sh -v 4.2 -t tcp
+nfs04_v30_ip6u nfs04.sh -6 -v 3 -t udp
+nfs04_v30_ip6t nfs04.sh -6 -v 3 -t tcp
+nfs04_v40_ip6t nfs04.sh -6 -v 4 -t tcp
+nfs04_v41_ip6t nfs04.sh -6 -v 4.1 -t tcp
+nfs04_v42_ip6t nfs04.sh -6 -v 4.2 -t tcp
 
-nfs3_05 nfs05.sh -v 3 -t udp
-nfs3t_05 nfs05.sh -v 3 -t tcp
-nfs4_05 nfs05.sh -v 4 -t tcp
-nfs41_05 nfs05.sh -v 4.1 -t tcp
-nfs42_05 nfs05.sh -v 4.2 -t tcp
-nfs3_ipv6_05 nfs05.sh -6 -v 3 -t udp
-nfs3t_ipv6_05 nfs05.sh -6 -v 3 -t tcp
-nfs4_ipv6_05 nfs05.sh -6 -v 4 -t tcp
-nfs41_ipv6_05 nfs05.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_05 nfs05.sh -6 -v 4.2 -t tcp
+nfs05_v30_ip4u nfs05.sh -v 3 -t udp
+nfs05_v30_ip4t nfs05.sh -v 3 -t tcp
+nfs05_v40_ip4t nfs05.sh -v 4 -t tcp
+nfs05_v41_ip4t nfs05.sh -v 4.1 -t tcp
+nfs05_v42_ip4t nfs05.sh -v 4.2 -t tcp
+nfs05_v30_ip6u nfs05.sh -6 -v 3 -t udp
+nfs05_v30_ip6t nfs05.sh -6 -v 3 -t tcp
+nfs05_v40_ip6t nfs05.sh -6 -v 4 -t tcp
+nfs05_v41_ip6t nfs05.sh -6 -v 4.1 -t tcp
+nfs05_v42_ip6t nfs05.sh -6 -v 4.2 -t tcp
 
-nfs01_06  nfs06.sh -v "3,3,3,4,4,4" -t "udp,udp,tcp,tcp,tcp,tcp"
-nfs02_06 nfs06.sh -v "3,4,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
-nfs03_ipv6_06 nfs06.sh -6 -v "4,4.1,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
+nfs06_v30_v40_ip4  nfs06.sh -v "3,3,3,4,4,4" -t "udp,udp,tcp,tcp,tcp,tcp"
+nfs06_vall_ip4t nfs02_06 nfs06.sh -v "3,4,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
+nfs06_v4x_ip6t nfs03_ipv6_06 nfs06.sh -6 -v "4,4.1,4.1,4.2,4.2,4.2" -t "tcp,tcp,tcp,tcp,tcp,tcp"
 
-nfs3_07 nfs07.sh -v 3 -t udp
-nfs3t_07 nfs07.sh -v 3 -t tcp
-nfs4_07 nfs07.sh -v 4 -t tcp
-nfs41_07 nfs07.sh -v 4.1 -t tcp
-nfs42_07 nfs07.sh -v 4.2 -t tcp
-nfs3_ipv6_07 nfs07.sh -6 -v 3 -t udp
-nfs3t_ipv6_07 nfs07.sh -6 -v 3 -t tcp
-nfs4_ipv6_07 nfs07.sh -6 -v 4 -t tcp
-nfs41_ipv6_07 nfs07.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_07 nfs07.sh -6 -v 4.2 -t tcp
+nfs07_v30_ip4u nfs07.sh -v 3 -t udp
+nfs07_v30_ip4t nfs07.sh -v 3 -t tcp
+nfs07_v40_ip4t nfs07.sh -v 4 -t tcp
+nfs07_v41_ip4t nfs07.sh -v 4.1 -t tcp
+nfs07_v42_ip4t nfs07.sh -v 4.2 -t tcp
+nfs07_v30_ip6u nfs07.sh -6 -v 3 -t udp
+nfs07_v30_ip6t nfs07.sh -6 -v 3 -t tcp
+nfs07_v40_ip6t nfs07.sh -6 -v 4 -t tcp
+nfs07_v41_ip6t nfs07.sh -6 -v 4.1 -t tcp
+nfs07_v42_ip6t nfs07.sh -6 -v 4.2 -t tcp
 
-nfs3_08 nfs08.sh -v 3 -t udp
-nfs3t_08 nfs08.sh -v 3 -t tcp
-nfs4_08 nfs08.sh -v 4 -t tcp
-nfs41_08 nfs08.sh -v 4.1 -t tcp
-nfs42_08 nfs08.sh -v 4.2 -t tcp
-nfs3_ipv6_08 nfs08.sh -6 -v 3 -t udp
-nfs3t_ipv6_08 nfs08.sh -6 -v 3 -t tcp
-nfs4_ipv6_08 nfs08.sh -6 -v 4 -t tcp
-nfs41_ipv6_08 nfs08.sh -6 -v 4.1 -t tcp
-nfs42_ipv6_08 nfs08.sh -6 -v 4.2 -t tcp
+nfs08_v30_ip4u nfs08.sh -v 3 -t udp
+nfs08_v30_ip4t nfs08.sh -v 3 -t tcp
+nfs08_v40_ip4t nfs08.sh -v 4 -t tcp
+nfs08_v41_ip4t nfs08.sh -v 4.1 -t tcp
+nfs08_v42_ip4t nfs08.sh -v 4.2 -t tcp
+nfs08_v30_ip6u nfs08.sh -6 -v 3 -t udp
+nfs08_v30_ip6t nfs08.sh -6 -v 3 -t tcp
+nfs08_v40_ip6t nfs08.sh -6 -v 4 -t tcp
+nfs08_v41_ip6t nfs08.sh -6 -v 4.1 -t tcp
+nfs08_v42_ip6t nfs08.sh -6 -v 4.2 -t tcp
 
-nfslock3_01 nfslock01.sh -v 3 -t udp
-nfslock3t_01 nfslock01.sh -v 3 -t tcp
-nfslock4_01 nfslock01.sh -v 4 -t tcp
-nfslock41_01 nfslock01.sh -v 4.1 -t tcp
-nfslock42_01 nfslock01.sh -v 4.2 -t tcp
-nfslock3_ipv6_01 nfslock01.sh -6 -v 3 -t udp
-nfslock3t_ipv6_01 nfslock01.sh -6 -v 3 -t tcp
-nfslock4_ipv6_01 nfslock01.sh -6 -v 4 -t tcp
-nfslock41_ipv6_01 nfslock01.sh -6 -v 4.1 -t tcp
-nfslock42_ipv6_01 nfslock01.sh -6 -v 4.2 -t tcp
+nfslock01_v30_ip4u nfslock01.sh -v 3 -t udp
+nfslock01_v30_ip4t nfslock01.sh -v 3 -t tcp
+nfslock01_v40_ip4t nfslock01.sh -v 4 -t tcp
+nfslock01_v41_ip4t nfslock01.sh -v 4.1 -t tcp
+nfslock01_v42_ip4t nfslock01.sh -v 4.2 -t tcp
+nfslock01_v30_ip6u nfslock01.sh -6 -v 3 -t udp
+nfslock01_v30_ip6t nfslock01.sh -6 -v 3 -t tcp
+nfslock01_v40_ip6t nfslock01.sh -6 -v 4 -t tcp
+nfslock01_v41_ip6t nfslock01.sh -6 -v 4.1 -t tcp
+nfslock01_v42_ip6t nfslock01.sh -6 -v 4.2 -t tcp
 
-nfsstat3_01 nfsstat01.sh -v 3
+nfsstat01_v30 nfsstat01.sh -v 3
 
-nfsx3 fsx.sh -v 3 -t udp
-nfsx3t fsx.sh -v 3 -t tcp
-nfsx4 fsx.sh -v 4 -t tcp
-nfsx41 fsx.sh -v 4.1 -t tcp
-nfsx42 fsx.sh -v 4.2 -t tcp
-nfsx3_ipv6 fsx.sh -6 -v 3 -t udp
-nfsx3t_ipv6 fsx.sh -6 -v 3 -t tcp
-nfsx4_ipv6 fsx.sh -6 -v 4 -t tcp
-nfsx41_ipv6 fsx.sh -6 -v 4.1 -t tcp
-nfsx42_ipv6 fsx.sh -6 -v 4.2 -t tcp
+fsx_v30_ip4u fsx.sh -v 3 -t udp
+fsx_v30_ip4t fsx.sh -v 3 -t tcp
+fsx_v40_ip4t fsx.sh -v 4 -t tcp
+fsx_v41_ip4t fsx.sh -v 4.1 -t tcp
+fsx_v42_ip4t fsx.sh -v 4.2 -t tcp
+fsx_v30_ip6u fsx.sh -6 -v 3 -t udp
+fsx_v30_ip6t fsx.sh -6 -v 3 -t tcp
+fsx_v40_ip6t fsx.sh -6 -v 4 -t tcp
+fsx_v41_ip6t fsx.sh -6 -v 4.1 -t tcp
+fsx_v42_ip6t fsx.sh -6 -v 4.2 -t tcp
-- 
2.43.0

[PATCH 2/4] nfsstat01.sh: Validate parsing /proc/net/rpc/nfs{,d}

[Petr Vorel]

print TWARN when parsing /proc/net/rpc/nfs{,d} fails.
NOTE: better would be to quit with TBROK, but at this point test would
fail to umount.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
NFS developers can ignore this patch (LTP specific).

@Cyril, @Martin it'd be nice to fix nfs_lib.sh so that it would support
tst_brk. The problem could be that get_calls() is called inside $()
therefore cd $LTPROOT (to leave mounted directory) in the cleanup
function is done for child process). I would have to redirect to a file
and read it afterwards, right? (similarly get_pcr10_aggregate() in
ima_tpm.sh does).

Kind regards,
Petr

 testcases/network/nfs/nfsstat01/nfsstat01.sh | 29 ++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/testcases/network/nfs/nfsstat01/nfsstat01.sh b/testcases/network/nfs/nfsstat01/nfsstat01.sh
index 708750a97..4c09ae135 100755
--- a/testcases/network/nfs/nfsstat01/nfsstat01.sh
+++ b/testcases/network/nfs/nfsstat01/nfsstat01.sh
@@ -11,20 +11,33 @@ get_calls()
 	local name=$1
 	local field=$2
 	local nfs_f=$3
-	local calls=
-	local opt=
+	local type="lhost"
+	local calls opt
+
 	[ "$name" = "rpc" ] && opt="r" || opt="n"
+	! tst_net_use_netns && [ "$nfs_f" != "nfs" ] && type="rhost"
 
-	if tst_net_use_netns || [ "$nfs_f" = "nfs" ]; then
+	if [ "$type" = "lhost" ]; then
 		calls="$(grep $name /proc/net/rpc/$nfs_f | cut -d' ' -f$field)"
 		ROD nfsstat -c$opt | grep -q "$calls"
-		echo "$calls"
-		return
+	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"
+	fi
+
+	if ! tst_is_int "$calls"; then
+		if [ "$type" = "lhost" ]; then
+			tst_res TINFO "lhost /proc/net/rpc/$nfs_f"
+			cat /proc/net/rpc/$nfs_f >&2
+		else
+			tst_res TINFO "rhost /proc/net/rpc/$nfs_f"
+			tst_rhost_run -c "cat /proc/net/rpc/$nfs_f" >&2
+		fi
+
+		tst_res TWARN "get_calls: failed to get integer value (args: $@)"
 	fi
 
-	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"
 	echo "$calls"
 }
 
-- 
2.43.0

[PATCH 3/4] nfsstat01.sh: Add support for NFSv4*

[Petr Vorel]

NFSv4, NFSv4.1 and NFSv4.2 have following changes:
* server (/proc/net/rpc/nfsd) has "remove" remove 1) in proc4ops line 2)
  in column 31.
* client (/proc/net/rpc/nfs) has "remove" record in column 24.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Dear NFS developers,

I hope I found correct column (reading utils/nfsstat/nfsstat.c [1] and
comparing content of /proc/net/rpc/nfs{,d} and nfsstat output), but
please correct me, if other value should be tested.

You can test this LTP patchset with these commands:

git clone -b rename-net.nfs.v2 https://github.com/pevik/ltp.git && cd ltp
# optionally install LTP build dependencies with ./ci/YOUR_DISTRO.sh
make autotools && ./configure
for i in testcases/lib testcases/kernel/fs/fsstress/ testcases/network/nfs*/; do cd $i && make -j`nproc` && make install; cd -; done

PATH=/opt/ltp/testcases/bin:$PATH LTP_SINGLE_FS_TYPE=ext4 nfsstat01.sh -v4.1 # -v can be 3, 4, 4.1, 4.2

Kind regards,
Petr

[1] https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=blob;f=utils/nfsstat/nfsstat.c;h=ca845325f0dc02a4f005dd44b010fcadcff4d3c7;hb=HEAD

 testcases/network/nfs/nfsstat01/nfsstat01.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/testcases/network/nfs/nfsstat01/nfsstat01.sh b/testcases/network/nfs/nfsstat01/nfsstat01.sh
index 4c09ae135..c2856eff1 100755
--- a/testcases/network/nfs/nfsstat01/nfsstat01.sh
+++ b/testcases/network/nfs/nfsstat01/nfsstat01.sh
@@ -45,7 +45,9 @@ get_calls()
 #           tracking using the 'nfsstat' command and /proc/net/rpc
 do_test()
 {
-	local client_calls server_calls new_server_calls new_client_calls field
+	local client_calls server_calls new_server_calls new_client_calls
+	local client_field server_field
+	local client_v=$VERSION server_v=$VERSION
 
 	tst_res TINFO "checking RPC calls for server/client"
 
@@ -75,21 +77,23 @@ do_test()
 
 	tst_res TINFO "checking NFS calls for server/client"
 	case $VERSION in
-	2) field=13
+	2) client_field=13 server_field=13
 	;;
-	*) field=15
+	3) client_field=15 server_field=15
+	;;
+	4*) client_field=24 server_field=31 client_v=4 server_v=4ops
 	;;
 	esac
 
-	server_calls="$(get_calls proc$VERSION $field nfsd)"
-	client_calls="$(get_calls proc$VERSION $field nfs)"
+	server_calls="$(get_calls proc$server_v $server_field nfsd)"
+	client_calls="$(get_calls proc$client_v $client_field nfs)"
 	tst_res TINFO "calls $server_calls/$client_calls"
 
 	tst_res TINFO "Checking for tracking of NFS calls for server/client"
 	rm -f nfsstat01.tmp
 
-	new_server_calls="$(get_calls proc$VERSION $field nfsd)"
-	new_client_calls="$(get_calls proc$VERSION $field nfs)"
+	new_server_calls="$(get_calls proc$server_v $server_field nfsd)"
+	new_client_calls="$(get_calls proc$client_v $client_field nfs)"
 	tst_res TINFO "new calls $new_server_calls/$new_client_calls"
 
 	if [ "$new_server_calls" -le "$server_calls" ]; then
-- 
2.43.0

[PATCH 4/4] nfsstat01.sh: Run on all NFS versions, TCP and UDP

[Petr Vorel]

Due fix in previous version we can run nfsstat01.sh on all NFS versions
(added NFSv4, NFSv4.1, NFSv4.2) and on TCP and UDP.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 runtest/net.nfs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/runtest/net.nfs b/runtest/net.nfs
index 463c95c37..9c1c5c63e 100644
--- a/runtest/net.nfs
+++ b/runtest/net.nfs
@@ -94,7 +94,16 @@ nfslock01_v40_ip6t nfslock01.sh -6 -v 4 -t tcp
 nfslock01_v41_ip6t nfslock01.sh -6 -v 4.1 -t tcp
 nfslock01_v42_ip6t nfslock01.sh -6 -v 4.2 -t tcp
 
-nfsstat01_v30 nfsstat01.sh -v 3
+nfsstat01_v30_ip4u nfsstat01.sh -v 3 -t udp
+nfsstat01_v30_ip4t nfsstat01.sh -v 3 -t tcp
+nfsstat01_v40_ip4t nfsstat01.sh -v 4 -t tcp
+nfsstat01_v41_ip4t nfsstat01.sh -v 4.1 -t tcp
+nfsstat01_v42_ip4t nfsstat01.sh -v 4.2 -t tcp
+nfsstat01_v30_ip6u nfsstat01.sh -6 -v 3 -t udp
+nfsstat01_v30_ip6t nfsstat01.sh -6 -v 3 -t tcp
+nfsstat01_v40_ip6t nfsstat01.sh -6 -v 4 -t tcp
+nfsstat01_v41_ip6t nfsstat01.sh -6 -v 4.1 -t tcp
+nfsstat01_v42_ip6t nfsstat01.sh -6 -v 4.2 -t tcp
 
 fsx_v30_ip4u fsx.sh -v 3 -t udp
 fsx_v30_ip4t fsx.sh -v 3 -t tcp
-- 
2.43.0

Re: [PATCH 4/4] nfsstat01.sh: Run on all NFS versions, TCP and UDP

[Martin Doucha]

Hi,
for the whole patchset:

Reviewed-by: Martin Doucha <mdoucha@suse.cz>

On 31. 01. 24 16:14, Petr Vorel wrote:
> Due fix in previous version we can run nfsstat01.sh on all NFS versions
> (added NFSv4, NFSv4.1, NFSv4.2) and on TCP and UDP.
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
>   runtest/net.nfs | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/runtest/net.nfs b/runtest/net.nfs
> index 463c95c37..9c1c5c63e 100644
> --- a/runtest/net.nfs
> +++ b/runtest/net.nfs
> @@ -94,7 +94,16 @@ nfslock01_v40_ip6t nfslock01.sh -6 -v 4 -t tcp
>   nfslock01_v41_ip6t nfslock01.sh -6 -v 4.1 -t tcp
>   nfslock01_v42_ip6t nfslock01.sh -6 -v 4.2 -t tcp
>   
> -nfsstat01_v30 nfsstat01.sh -v 3
> +nfsstat01_v30_ip4u nfsstat01.sh -v 3 -t udp
> +nfsstat01_v30_ip4t nfsstat01.sh -v 3 -t tcp
> +nfsstat01_v40_ip4t nfsstat01.sh -v 4 -t tcp
> +nfsstat01_v41_ip4t nfsstat01.sh -v 4.1 -t tcp
> +nfsstat01_v42_ip4t nfsstat01.sh -v 4.2 -t tcp
> +nfsstat01_v30_ip6u nfsstat01.sh -6 -v 3 -t udp
> +nfsstat01_v30_ip6t nfsstat01.sh -6 -v 3 -t tcp
> +nfsstat01_v40_ip6t nfsstat01.sh -6 -v 4 -t tcp
> +nfsstat01_v41_ip6t nfsstat01.sh -6 -v 4.1 -t tcp
> +nfsstat01_v42_ip6t nfsstat01.sh -6 -v 4.2 -t tcp
>   
>   fsx_v30_ip4u fsx.sh -v 3 -t udp
>   fsx_v30_ip4t fsx.sh -v 3 -t tcp

-- 
Martin Doucha   mdoucha@suse.cz
SW Quality Engineer
SUSE LINUX, s.r.o.
CORSO IIa
Krizikova 148/34
186 00 Prague 8
Czech Republic

Re: [PATCH 4/4] nfsstat01.sh: Run on all NFS versions, TCP and UDP

[Petr Vorel]

Hi Martin,

> Hi,
> for the whole patchset:

> Reviewed-by: Martin Doucha <mdoucha@suse.cz>

Thanks for your review, merged!

Kind regards,
Petr

> On 31. 01. 24 16:14, Petr Vorel wrote:
> > Due fix in previous version we can run nfsstat01.sh on all NFS versions
> > (added NFSv4, NFSv4.1, NFSv4.2) and on TCP and UDP.

> > Signed-off-by: Petr Vorel <pvorel@suse.cz>
> > ---
> >   runtest/net.nfs | 11 ++++++++++-
> >   1 file changed, 10 insertions(+), 1 deletion(-)

> > diff --git a/runtest/net.nfs b/runtest/net.nfs
> > index 463c95c37..9c1c5c63e 100644
> > --- a/runtest/net.nfs
> > +++ b/runtest/net.nfs
> > @@ -94,7 +94,16 @@ nfslock01_v40_ip6t nfslock01.sh -6 -v 4 -t tcp
> >   nfslock01_v41_ip6t nfslock01.sh -6 -v 4.1 -t tcp
> >   nfslock01_v42_ip6t nfslock01.sh -6 -v 4.2 -t tcp
> > -nfsstat01_v30 nfsstat01.sh -v 3
> > +nfsstat01_v30_ip4u nfsstat01.sh -v 3 -t udp
> > +nfsstat01_v30_ip4t nfsstat01.sh -v 3 -t tcp
> > +nfsstat01_v40_ip4t nfsstat01.sh -v 4 -t tcp
> > +nfsstat01_v41_ip4t nfsstat01.sh -v 4.1 -t tcp
> > +nfsstat01_v42_ip4t nfsstat01.sh -v 4.2 -t tcp
> > +nfsstat01_v30_ip6u nfsstat01.sh -6 -v 3 -t udp
> > +nfsstat01_v30_ip6t nfsstat01.sh -6 -v 3 -t tcp
> > +nfsstat01_v40_ip6t nfsstat01.sh -6 -v 4 -t tcp
> > +nfsstat01_v41_ip6t nfsstat01.sh -6 -v 4.1 -t tcp
> > +nfsstat01_v42_ip6t nfsstat01.sh -6 -v 4.2 -t tcp
> >   fsx_v30_ip4u fsx.sh -v 3 -t udp
> >   fsx_v30_ip4t fsx.sh -v 3 -t tcp