From: Jeff Layton <jlayton@kernel.org>
To: kdevops@lists.linux.dev
Subject: [PATCH] fstests: add an option for testing nfs over rdma
Date: Fri, 1 Mar 2024 15:39:29 -0500 [thread overview]
Message-ID: <20240301203929.117386-1-jlayton@kernel.org> (raw)
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 b0d9e0da1732..170819d9b2f7 100644
--- a/playbooks/roles/fstests/defaults/main.yml
+++ b/playbooks/roles/fstests/defaults/main.yml
@@ -156,6 +156,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 2396f4297014..464c3704438d 100644
--- a/playbooks/roles/nfsd/templates/nfs.conf.j2
+++ b/playbooks/roles/nfsd/templates/nfs.conf.j2
@@ -1,5 +1,6 @@
[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 f9526b375cf7..09637138d8ca 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 686e27ae68a4..a12570f700b8 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.43.2
next reply other threads:[~2024-03-01 20:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 20:39 Jeff Layton [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-26 16:58 [PATCH] fstests: add an option for testing nfs over rdma Jeff Layton
2024-01-26 17:23 ` Chuck Lever III
2024-01-26 17:45 ` Jeff Layton
2024-01-26 17:54 ` Chuck Lever III
2024-01-26 18:14 ` Jeff Layton
2024-01-26 18:32 ` Chuck Lever III
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=20240301203929.117386-1-jlayton@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).