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 077DC4084D for ; Wed, 20 Mar 2024 13:11:36 +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=1710940297; cv=none; b=a+UmvRobUxYC7j5fjonSkmVw+n9okzbisyxvfnPis6j0EncuGEu6HJ6mFFqVeiGF2vLGw5krn0E61fAC4acaL/+VkCgawt61eTmeIyakIaAlJ2YDyafczyWyXAabx6urQIgoCJk8Cj0qZy64WvxhUec0HGlN1akTZFEWWrsy3Rg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710940297; c=relaxed/simple; bh=FjXxtVZCt7Rk2saFV6pCJ4dYI/ToH/QFCXPxJ6QzcEk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CCdbrgdPXuUhUtD0w8eauY5EwS8UlwjIKY86AhT1qeoa9hW8/84ARQ6+mB99rrusBBYN7lLV18/hbcaWzL9DK9I4FcOuXi61hxeoC0TPSsObDXWV1ZItUKdb09irw/ynYbhcRxmknIcVHIQFUQmVm3TIlamwVl3TWQEDOwoAvzU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lMDMn++L; 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="lMDMn++L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A5ACC433A6; Wed, 20 Mar 2024 13:11:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710940296; bh=FjXxtVZCt7Rk2saFV6pCJ4dYI/ToH/QFCXPxJ6QzcEk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lMDMn++LXZNutrlR7Z9IAA18cVvqUEz2XT9M2hEySRtK51PgsCPpkjkZgrW+r2IPf 7sRhwrDZdO0b5kq1yGq9/eWfUgh6iVzstreQXjh3fsNCyb1q+zF8576HyPazmp0IgB pQaQhs41sRyLRkdl0Rtef+Yz9VRvL65+44Ug1Tyb4Ho2lqnCcmbNyPsjlFbIh7SYb3 eVfV9ni+OHwxcrG6DbWGJKy9XKjZuAFq/5QFac+JkYLZiIoeevcthaYFzoO6zmelOV O9ddFA4jfiFddLwOeo0FU/cSGXQ4nMWdeL1PT4afGyL1kSFOFRsMtOP48SrTxYNUIA lRDIQGrg5cLUA== From: Jeff Layton Date: Wed, 20 Mar 2024 09:11:25 -0400 Subject: [PATCH 2/8] fstests: add an option for testing nfs over rdma Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240320-fixes-v1-2-d1567776ad50@kernel.org> References: <20240320-fixes-v1-0-d1567776ad50@kernel.org> In-Reply-To: <20240320-fixes-v1-0-d1567776ad50@kernel.org> To: kdevops@lists.linux.dev Cc: Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3296; i=jlayton@kernel.org; h=from:subject:message-id; bh=FjXxtVZCt7Rk2saFV6pCJ4dYI/ToH/QFCXPxJ6QzcEk=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBl+uCG6plgwxEY8E61PaddSgpbkd5du4TddDfaJ WcCxK3QwoeJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZfrghgAKCRAADmhBGVaC Fd/VEACcdnbsGN5m7hzq8j5jWQ+NmxoVJ/2sqqfYIeoDMMe5WEZkFWVdD1abPN+P6a1DG7P4eq9 t+1vimm22hKybMFcLHNcr4xdTXl0eO9O/6zixPMAo1znTpjwmumbqkzYr5+lUcZRQ7pbuxODdgw buTYtBMjcv3JiBeCRBiqFSfNRBPHVYi85E8d3v36IzhSzucwbOI6Iybsg74iMnl8EMUIaV23Lc+ NqRCe4YxB8n0FfKCSA+DEgZDlW/L6sox1AWAtZnDoK28iZ8q8OzbA6f+KJ8lOB5UJpx6WSZMMJ5 trLaVfNMwYdBCDsPHWtAVn0UFxRBqJEta1igUpYpqMsGzOIIc+69JJDnPDG3h+Ih8cLdLPJjcbj MZrW8LvMKnsCfjMBnyKZcgo7mMF8GEfAxFFPEsahfjisAeEli/IGt/5UQha5Uac3O+DFv0TW37V ZXUIH+4279ievY5My9TJG7AZJZqq1GLeC0pIQXrK/sBOhebDYIYgqmOOIMpHZXoDGhw/4BNrds/ rvViIlYOM3NIqMhaKJ8sbeKtCX2y5a3CmWvxe98IDSjZlSvZ68FemxmZvBBlZj6yAcR1qX7xNq9 RYSQjB5EsHrE9rHOqKaqgLGIQsRrhuvthpNUNhQM6bgQLnBJSRn+xtAFWqDi7NmX3Fkl18j/MOn yuTSkLJv6Qp5pyQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 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 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