From: Jeff Layton <jlayton@kernel.org>
To: kdevops@lists.linux.dev
Cc: Jeff Layton <jlayton@kernel.org>
Subject: [PATCH 2/8] fstests: add an option for testing nfs over rdma
Date: Wed, 20 Mar 2024 09:11:25 -0400 [thread overview]
Message-ID: <20240320-fixes-v1-2-d1567776ad50@kernel.org> (raw)
In-Reply-To: <20240320-fixes-v1-0-d1567776ad50@kernel.org>
This adds a new Kconfig option for testing NFS over RDMA.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
playbooks/roles/fstests/defaults/main.yml | 1 +
playbooks/roles/fstests/templates/nfs/nfs.config | 7 +++++++
playbooks/roles/nfsd/templates/nfs.conf.j2 | 1 +
workflows/fstests/nfs/Kconfig | 8 ++++++++
workflows/fstests/nfs/Makefile | 3 +++
5 files changed, 20 insertions(+)
diff --git a/playbooks/roles/fstests/defaults/main.yml b/playbooks/roles/fstests/defaults/main.yml
index 1d14568a03d0..a46a4672dfa5 100644
--- a/playbooks/roles/fstests/defaults/main.yml
+++ b/playbooks/roles/fstests/defaults/main.yml
@@ -161,6 +161,7 @@ fstests_btrfs_section_simple_zns: False
fstests_nfs_enable: False
fstests_nfs_use_kdevops_nfsd: False
+fstests_nfs_section_rdma: False
fstests_nfs_section_tls: False
fstests_nfs_section_default: False
fstests_nfs_section_v42: False
diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config
index f301075a8928..b5c90534f4df 100644
--- a/playbooks/roles/fstests/templates/nfs/nfs.config
+++ b/playbooks/roles/fstests/templates/nfs/nfs.config
@@ -10,6 +10,13 @@ SCRATCH_DEV="{{ fstests_nfs_scratch_devpool }}"
RESULT_BASE=$PWD/results/$HOST/$(uname -r)
TEST_DEV={{ fstests_nfs_test_dev }}
CANON_DEVS=yes
+{% if fstests_nfs_section_rdma -%}
+
+# Test over RDMA
+[nfs_rdma]
+TEST_FS_MOUNT_OPTS="-o rdma"
+MOUNT_OPTIONS="-o rdma"
+{% endif %}
{% if fstests_nfs_section_tls -%}
# Test NFS with RPC over TLS
diff --git a/playbooks/roles/nfsd/templates/nfs.conf.j2 b/playbooks/roles/nfsd/templates/nfs.conf.j2
index 8e89eba4a095..a5f4a714ec34 100644
--- a/playbooks/roles/nfsd/templates/nfs.conf.j2
+++ b/playbooks/roles/nfsd/templates/nfs.conf.j2
@@ -3,6 +3,7 @@ pipefs-directory={{ pipefs_directory }}
[nfsd]
udp=y
+rdma=y
threads={{ nfsd_threads }}
grace-time={{ nfsd_lease_time }}
lease-time={{ nfsd_lease_time }}
diff --git a/workflows/fstests/nfs/Kconfig b/workflows/fstests/nfs/Kconfig
index b6daeeb490c5..9f47761712b2 100644
--- a/workflows/fstests/nfs/Kconfig
+++ b/workflows/fstests/nfs/Kconfig
@@ -46,6 +46,14 @@ config FSTESTS_NFS_MANUAL_COVERAGE
if FSTESTS_NFS_MANUAL_COVERAGE
+config FSTESTS_NFS_SECTION_RDMA
+ bool "Enable testing section: nfs_rdma"
+ default n
+ help
+ Enabling this will test with the "rdma" mount option. Unless the
+ hosts have RDMA hardware already, you probably also want to enable
+ CONFIG_KDEVOPS_SETUP_SIW as well.
+
config FSTESTS_NFS_SECTION_TLS
bool "Enable testing section: nfs_tls"
default n
diff --git a/workflows/fstests/nfs/Makefile b/workflows/fstests/nfs/Makefile
index ba4387e128f5..f06fdb9f2a51 100644
--- a/workflows/fstests/nfs/Makefile
+++ b/workflows/fstests/nfs/Makefile
@@ -9,6 +9,9 @@ FSTESTS_ARGS += fstests_nfs_server_host='$(FSTESTS_NFS_SERVER_HOST)'
ifeq (y,$(CONFIG_FSTESTS_NFS_SECTION_DEFAULT))
FSTESTS_ARGS += fstests_nfs_section_default=True
endif
+ifeq (y,$(CONFIG_FSTESTS_NFS_SECTION_RDMA))
+FSTESTS_ARGS += fstests_nfs_section_rdma=True
+endif
ifeq (y,$(CONFIG_FSTESTS_NFS_SECTION_TLS))
FSTESTS_ARGS += fstests_nfs_section_tls=True
endif
--
2.44.0
next prev parent reply other threads:[~2024-03-20 13:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-20 13:11 [PATCH 0/8] kdevops: random fixes Jeff Layton
2024-03-20 13:11 ` [PATCH 1/8] fstests: remove the nfs_default guest Jeff Layton
2024-03-20 13:11 ` Jeff Layton [this message]
2024-03-20 13:11 ` [PATCH 3/8] fstests: enable the "codeready" repo on RHEL and CentOS Jeff Layton
2024-03-20 13:11 ` [PATCH 4/8] kotd: display the running kernel version after updating Jeff Layton
2024-03-20 13:11 ` [PATCH 5/8] devconfig: run it on nfsd in addition to the all group Jeff Layton
2024-03-20 13:11 ` [PATCH 6/8] devconfig: don't install dump on redhat family hosts Jeff Layton
2024-03-20 13:11 ` [PATCH 7/8] redhat: fix up some install-deps cases for CentOS Jeff Layton
2024-03-20 13:11 ` [PATCH 8/8] nfsd: default to a more sane number of threads Jeff Layton
2024-03-20 14:10 ` Chuck Lever
2024-03-20 14:48 ` Jeff Layton
2024-03-20 15:15 ` Chuck Lever
2024-03-20 16:56 ` Jeff Layton
2024-03-20 14:11 ` [PATCH 0/8] kdevops: random fixes Chuck Lever
2024-03-20 14:29 ` Jeff Layton
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=20240320-fixes-v1-2-d1567776ad50@kernel.org \
--to=jlayton@kernel.org \
--cc=kdevops@lists.linux.dev \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).