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 2C3FF135A6C for ; Mon, 3 Jun 2024 16:07:05 +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=1717430825; cv=none; b=CpmL5ORiOXzh5Kx7h4SalW845+CGTPol6c2XrU09DUnMzZabOmsJps+945UlbmdR4bKLxfDvr+NxL/xpCZhCM1VuNoGbNWdCb2dvwZxnYHEZ+F5AsDeSwNXOnhU9oiqk9erWF1rAJnt2O+35efgGLdE9bo7M3HTUTXDFLVVGpUE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717430825; c=relaxed/simple; bh=niSnDrvw73+UzzF5gozECjDDWvvWW6pq6XjZGasddAo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S2c7bjQE4uKzDQTHMs8CDFtXx0XxeJ7yYpdgit/uRrLSlQ8XX68DfnZOSD3bqfZD/uPCGiF0gJuQJzUFJNCUzwN6ZWFlekEjqfPgrPvBdkLX/siF47Kae3jYKK7+KkvIRjMkgBxz5pS84m6FOO9dzVb6RBC9Z8dy0Ms8YqSHcyg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ahrb1Jhf; 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="Ahrb1Jhf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFCE5C4AF07; Mon, 3 Jun 2024 16:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717430825; bh=niSnDrvw73+UzzF5gozECjDDWvvWW6pq6XjZGasddAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ahrb1JhfiKI9GVeZ8o7cdl2FaTkfwoU30uoQZEYxEGq73zIATknv522gMCeozNmpa Li0u/DP0a+EGh/XxGKaiI+pnFrgyGnwkw2xgj1M1VGx6XJWUQmW4hdHAzaGkxkNQMF Gg2lZR7tVPPhWsu7pYBlM2uqpqfo6bscSUlJS9AA0uOp0j4qJI3X+P7vDchs57/LJL LfGDlId9GiPm81x2PHi1t7WmQzBMteanIP2xK4hsggLHe+C4yHmKFZOqEpzDCgnp8W +GqBKjA2lj05o4dmJiUretfz5D5ClEdQw38aS6NKOTxMiIBAWlJF4cQZ+iTHJLD3/F OtWrnkf+mC8nw== From: cel@kernel.org To: Cc: Chuck Lever Subject: [PATCH 1/4] bringup.goals: Make siw settings more generic Date: Mon, 3 Jun 2024 12:06:55 -0400 Message-ID: <20240603160658.4073204-2-cel@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240603160658.4073204-1-cel@kernel.org> References: <20240603160658.4073204-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever I'm about to introduce another option for software RDMA. Rename the siw Makefile and Kconfig options to make way for this new option. Since only one type of emulated RDMA device can be attached to an Ethernet device at a time, make the Kconfig logic choose between no device, siw, or, when it's added, rxe. NB: This patch replaces CONFIG_KDEVOPS_SETUP_SIW. If you have enabled siw in your configuration, please visit the config setting for software RDMA after applying this patch. Signed-off-by: Chuck Lever --- Makefile | 2 +- kconfigs/Kconfig.bringup.goals | 26 +++++++++++++++++++------ scripts/{siw.Makefile => rdma.Makefile} | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) rename scripts/{siw.Makefile => rdma.Makefile} (79%) diff --git a/Makefile b/Makefile index 266eccd90111..20c2081118a9 100644 --- a/Makefile +++ b/Makefile @@ -104,7 +104,7 @@ ifeq (y,$(CONFIG_WORKFLOWS)) include workflows/Makefile endif # CONFIG_WORKFLOWS -include scripts/siw.Makefile +include scripts/rdma.Makefile include scripts/ktls.Makefile include scripts/nfsd.Makefile include scripts/smbd.Makefile diff --git a/kconfigs/Kconfig.bringup.goals b/kconfigs/Kconfig.bringup.goals index e6d3b1815f3b..e8629ebea5e0 100644 --- a/kconfigs/Kconfig.bringup.goals +++ b/kconfigs/Kconfig.bringup.goals @@ -77,16 +77,30 @@ config KDEVOPS_TRY_INSTALL_KDEV_TOOLS most kernel developers might prefer to have installed on target systems. -config KDEVOPS_SETUP_SIW - bool "Configure soft iWARP on all test systems" - default n +choice + prompt "Configure an RDMA device" + default KDEVOPS_SETUP_RDMA_NONE help - Configure software-emulated RDMA on all target hosts via the + Provision an RDMA device on target nodes. The default is to + provision no additional RDMA devices. + +config KDEVOPS_SETUP_RDMA_NONE + bool "none" + help + Do not provision an additional RDMA device on target nodes. + This is the default behavior. + +config KDEVOPS_SETUP_RDMA_SIW + bool "siw" + help + Provision software-emulated RDMA on target nodes via the kernel siw.ko driver. siw can be used with any standard Ethernet device, including virtio-net devices. - Because siw is currently not enabled in most Linux distro - kernels, this option defaults to N. + To use this device driver, enable the CONFIG_RDMA_SIW + option in your test kernels. + +endchoice config KDEVOPS_SETUP_KTLS bool "Configure ktls on the hosts with self-signed CA" diff --git a/scripts/siw.Makefile b/scripts/rdma.Makefile similarity index 79% rename from scripts/siw.Makefile rename to scripts/rdma.Makefile index d09d1a2f82ac..d7cdf0062638 100644 --- a/scripts/siw.Makefile +++ b/scripts/rdma.Makefile @@ -1,4 +1,4 @@ -ifeq (y,$(CONFIG_KDEVOPS_SETUP_SIW)) +ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW)) siw: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --extra-vars=@./extra_vars.yaml \ -- 2.45.1