From patchwork Tue Dec 10 19:29:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13901959 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F42523ED63 for ; Tue, 10 Dec 2024 19:29:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733858964; cv=none; b=EtnLUXhX8N0C//TUsUniWteX2Z9f7KXOdq984FL5wJ1IPoLK3JcTK45fTTVXpZ295wLwynuXb8ep2mfvGoEilWq1hBQNYeiIEAgdwfEgwtSl8d4lphh3Lb2lgA3AXnUfjj6oVhWIvq1WUoCBj330pFKzdZ1gr9m4iceBsLkIVXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733858964; c=relaxed/simple; bh=a/YcmIOHcM07itQ3DmEpTfX+mGpm9qypOAa5P6aJOTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ar/ckOzXkAzOWdvv6FOSkjphWD2TbPoZNBHWKxh1dDTpHg0jfWxaZCX4zfOe60OmIDtjOs+LRUE0I2joIf4sA54IShSl3lOXMy3EaEcHbow55ZsMnXomUYnB/TC6zpKNWui16hQt1NS7jcTMx3I1JsyY31VHP4Sa3D6NogeigP8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=khQJW9Vn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="khQJW9Vn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDA36C4CEE0; Tue, 10 Dec 2024 19:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733858964; bh=a/YcmIOHcM07itQ3DmEpTfX+mGpm9qypOAa5P6aJOTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=khQJW9VnKW5neNrC3RpxqxOmfjjz2MdmScP/fn5kVTzFaDVFY+0XRzrEWCnAJrxsF cpQ9tfqE1/kqWCotwez45ev+J+tHNcAo3EBPLpYzfft3LUdfgMxt1jaSNYNVr4bu21 vXbMMrzwER6PwYbS62sU5nl6m6qR0dorbQpf/XR6cN3v2PhUNo4qUxyH3+x1CvoGYj jpShc5iI3x/53Bl0kXkLP4006CQWJEPcTtOHs5wkmryzBiUFQPMfq6kR04IYbsqZWV 1TBPSjmkWkwbf2ot79bZndx+pNQJmp8B1DIvCyWTlnlUudQvf89/9MdN4nzsczXVrm eol94WJ3/PZOw== From: cel@kernel.org To: Cc: Anna Schumaker , Chuck Lever Subject: [PATCH 1/6] fstests: Fix NFS mount options for fstests Date: Tue, 10 Dec 2024 14:29:14 -0500 Message-ID: <20241210192920.682914-2-cel@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241210192920.682914-1-cel@kernel.org> References: <20241210192920.682914-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever If the NFS mount command line does not specify an NFS version, the client uses the default protocol version , which for recent versions of nfs-utils, is NFSv4.2. I noticed the NFS test sections in our nfs.config file specifies the NFS version for the test partition, but not the scratch partition. This is throwing off the feature test macros in fstests, so it is testing, say, xattrs, on NFSv4.1 mounts, and failing 100% of the time. Ensure that the test and scratch partitions use the same NFS version. Signed-off-by: Chuck Lever --- playbooks/roles/fstests/templates/nfs/nfs.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config index 3605e582b2d7..b26c45c11bc3 100644 --- a/playbooks/roles/fstests/templates/nfs/nfs.config +++ b/playbooks/roles/fstests/templates/nfs/nfs.config @@ -21,14 +21,14 @@ MOUNT_OPTIONS="-o vers=4.1" # Test over RDMA [nfs_rdma] -TEST_FS_MOUNT_OPTS="-o rdma" +TEST_FS_MOUNT_OPTS="-o rdma,vers=4.1" MOUNT_OPTIONS="-o rdma,vers=4.1" {% endif %} {% if fstests_nfs_section_tls -%} # Test NFS with RPC over TLS [nfs_tls] -TEST_FS_MOUNT_OPTS="-o xprtsec=mtls" +TEST_FS_MOUNT_OPTS="-o xprtsec=mtls,vers=4.1" MOUNT_OPTIONS="-o xprtsec=mtls,vers=4.1" {% endif %} {% if fstests_nfs_section_nfsd -%}