From patchwork Wed Jan 31 15:14:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1893541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=IQWzk6mE; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d7RGb3no; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=IQWzk6mE; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d7RGb3no; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQ5Fj4fjZz23g7 for ; Thu, 1 Feb 2024 02:15:37 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 555473D0A9C for ; Wed, 31 Jan 2024 16:15:35 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 4E8963CE0AC for ; Wed, 31 Jan 2024 16:15:01 +0100 (CET) Authentication-Results: in-4.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:1; helo=smtp-out1.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 0BA0410124D3 for ; Wed, 31 Jan 2024 16:15:00 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2782221FFB; Wed, 31 Jan 2024 15:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4WkEfZOFY5ds2ShYMovl2gWMwlK2KdP+TID0DbMohA8=; b=IQWzk6mEGmR77s1cu8kqhe/0m96ewlfmV0KR3ZNuM/8X0np7tceGoI9UCSoLzA6z7RJyNO l2M1dsAS+FVuQVRKSBzNcJvpduNbflghvmeW93dzJ3/lIOgk0C/1/AgkBVdE2wxV3PgsFw LlyIMNIqtbg/67IRXgfbY5NCMiG6NQ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4WkEfZOFY5ds2ShYMovl2gWMwlK2KdP+TID0DbMohA8=; b=d7RGb3noPCGB+PbOBooPngvk06SnPQC09GDpdqlzSRVMZaZCq3XTdqNKDEuWBH7JxpHhRo oG0UNt3kuK9D+1CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4WkEfZOFY5ds2ShYMovl2gWMwlK2KdP+TID0DbMohA8=; b=IQWzk6mEGmR77s1cu8kqhe/0m96ewlfmV0KR3ZNuM/8X0np7tceGoI9UCSoLzA6z7RJyNO l2M1dsAS+FVuQVRKSBzNcJvpduNbflghvmeW93dzJ3/lIOgk0C/1/AgkBVdE2wxV3PgsFw LlyIMNIqtbg/67IRXgfbY5NCMiG6NQ4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4WkEfZOFY5ds2ShYMovl2gWMwlK2KdP+TID0DbMohA8=; b=d7RGb3noPCGB+PbOBooPngvk06SnPQC09GDpdqlzSRVMZaZCq3XTdqNKDEuWBH7JxpHhRo oG0UNt3kuK9D+1CA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id CE1EE139F5; Wed, 31 Jan 2024 15:14:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id EBpoMfNjumWJeQAAn2gu4w (envelope-from ); Wed, 31 Jan 2024 15:14:59 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 31 Jan 2024 16:14:43 +0100 Message-ID: <20240131151446.936281-2-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240131151446.936281-1-pvorel@suse.cz> References: <20240131151446.936281-1-pvorel@suse.cz> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Bar: / Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=IQWzk6mE; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=d7RGb3no X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [0.49 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[5]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.cz:+]; MX_GOOD(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 0.49 X-Rspamd-Queue-Id: 2782221FFB X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-4.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 1/4 v2] runtest/net.nfs: Rename test names X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nfs@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Test names weren't obvious, rename to be more descriptive. Signed-off-by: Petr Vorel --- 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 From patchwork Wed Jan 31 15:14:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1893540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=TwAfBM2O; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dfmz3u5l; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=TwAfBM2O; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=dfmz3u5l; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQ5FQ05x5z23g7 for ; Thu, 1 Feb 2024 02:15:22 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 1B9A93CF93C for ; Wed, 31 Jan 2024 16:15:20 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 266523CB492 for ; Wed, 31 Jan 2024 16:15:02 +0100 (CET) Authentication-Results: in-2.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=2a07:de40:b251:101:10:150:64:2; helo=smtp-out2.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 4EEBA6019A6 for ; Wed, 31 Jan 2024 16:15:01 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8970C1FB86; Wed, 31 Jan 2024 15:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ClPYoEK4bFUBa7k6SnD9lFD1SaV7eKmtVrefH6DHGA=; b=TwAfBM2OXILoTJennKq4re2ISrFXaBLrTrnm72b8S5/xwF0KMciraQ9urTo6FT0aPAGp0U gkhNWnYgnZh+EPjgcKbvR6+ADIflWW+yv+ZdY9nHPAtWMVhDsTVc7KshE7A+YRM3BMhFgP VF0QMcDjBOi6NqCk87+wSUPL4bLG27A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ClPYoEK4bFUBa7k6SnD9lFD1SaV7eKmtVrefH6DHGA=; b=dfmz3u5lraoKl4B9imW+Ktbtrb6LxHY+eCRRsVtjCDeeACqSShDyHpgmOXIqeBVSmuKQsW SneWzQrA1Co37WDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ClPYoEK4bFUBa7k6SnD9lFD1SaV7eKmtVrefH6DHGA=; b=TwAfBM2OXILoTJennKq4re2ISrFXaBLrTrnm72b8S5/xwF0KMciraQ9urTo6FT0aPAGp0U gkhNWnYgnZh+EPjgcKbvR6+ADIflWW+yv+ZdY9nHPAtWMVhDsTVc7KshE7A+YRM3BMhFgP VF0QMcDjBOi6NqCk87+wSUPL4bLG27A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714100; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0ClPYoEK4bFUBa7k6SnD9lFD1SaV7eKmtVrefH6DHGA=; b=dfmz3u5lraoKl4B9imW+Ktbtrb6LxHY+eCRRsVtjCDeeACqSShDyHpgmOXIqeBVSmuKQsW SneWzQrA1Co37WDA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 3AD5B132FA; Wed, 31 Jan 2024 15:15:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id SEvuCvRjumWJeQAAn2gu4w (envelope-from ); Wed, 31 Jan 2024 15:15:00 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 31 Jan 2024 16:14:44 +0100 Message-ID: <20240131151446.936281-3-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240131151446.936281-1-pvorel@suse.cz> References: <20240131151446.936281-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spamd-Result: default: False [1.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 1.90 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,DMARC_MISSING,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-2.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-2.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 2/4] nfsstat01.sh: Validate parsing /proc/net/rpc/nfs{, d} X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nfs@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 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 --- 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" } From patchwork Wed Jan 31 15:14:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1893542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=wT0FWUuy; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ds4Goqyf; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=wT0FWUuy; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ds4Goqyf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQ5G73LcNz23g7 for ; Thu, 1 Feb 2024 02:15:59 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 80A643CF931 for ; Wed, 31 Jan 2024 16:15:57 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id C9EF93CE0B3 for ; Wed, 31 Jan 2024 16:15:02 +0100 (CET) Authentication-Results: in-4.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=195.135.223.130; helo=smtp-out1.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id A0F001013443 for ; Wed, 31 Jan 2024 16:15:01 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 124F121FFC; Wed, 31 Jan 2024 15:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4NyHzSypAU/xhXztmRK3JNtz4kEoUGMQzmH2fCkhWE=; b=wT0FWUuyq8yVM/QPWmfPmtR63QKyvy+s3fRt+PA7xVcIlrfgim3oEjtN8cnVb1LegYxwps qTROtNha9siKuxJ/Wau5VNlFQrKNyNvufq4ameUQMAbLoVsm5E0NRMCDZ5zez/Huu2ZFlu 04IyuhYpQxFh3M+5Bi3gbdND+GDRyRk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4NyHzSypAU/xhXztmRK3JNtz4kEoUGMQzmH2fCkhWE=; b=ds4Goqyf31KXGfVxZuMgU7R5tzeKIMUBVviQbRRaCkI/95MnJAuxPCC0SndvKpUYl4tgFd +ZY/tCGOifmyn/Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4NyHzSypAU/xhXztmRK3JNtz4kEoUGMQzmH2fCkhWE=; b=wT0FWUuyq8yVM/QPWmfPmtR63QKyvy+s3fRt+PA7xVcIlrfgim3oEjtN8cnVb1LegYxwps qTROtNha9siKuxJ/Wau5VNlFQrKNyNvufq4ameUQMAbLoVsm5E0NRMCDZ5zez/Huu2ZFlu 04IyuhYpQxFh3M+5Bi3gbdND+GDRyRk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m4NyHzSypAU/xhXztmRK3JNtz4kEoUGMQzmH2fCkhWE=; b=ds4Goqyf31KXGfVxZuMgU7R5tzeKIMUBVviQbRRaCkI/95MnJAuxPCC0SndvKpUYl4tgFd +ZY/tCGOifmyn/Ag== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 9CDDB139F5; Wed, 31 Jan 2024 15:15:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id kN9hJPRjumWJeQAAn2gu4w (envelope-from ); Wed, 31 Jan 2024 15:15:00 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 31 Jan 2024 16:14:45 +0100 Message-ID: <20240131151446.936281-4-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240131151446.936281-1-pvorel@suse.cz> References: <20240131151446.936281-1-pvorel@suse.cz> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [1.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; RCPT_COUNT_SEVEN(0.00)[11]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 1.90 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-4.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 3/4] nfsstat01.sh: Add support for NFSv4* X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nfs@vger.kernel.org, NeilBrown , Jeff Layton , Steve Dickson , Trond Myklebust , Chuck Lever , Anna Schumaker Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 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 --- 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 From patchwork Wed Jan 31 15:14:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 1893543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=ilnNwczO; dkim=fail reason="signature verification failed" header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=PttOVIja; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=ilnNwczO; dkim=neutral header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=PttOVIja; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQ5GR3qh2z23g7 for ; Thu, 1 Feb 2024 02:16:15 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6D52E3CF957 for ; Wed, 31 Jan 2024 16:16:13 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id C8BA83CE0B0 for ; Wed, 31 Jan 2024 16:15:02 +0100 (CET) Authentication-Results: in-2.smtp.seeweb.it; spf=pass (sender SPF authorized) smtp.mailfrom=suse.cz (client-ip=195.135.223.131; helo=smtp-out2.suse.de; envelope-from=pvorel@suse.cz; receiver=lists.linux.it) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 5189B60133A for ; Wed, 31 Jan 2024 16:15:02 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AA9CC1FB87; Wed, 31 Jan 2024 15:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NAuhXawdoWTktAvjDe0rk2w8Lrgku5Y0TAar1HOcuyE=; b=ilnNwczOzX2HnjZZBxMayHnfmsRvR9DwIhvYmAvQPagZyBxhTo5hTqut1cOe/aryQ5b4j7 46YPdVVirTVwqktzBg8BfgXYz95rYUGTuLnAlS+UrO51Po4i6lxwRz1hRL7vxefJFWteN4 HMGaMePLW7zsRVAX2XjfRmTOv3zu56s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NAuhXawdoWTktAvjDe0rk2w8Lrgku5Y0TAar1HOcuyE=; b=PttOVIjaS161Xk8Dj3DNKbh+uknCZors5RVXmZvGhhqT1hkWxhDq5Wek1i0UGqAnTp98q9 I7nTFePfI/ODUIBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NAuhXawdoWTktAvjDe0rk2w8Lrgku5Y0TAar1HOcuyE=; b=ilnNwczOzX2HnjZZBxMayHnfmsRvR9DwIhvYmAvQPagZyBxhTo5hTqut1cOe/aryQ5b4j7 46YPdVVirTVwqktzBg8BfgXYz95rYUGTuLnAlS+UrO51Po4i6lxwRz1hRL7vxefJFWteN4 HMGaMePLW7zsRVAX2XjfRmTOv3zu56s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1706714101; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NAuhXawdoWTktAvjDe0rk2w8Lrgku5Y0TAar1HOcuyE=; b=PttOVIjaS161Xk8Dj3DNKbh+uknCZors5RVXmZvGhhqT1hkWxhDq5Wek1i0UGqAnTp98q9 I7nTFePfI/ODUIBg== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 2465F132FA; Wed, 31 Jan 2024 15:15:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id MC1lBvVjumWJeQAAn2gu4w (envelope-from ); Wed, 31 Jan 2024 15:15:01 +0000 From: Petr Vorel To: ltp@lists.linux.it Date: Wed, 31 Jan 2024 16:14:46 +0100 Message-ID: <20240131151446.936281-5-pvorel@suse.cz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240131151446.936281-1-pvorel@suse.cz> References: <20240131151446.936281-1-pvorel@suse.cz> MIME-Version: 1.0 X-Spamd-Bar: +++ Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ilnNwczO; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=PttOVIja X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [3.49 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:98:from]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.cz:+]; MX_GOOD(-0.01)[]; RCPT_COUNT_SEVEN(0.00)[11]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:dkim,suse.cz:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[39.81%] X-Spam-Score: 3.49 X-Rspamd-Queue-Id: AA9CC1FB87 X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,DMARC_MISSING,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-2.smtp.seeweb.it X-Virus-Scanned: clamav-milter 1.0.3 at in-2.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH 4/4] nfsstat01.sh: Run on all NFS versions, TCP and UDP X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-nfs@vger.kernel.org, NeilBrown , Jeff Layton , Steve Dickson , Trond Myklebust , Chuck Lever , Anna Schumaker Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 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 Reviewed-by: Martin Doucha --- 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