[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230109133116.20801-12-aaptel@nvidia.com>
Date: Mon, 9 Jan 2023 15:31:02 +0200
From: Aurelien Aptel <aaptel@...dia.com>
To: linux-nvme@...ts.infradead.org, netdev@...r.kernel.org,
sagi@...mberg.me, hch@....de, kbusch@...nel.org, axboe@...com,
chaitanyak@...dia.com, davem@...emloft.net, kuba@...nel.org
Cc: Aurelien Aptel <aaptel@...dia.com>, aurelien.aptel@...il.com,
smalin@...dia.com, malin1024@...il.com, ogerlitz@...dia.com,
yorayz@...dia.com, borisp@...dia.com
Subject: [PATCH v8 11/25] nvme-tcp: Add modparam to control the ULP offload enablement
Add ulp_offload module parameter to the nvme-tcp module to control
ULP offload at the NVMe-TCP layer.
Turn ULP offload off be default, regardless of the NIC driver support.
Overall, in order to enable ULP offload:
- nvme-tcp ulp_offload modparam must be set to 1
- netdev->ulp_ddp_caps.active must have ULP_DDP_C_NVME_TCP and/or
ULP_DDP_C_NVME_TCP_DDGST_RX capabilities flag set.
Signed-off-by: Yoray Zack <yorayz@...dia.com>
Signed-off-by: Shai Malin <smalin@...dia.com>
Signed-off-by: Aurelien Aptel <aaptel@...dia.com>
---
drivers/nvme/host/tcp.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 52e0db53d067..1ce9de41a2f5 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -34,6 +34,16 @@ static int so_priority;
module_param(so_priority, int, 0644);
MODULE_PARM_DESC(so_priority, "nvme tcp socket optimize priority");
+#ifdef CONFIG_ULP_DDP
+/* NVMeTCP direct data placement and data digest offload will not
+ * happen if this parameter false (default), regardless of what the
+ * underlying netdev capabilities are.
+ */
+static bool ulp_offload;
+module_param(ulp_offload, bool, 0644);
+MODULE_PARM_DESC(ulp_offload, "Enable or disable NVMeTCP ULP support");
+#endif
+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
/* lockdep can detect a circular dependency of the form
* sk_lock -> mmap_lock (page fault) -> fs locks -> sk_lock
@@ -315,6 +325,9 @@ static bool nvme_tcp_ddp_query_limits(struct net_device *netdev,
{
int ret;
+ if (!ulp_offload)
+ return false;
+
if (!netdev || !is_netdev_ulp_offload_active(netdev, NULL) ||
!netdev->netdev_ops->ulp_ddp_ops->ulp_ddp_limits)
return false;
@@ -453,6 +466,9 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)
netdev->ulp_ddp_caps.active);
int ret;
+ if (!ulp_offload)
+ return 0;
+
config.nvmeotcp.pfv = NVME_TCP_PFV_1_0;
config.nvmeotcp.cpda = 0;
config.nvmeotcp.dgst = queue->hdr_digest ? NVME_TCP_HDR_DIGEST_ENABLE : 0;
@@ -504,6 +520,9 @@ static void nvme_tcp_offload_limits(struct nvme_tcp_queue *queue, struct net_dev
{
struct ulp_ddp_limits limits = {.type = ULP_DDP_NVME };
+ if (!ulp_offload)
+ return;
+
if (!nvme_tcp_ddp_query_limits(netdev, &limits)) {
queue->ctrl->offloading_netdev = NULL;
return;
--
2.31.1
Powered by blists - more mailing lists