From mboxrd@z Thu Jan 1 00:00:00 1970 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 E56703B790 for ; Fri, 1 Mar 2024 20:39:31 +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=1709325572; cv=none; b=pfKXee1A97RS5nZ87EHb/zyPokeAuJmdXCQJlhbyZcK1AFmO2sU5gmPWnn3tX9LC2QKp3ZOynyfIJnL2WzNeM7POftumIZh47XlA3Zc7cvPkUHHPFIaCBS5/AGf5ohj4rnReZ1JM8mG8ntDXMYFUNEQ+p7bPAmzEL9qRi1TZdKg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709325572; c=relaxed/simple; bh=kJfxFA3/I4bebAZaLeTGm/QgviIsnHudqm4CvLzFVko=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=lzgHUSGFJ1ufZx9R3BytVCYghdLkeVxmjdZj6NpffjBdOoIyOzaKHWSt+12Vxvx8IXjYfAYieAlGoCZhCeTB7lhDl+1aKVDQ6MFgwZE1V7WRUMpmIqwrOZC+oprKid86xWgqoJJnIZ07p49x57GU5dnYhCCLLu5hnuP66WOFJF0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b35uEZ3P; 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="b35uEZ3P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45930C433C7 for ; Fri, 1 Mar 2024 20:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709325571; bh=kJfxFA3/I4bebAZaLeTGm/QgviIsnHudqm4CvLzFVko=; h=From:To:Subject:Date:From; b=b35uEZ3PaLTmTVooTjM8rcsVZwUPz0/eASVt6tlnIvtadBKDzWgNWZHwFUsD/hh/t wRppQ4VFeA5cA2dQfvdMbiUDXb7oECojR23CZ9cQyMx9dHL7hpEE544jhevibo4PwW c9+6tCLy2D7miqkuyWM3uflXJ+p5GbAouE9XMTIihId37c31q6b5yyZWzOdDHb5XEw gQbbtonWwo3t+CgMHnkl0WXIRQPOiS8C+DatxkJV/MjAvSugSvbJURLqZEJLXkNDOa VYxBEmmpZb9ENKKxMoSDnhrTlookh7DmAHCTaXWYn8jB5UFLXl4HT/K7y0SRbGauXO nq8bS9hxw1Fww== From: Jeff Layton 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 Message-ID: <20240301203929.117386-1-jlayton@kernel.org> X-Mailer: git-send-email 2.43.2 Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This adds a new Kconfig option for testing NFS over RDMA. Signed-off-by: Jeff Layton --- 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