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 9DD9E1DDEB for ; Fri, 26 Jan 2024 16:58:35 +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=1706288315; cv=none; b=AlmT8anIdltkB48z0HiwhEi0vwoUoUzbEkTy7Zrxgpkkv2tmGdk7l4Vn0DNFFcvKeO3RbA0IQenqYOALeqyWO/aRS73+uuQj09E98Hn8ymwA5BTW05kCUMK67cTG3qYDDQS815x/2e9zh+dXXmHd4YNFRkuui+GjQVp+GcXG2cM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706288315; c=relaxed/simple; bh=SuN5SwZ1STNxGoOL6Jg/6ZsMlFBKjwmzeGwCPXhPOXM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Z0+lqD6doADREOhoPlYoLFLQM3M+sKeYTWYiFVZcZl235X5CK6eM0bzaIa1oAkw8wuTd3mQ6TINu62yhRgCf7GpWLZX04+vl+ehEl+5afzXHW+TCKASH8cZz3u2w5NRWyRcTdzfo5nD+oIOVs3h/pl3DdHUTtPFSCE2EoEouenU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hC1azEDE; 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="hC1azEDE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEA88C433F1; Fri, 26 Jan 2024 16:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706288315; bh=SuN5SwZ1STNxGoOL6Jg/6ZsMlFBKjwmzeGwCPXhPOXM=; h=From:To:Cc:Subject:Date:From; b=hC1azEDEkmlo0A4ctkmsKIOQqF3iipkMIGQ4JzE08O35mFyp6DbUxy23/SfEy/jtU ugAi/WRtRYjd/QqLoR7q54xSsHJ99eghyagrmeNMjxZyhwsCzgy5NaZlihwzl49F56 EIp18Qw9Otfs63oBcBqnORTFv2GxksRTexhk6/v/FLUqWAwI7YK4z5nWWP2qO1hfHD sc/dY3F2rcyUVKH+2ZAb1/vvKnzWtNoipQF9Ue4iRXWJBC7orrpjWnRlvXQccOKP4T 3B35ahqL+eA7woRYeh3p0Bk4ZK7fPrAzyoLbHj8pvTnB0gBj2sTHIwy+f2LEzV4q1z 1cdwqz1SRU3vw== From: Jeff Layton To: kdevops@lists.linux.dev Cc: chuck.lever@oracle.com Subject: [PATCH] fstests: add an option for testing nfs over rdma Date: Fri, 26 Jan 2024 11:58:33 -0500 Message-ID: <20240126165833.69014-1-jlayton@kernel.org> X-Mailer: git-send-email 2.43.0 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/templates/nfs/nfs.config | 7 +++++++ playbooks/roles/nfsd/templates/nfs.conf.j2 | 1 + workflows/fstests/nfs/Kconfig | 8 ++++++++ workflows/fstests/nfs/Makefile | 3 +++ 4 files changed, 19 insertions(+) diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config index e2265f3f3ee2..77d583d84bc2 100644 --- a/playbooks/roles/fstests/templates/nfs/nfs.config +++ b/playbooks/roles/fstests/templates/nfs/nfs.config @@ -15,6 +15,13 @@ CANON_DEVS=yes # Test with default mount options [nfs_default] {% endif %} +{% 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 1be49ca74120..79ca7c0a7a55 100644 --- a/playbooks/roles/nfsd/templates/nfs.conf.j2 +++ b/playbooks/roles/nfsd/templates/nfs.conf.j2 @@ -1,3 +1,4 @@ [nfsd] udp=y +rdma=y threads={{ nfsd_threads }} diff --git a/workflows/fstests/nfs/Kconfig b/workflows/fstests/nfs/Kconfig index 7e8731dc4dc1..5bbf0a34a124 100644 --- a/workflows/fstests/nfs/Kconfig +++ b/workflows/fstests/nfs/Kconfig @@ -54,6 +54,14 @@ config FSTESTS_NFS_SECTION_DEFAULT time of this writing, this makes the client autonegotiate an NFS version, starting with v4.2 if it's available. +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 0e5245920ee9..2daa058a5377 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.0