Skip to contentSkip to conversation

nvme-tcp: NIC topology aware I/O queue scaling and queue info export

PATCH RESEND In review Nilay Shroff 4 participants 13 messages Jul 31 – Aug 8

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover nvme-tcp: NIC topology aware I/O queue scaling and queue info export

Hi,

This is a resend of the previous series to include the networking maintainers and mailing list. There are no code or commit message changes since the previous posting.

This series has been updated based on the feedback received during LSFMM. The changelog is updated accordingly.

The NVMe/TCP host driver currently provisions I/O queues primarily based on CPU availability rather than the capabilities and topology of the underlying network interface.

On modern systems with many CPUs but fewer NIC hardware queues, this can lead to multiple NVMe/TCP I/O workers contending for the same TX/RX queue, resulting in increased lock contention, cacheline bouncing, and degraded throughput.

This RFC proposes a set of changes to better align NVMe/TCP I/O queues with NIC queue resources, and to expose queue/flow information to enable more effective system-level tuning.

Key ideas
---------

1. Scale NVMe/TCP I/O queues based on NIC queue count
Instead of relying solely on CPU count, limit the number of I/O workers to:

       min(num_online_cpus, netdev->real_num_{tx,rx}_queues)

2. Improve CPU locality
Align NVMe/TCP I/O workers with CPUs associated with NIC IRQ affinity to reduce cross-CPU traffic and improve cache locality.

3. Expose queue and flow information via debugfs
Export per-I/O queue information including:
- queue id (qid)
- CPU affinity
- TCP flow (src/dst IP and ports)

This enables userspace tools to configure:
- IRQ affinity
- RPS/XPS
- ntuple steering
- or any other scaling as deemed feasible

4. Provide infrastructure for extensible debugfs support in NVMe

Together, these changes allow better alignment of:

    flow -> NIC queue -> IRQ -> CPU -> NVMe/TCP I/O worker

Performance Evaluation
----------------------
Tests were conducted using fio over NVMe/TCP with the following parameters:

    ioengine=io_uring
    direct=1
    bs=4k
    numjobs=<#nic-queues>
    iodepth=64
System:
    CPUs: 72
    NIC: 100G mlx5

Two configurations were evaluated.

Scenario 1: NIC queues < CPU count
----------------------------------
- CPUs: 72
- NIC queues: 32

                Baseline        Patched        Patched + tuning
randread        3141 MB/s       3228 MB/s      7509 MB/s
                (767k IOPS)     (788k IOPS)    (1833k IOPS)
randwrite       4510 MB/s       6172 MB/s      7518 MB/s
                (1101k IOPS)    (1507k IOPS)   (1836k IOPS)
randrw (read)   2156 MB/s       2560 MB/s      3932 MB/s
                (526k IOPS)     (625k IOPS)    (960k IOPS)
randrw (write)  2155 MB/s       2560 MB/s      3932 MB/s
                (526k IOPS)     (625k IOPS)    (960k IOPS)

Observation:
When CPU count exceeds NIC queue count, the baseline configuration suffers from queue contention. The proposed changes provide modest improvements on their own, and when combined with queue-aware tuning (IRQ affinity, ntuple steering, and CPU alignment), enable up to ~1.5x–2.5x throughput improvement.

Scenario 2: NIC queues == CPU count
-----------------------------------

- CPUs: 72
- NIC queues: 72

                Baseline                Patched + tuning
randread        4310 MB/s               7987 MB/s
                (1052k IOPS)            (1950k IOPS)

randwrite 7947 MB/s 7972 MB/s

                (1940k IOPS)            (1946k IOPS)

randrw (read) 3583 MB/s 4030 MB/s

                (875k IOPS)             (984k IOPS)

randrw (write) 3583 MB/s 4029 MB/s

                (875k IOPS)             (984k IOPS)

Observation:
When NIC queues are already aligned with CPU count, the baseline performs well. The proposed changes maintain write performance (no regression) and still improve read and mixed workloads due to better flow-to-CPU locality.

Notes on tuning
---------------
The "patched + tuning" configuration includes:
- aligning NVMe/TCP I/O workers with NIC queue count
- IRQ affinity configuration per RX queue
- ntuple-based flow steering
- CPU/queue affinity alignment

These tuning steps are enabled by the queue/flow information exposed through this patchset.

As usual, feedback/comment/suggestions are most welcome!

Changes from v1:
- remove the "match-hw-queues" fabric option; always limit the number of NVMe/TCP I/O queues to min(num_online_cpus, num_nic_queues)
- drop the diagnostic patch reporting NIC queue underutilization
- split the netdev helper into a separate patch
- move the netdev helper implementation to net/core/dev.c

Link to v1: https://lore.kernel.org/all/[email protected]/

Nilay Shroff (4):
net: add helper for device lookup by destination address
nvme-tcp: limit I/O queue count based on NIC queue count
nvme: add debugfs helpers for NVMe drivers
nvme: expose queue information via debugfs

 drivers/nvme/host/Makefile  |   2 +-
 drivers/nvme/host/core.c    |   3 +
 drivers/nvme/host/debugfs.c | 191 ++++++++++++++++++++++++++++++++++++
 drivers/nvme/host/nvme.h    |  12 +++
 drivers/nvme/host/tcp.c     | 115 ++++++++++++++++++++++
 include/linux/netdevice.h   |   5 +
 net/core/dev.c              |  84 ++++++++++++++++
 7 files changed, 411 insertions(+), 1 deletion(-)
 create mode 100644 drivers/nvme/host/debugfs.c
Signature · 1 line
2.53.0
#1 lore raw

PATCH RESEND v2 1/4 net: add helper for device lookup by destination address

Add netdev_get_by_addr(), a helper that looks up the routing table to retrieve the network device associated with a destination address. The helper also supports netdev reference tracking.

---
 include/linux/netdevice.h |  5 +++
 net/core/dev.c            | 84 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
include/linux/netdevice.h +5 -0
index 9981d637f8b5..f43c3aa8486c 100644
@@ -3487,6 +3487,11 @@ struct net_device *netdev_get_by_index(struct net *net, int ifindex,
 struct net_device *netdev_get_by_index_lock(struct net *net, int ifindex);
 struct net_device *netdev_get_by_name(struct net *net, const char *name,
 				      netdevice_tracker *tracker, gfp_t gfp);
+struct net_device *netdev_get_by_addr(struct net *net,
+				      struct sockaddr_storage *src,
+				      struct sockaddr_storage *dest,
+				      netdevice_tracker *tracker,
+				      gfp_t gfp);
 struct net_device *netdev_get_by_flags_rcu(struct net *net, netdevice_tracker *tracker,
 					   unsigned short flags, unsigned short mask);
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
net/core/dev.c +84 -0

96 lines not on this page · raw message

Signature · 1 line
2.53.0
#2 lore raw

PATCH RESEND v2 2/4 nvme-tcp: limit I/O queue count based on NIC queue count

In reply to Nilay Shroff

NVMe-TCP currently provisions I/O queues based primarily on the number of online CPUs. On systems where the CPU count significantly exceeds the number of NIC hardware queues, multiple NVMe-TCP I/O queues end up sharing the same NIC TX/RX queues. This increases lock contention, cacheline bouncing, and inter-processor interrupts (IPIs), reducing I/O efficiency.

Limit the number of NVMe-TCP default I/O queues to the smaller of the number of online CPUs and the number of NIC hardware queues. Aligning the number of NVMe-TCP I/O queues with the NIC queue topology reduces queue sharing, improves locality, and can improve throughput while reducing tail latency.

The number of NVMe-TCP I/O queues is now limited to:

min(num_online_cpus, num_nic_queues)

---
 drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
drivers/nvme/host/tcp.c +61 -0
index ba5c7b3e2a7c..a2110287099e 100644
@@ -1774,6 +1774,50 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl,
 	return ret;
 }
 
+static struct net_device *nvme_tcp_get_netdev(struct nvme_ctrl *ctrl,
+		netdevice_tracker *tracker, gfp_t gfp)
+{
+	struct net_device *dev = NULL;
+
+	if (ctrl->opts->mask & NVMF_OPT_HOST_IFACE)
+		dev = netdev_get_by_name(&init_net, ctrl->opts->host_iface,
+				tracker, gfp);
+	else {
+		struct nvme_tcp_ctrl *tctrl = to_tcp_ctrl(ctrl);
+		struct sockaddr_storage *src = NULL, *dest = NULL;
+
+		if (ctrl->opts->mask & NVMF_OPT_HOST_TRADDR)
+			src = &tctrl->src_addr;
+
+		dest = &tctrl->addr;
+
+		dev = netdev_get_by_addr(&init_net, src, dest, tracker, gfp);
+	}
+	return dev;
+}
+
+/*
+ * Returns number of active NIC queues (min of TX/RX), or 0 if device cannot
+ * be determined.
+ */
+static int nvme_tcp_get_netdev_current_queue_count(struct nvme_ctrl *ctrl)
+{
+	struct net_device *dev;
+	int tx_queues, rx_queues;
+	netdevice_tracker tracker;
+
+	dev = nvme_tcp_get_netdev(ctrl, &tracker, GFP_KERNEL);
+	if (!dev)
+		return 0;
+
+	tx_queues = dev->real_num_tx_queues;
+	rx_queues = dev->real_num_rx_queues;
+
+	netdev_put(dev, &tracker);
+
+	return min(tx_queues, rx_queues);
+}
+
 static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
 				key_serial_t pskid)
 {
@@ -2165,6 +2209,23 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
 	unsigned int nr_io_queues;
 	int ret;
 
+	if (!(ctrl->opts->mask & NVMF_OPT_NR_IO_QUEUES)) {
+		int nr_hw_queues;
+
+		nr_hw_queues = nvme_tcp_get_netdev_current_queue_count(ctrl);
+		if (nr_hw_queues <= 0)
+			goto init_queue;
+
+		ctrl->opts->nr_io_queues = min(nr_hw_queues, num_online_cpus());
+
+		if (ctrl->opts->nr_io_queues < num_online_cpus())
+			dev_info(ctrl->device,
+				"limiting I/O queues to %u (NIC queues %d, CPUs %u)\n",
+				ctrl->opts->nr_io_queues, nr_hw_queues,
+				num_online_cpus());
+	}
+
+init_queue:
 	nr_io_queues = nvmf_nr_io_queues(ctrl->opts);
 	ret = nvme_set_queue_count(ctrl, &nr_io_queues);
 	if (ret)
Signature · 1 line
2.53.0
#3 lore raw

Re: [RESEND PATCH v2 2/4] nvme-tcp: limit I/O queue count based on NIC queue count

Quoted 80 lines · Nilay Shroff

NVMe-TCP currently provisions I/O queues based primarily on the number of online CPUs. On systems where the CPU count significantly exceeds the number of NIC hardware queues, multiple NVMe-TCP I/O queues end up sharing the same NIC TX/RX queues. This increases lock contention, cacheline bouncing, and inter-processor interrupts (IPIs), reducing I/O efficiency.

Limit the number of NVMe-TCP default I/O queues to the smaller of the number of online CPUs and the number of NIC hardware queues. Aligning the number of NVMe-TCP I/O queues with the NIC queue topology reduces queue sharing, improves locality, and can improve throughput while reducing tail latency.

The number of NVMe-TCP I/O queues is now limited to:

min(num_online_cpus, num_nic_queues)

---
 drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
drivers/nvme/host/tcp.c +44 -0
index ba5c7b3e2a7c..a2110287099e 100644
@@ -1774,6 +1774,50 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl,
 	return ret;
 }
 
+static struct net_device *nvme_tcp_get_netdev(struct nvme_ctrl *ctrl,
+		netdevice_tracker *tracker, gfp_t gfp)
+{
+	struct net_device *dev = NULL;
+
+	if (ctrl->opts->mask & NVMF_OPT_HOST_IFACE)
+		dev = netdev_get_by_name(&init_net, ctrl->opts->host_iface,
+				tracker, gfp);
+	else {
+		struct nvme_tcp_ctrl *tctrl = to_tcp_ctrl(ctrl);
+		struct sockaddr_storage *src = NULL, *dest = NULL;
+
+		if (ctrl->opts->mask & NVMF_OPT_HOST_TRADDR)
+			src = &tctrl->src_addr;
+
+		dest = &tctrl->addr;
+
+		dev = netdev_get_by_addr(&init_net, src, dest, tracker, gfp);
+	}
+	return dev;
+}
+
+/*
+ * Returns number of active NIC queues (min of TX/RX), or 0 if device cannot
+ * be determined.
+ */
+static int nvme_tcp_get_netdev_current_queue_count(struct nvme_ctrl *ctrl)
+{
+	struct net_device *dev;
+	int tx_queues, rx_queues;
+	netdevice_tracker tracker;
+
+	dev = nvme_tcp_get_netdev(ctrl, &tracker, GFP_KERNEL);
+	if (!dev)
+		return 0;
+
+	tx_queues = dev->real_num_tx_queues;
+	rx_queues = dev->real_num_rx_queues;
+
+	netdev_put(dev, &tracker);
+
+	return min(tx_queues, rx_queues);
+}
+
 static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
 				key_serial_t pskid)
 {
@@ -2165,6 +2209,23 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
 	unsigned int nr_io_queues;
 	int ret;

[..]

drivers/nvme/host/tcp.c static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) · line 2213

Quoted 2 lines
drivers/nvme/host/tcp.c +2 -0
+	if (!(ctrl->opts->mask & NVMF_OPT_NR_IO_QUEUES)) {
+		int nr_hw_queues;

Looks like the userspace can already pass the preferred number of queues, so in this case, why not do all this netdev resolution and queue estimation in the userspace? Presumably most or the users you care about always go through nvme-cli, right?

#4 lore raw

Re: [RESEND PATCH v2 2/4] nvme-tcp: limit I/O queue count based on NIC queue count

Quoted 84 lines · Stanislav Fomichev
Quoted 80 lines · Nilay Shroff

NVMe-TCP currently provisions I/O queues based primarily on the number of online CPUs. On systems where the CPU count significantly exceeds the number of NIC hardware queues, multiple NVMe-TCP I/O queues end up sharing the same NIC TX/RX queues. This increases lock contention, cacheline bouncing, and inter-processor interrupts (IPIs), reducing I/O efficiency.

Limit the number of NVMe-TCP default I/O queues to the smaller of the number of online CPUs and the number of NIC hardware queues. Aligning the number of NVMe-TCP I/O queues with the NIC queue topology reduces queue sharing, improves locality, and can improve throughput while reducing tail latency.

The number of NVMe-TCP I/O queues is now limited to:

min(num_online_cpus, num_nic_queues)

---
  drivers/nvme/host/tcp.c | 61 +++++++++++++++++++++++++++++++++++++++++
  1 file changed, 61 insertions(+)
drivers/nvme/host/tcp.c +44 -0
index ba5c7b3e2a7c..a2110287099e 100644
@@ -1774,6 +1774,50 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl,
  	return ret;
  }
 
+static struct net_device *nvme_tcp_get_netdev(struct nvme_ctrl *ctrl,
+		netdevice_tracker *tracker, gfp_t gfp)
+{
+	struct net_device *dev = NULL;
+
+	if (ctrl->opts->mask & NVMF_OPT_HOST_IFACE)
+		dev = netdev_get_by_name(&init_net, ctrl->opts->host_iface,
+				tracker, gfp);
+	else {
+		struct nvme_tcp_ctrl *tctrl = to_tcp_ctrl(ctrl);
+		struct sockaddr_storage *src = NULL, *dest = NULL;
+
+		if (ctrl->opts->mask & NVMF_OPT_HOST_TRADDR)
+			src = &tctrl->src_addr;
+
+		dest = &tctrl->addr;
+
+		dev = netdev_get_by_addr(&init_net, src, dest, tracker, gfp);
+	}
+	return dev;
+}
+
+/*
+ * Returns number of active NIC queues (min of TX/RX), or 0 if device cannot
+ * be determined.
+ */
+static int nvme_tcp_get_netdev_current_queue_count(struct nvme_ctrl *ctrl)
+{
+	struct net_device *dev;
+	int tx_queues, rx_queues;
+	netdevice_tracker tracker;
+
+	dev = nvme_tcp_get_netdev(ctrl, &tracker, GFP_KERNEL);
+	if (!dev)
+		return 0;
+
+	tx_queues = dev->real_num_tx_queues;
+	rx_queues = dev->real_num_rx_queues;
+
+	netdev_put(dev, &tracker);
+
+	return min(tx_queues, rx_queues);
+}
+
  static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid,
  				key_serial_t pskid)
  {
@@ -2165,6 +2209,23 @@ static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
  	unsigned int nr_io_queues;
  	int ret;

[..]

Quoted 7 lines

drivers/nvme/host/tcp.c static int nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl) · line 2213

Quoted 2 lines
drivers/nvme/host/tcp.c +2 -0
+	if (!(ctrl->opts->mask & NVMF_OPT_NR_IO_QUEUES)) {
+		int nr_hw_queues;

Looks like the userspace can already pass the preferred number of queues, so in this case, why not do all this netdev resolution and queue estimation in the userspace? Presumably most or the users you care about always go through nvme-cli, right?

Yes, userspace can already specify the preferred number of I/O queues, and nvme-cli provides an option to do so when creating an NVMe/TCP connection. However, choosing an appropriate value requires userspace to know both the number of online CPUs and the number of active TX/RX queues on the NIC used for the connection. Determining the latter also requires identifying the correct netdevice. That may involve a route lookup to determine the egress interface, particularly when the NVMe/TCP host and target are not on the same subnet.

So while this could be implemented in nvme-cli, it would require userspace to duplicate the logic needed to determine the actual netdevice and its current queue configuration. The intent of this change is to make the default queue selection automatic and avoid requiring users to determine and specify this topology manually.

An explicitly specified "nr_io_queues" would still take precedence, so userspace can override the default when desired.

Just for the note, this change also follows the general approach used by nvme-pci, where the default number of I/O queues is constrained by both the number of possible CPUs and the queue resources available from the controller.

Thanks,
--Nilay

maintainer
#5 lore raw

Re: [RESEND PATCH v2 2/4] nvme-tcp: limit I/O queue count based on NIC queue count

Quoted 13 lines · On Sat, 1 Aug 2026 19:08:05 +0530 Nilay Shroff wrote:
Quoted 4 lines

Looks like the userspace can already pass the preferred number of queues, so in this case, why not do all this netdev resolution and queue estimation in the userspace? Presumably most or the users you care about always go through nvme-cli, right?

Yes, userspace can already specify the preferred number of I/O queues, and nvme-cli provides an option to do so when creating an NVMe/TCP connection. However, choosing an appropriate value requires userspace to know both the number of online CPUs and the number of active TX/RX queues on the NIC used for the connection. Determining the latter also requires identifying the correct netdevice. That may involve a route lookup to determine the egress interface, particularly when the NVMe/TCP host and target are not on the same subnet.

Quoted 4 lines

So while this could be implemented in nvme-cli, it would require userspace to duplicate the logic needed to determine the actual netdevice and its current queue configuration. The intent of this change is to make the default queue selection automatic and avoid requiring users to determine and specify this topology manually.

In another message you said you add ntuple filters. So you _are_ doing what you describe here as a problem. User space will know something we don't know sooner or later, so you should just add the uAPI instead of guessing in the kernel. BTW the queue count is likely to change after all of user space boots, so if you run before whatever configures queues for the machine in userspace you'll be using wrong counts.

Quoted 6 lines

An explicitly specified "nr_io_queues" would still take precedence, so userspace can override the default when desired.

Just for the note, this change also follows the general approach used by nvme-pci, where the default number of I/O queues is constrained by both the number of possible CPUs and the queue resources available from the controller.

Not sure that maps well to networking. For TCP at least there will be a protocol stack that runs between the device queues and your queues. I guess that will depend on the network and the details of the benchmark. But again, better to let the user tune to their workload and machine.

Consider patch 1 nacked.

#6 lore raw

Re: [RESEND PATCH v2 2/4] nvme-tcp: limit I/O queue count based on NIC queue count

Quoted 19 lines · Jakub Kicinski
Quoted 13 lines · On Sat, 1 Aug 2026 19:08:05 +0530 Nilay Shroff wrote:
Quoted 4 lines

Looks like the userspace can already pass the preferred number of queues, so in this case, why not do all this netdev resolution and queue estimation in the userspace? Presumably most or the users you care about always go through nvme-cli, right?

Yes, userspace can already specify the preferred number of I/O queues, and nvme-cli provides an option to do so when creating an NVMe/TCP connection. However, choosing an appropriate value requires userspace to know both the number of online CPUs and the number of active TX/RX queues on the NIC used for the connection. Determining the latter also requires identifying the correct netdevice. That may involve a route lookup to determine the egress interface, particularly when the NVMe/TCP host and target are not on the same subnet.

Quoted 4 lines

So while this could be implemented in nvme-cli, it would require userspace to duplicate the logic needed to determine the actual netdevice and its current queue configuration. The intent of this change is to make the default queue selection automatic and avoid requiring users to determine and specify this topology manually.

Quoted 7 lines

In another message you said you add ntuple filters. So you _are_ doing what you describe here as a problem. User space will know something we don't know sooner or later, so you should just add the uAPI instead of guessing in the kernel. BTW the queue count is likely to change after all of user space boots, so if you run before whatever configures queues for the machine in userspace you'll be using wrong counts.

Well, that ntuple filter configuration was done looking at the debugfs output which is produced in patch 4/4. The debugfs generates the enough information including queue count and per queue flow information which is then programmed into ntuple filter.

Quoted 7 lines
Quoted 6 lines

An explicitly specified "nr_io_queues" would still take precedence, so userspace can override the default when desired.

Just for the note, this change also follows the general approach used by nvme-pci, where the default number of I/O queues is constrained by both the number of possible CPUs and the queue resources available from the controller.

Quoted 7 lines

Not sure that maps well to networking. For TCP at least there will be a protocol stack that runs between the device queues and your queues. I guess that will depend on the network and the details of the benchmark. But again, better to let the user tune to their workload and machine.

Consider patch 1 nacked.

My motivation here was to improve the default behavior for the common case where nr_io_queues is not explicitly specified. So if the preference is to keep this in userspace, would you be open to exposing the required information through a kernel interface (if something is still missing) and implementing the queue selection logic in nvme-cli instead? That would still allow us to automate the default queue selection without embedding this change in the kernel.

Thanks,
--Nilay

#7 lore raw

PATCH RESEND v2 3/4 nvme: add debugfs helpers for NVMe drivers

In reply to Nilay Shroff

Introduce helper APIs that allow NVMe drivers to register and unregister debugfs entries, along with a reusable attribute structure for defining new debugfs files.

The implementation uses seq_file interfaces to safely expose per- namespace or per-path statistics, while supporting both simple show callbacks and full seq_operations.

This will be used by subsequent patches to expose NVMe-TCP queue and flow information for tuning NVMe TCP I/O workqueue and network stack components.

---
 drivers/nvme/host/Makefile  |   2 +-
 drivers/nvme/host/debugfs.c | 129 ++++++++++++++++++++++++++++++++++++
 drivers/nvme/host/nvme.h    |  10 +++
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 drivers/nvme/host/debugfs.c
drivers/nvme/host/Makefile +1 -1
index 6414ec968f99..7962dfc3b2ad 100644
@@ -10,7 +10,7 @@ obj-$(CONFIG_NVME_FC)			+= nvme-fc.o
 obj-$(CONFIG_NVME_TCP)			+= nvme-tcp.o
 obj-$(CONFIG_NVME_APPLE)		+= nvme-apple.o
 
-nvme-core-y				+= core.o ioctl.o sysfs.o pr.o
+nvme-core-y				+= core.o ioctl.o sysfs.o pr.o debugfs.o
 nvme-core-$(CONFIG_NVME_VERBOSE_ERRORS)	+= constants.o
 nvme-core-$(CONFIG_TRACING)		+= trace.o
 nvme-core-$(CONFIG_NVME_MULTIPATH)	+= multipath.o
drivers/nvme/host/debugfs.c new file +129 -0

129 lines not on this page · raw message

drivers/nvme/host/nvme.h +10 -0
index 824651cc898d..72f9d9c668a1 100644
@@ -474,6 +474,16 @@ struct nvme_ctrl {
 	u16			awupf; /* 0's based value. */
 };
 
+void nvme_debugfs_register(struct gendisk *disk);
+static inline void nvme_debugfs_unregister(struct gendisk *disk)
+{
+	/*
+	 * Nothing to do for now. When the request queue is unregistered,
+	 * all files under q->debugfs_dir are recursively deleted.
+	 * This is just a placeholder; the compiler will optimize it out.
+	 */
+}
+
 static inline enum nvme_ctrl_state nvme_ctrl_state(struct nvme_ctrl *ctrl)
 {
 	return READ_ONCE(ctrl->state);
Signature · 1 line
2.53.0
#8 lore raw

Re: [RESEND PATCH v2 3/4] nvme: add debugfs helpers for NVMe drivers

Quoted 6 lines · Nilay Shroff
drivers/nvme/host/debugfs.c new file +6 -0
+static int nvme_debugfs_open(struct inode *inode, struct file *file)
+{
+	void *data = inode->i_private;
+	struct nvme_debugfs_attr *attr = debugfs_get_aux(file);
+	struct nvme_debugfs_ctx *ctx;
+	struct seq_file *m;

drivers/nvme/host/debugfs.c line 51

Quoted 10 lines
drivers/nvme/host/debugfs.c new file +10 -0
+	int ret;
+
+	if (attr->get && !attr->get(data))
+		return -ENODEV;
+
+	ctx = kzalloc_obj(*ctx);
+	if (WARN_ON_ONCE(!ctx)) {
+		ret = -ENOMEM;
+		goto out;
+	}

Just a nit, I don't think that raising a warning just because kzalloc() returned NULL is a good idea as failures can naturally occur under OOM conditions and aren't bugs.

Maurizio

#9 lore raw

Re: [RESEND PATCH v2 3/4] nvme: add debugfs helpers for NVMe drivers

Quoted 13 lines · Maurizio Lombardi
Quoted 12 lines · Nilay Shroff
drivers/nvme/host/debugfs.c new file +12 -0
+static int nvme_debugfs_open(struct inode *inode, struct file *file)
+{
+	void *data = inode->i_private;
+	struct nvme_debugfs_attr *attr = debugfs_get_aux(file);
+	struct nvme_debugfs_ctx *ctx;
+	struct seq_file *m;
+	int ret;
+
+	if (attr->get && !attr->get(data))
+		return -ENODEV;
+
+	ctx = kzalloc_obj(*ctx);
Quoted 9 lines

drivers/nvme/host/debugfs.c line 51

Quoted 4 lines
drivers/nvme/host/debugfs.c new file +4 -0
+	if (WARN_ON_ONCE(!ctx)) {
+		ret = -ENOMEM;
+		goto out;
+	}

Just a nit, I don't think that raising a warning just because kzalloc() returned NULL is a good idea as failures can naturally occur under OOM conditions and aren't bugs.

Alright, I'll change it to just return -ENOMEM without producing a warning, in case kzalloc fails.

Thanks,
--Nilay

#10 lore raw

PATCH RESEND v2 4/4 nvme: expose queue information via debugfs

In reply to Nilay Shroff

Add a new debugfs attribute "io_queue_info" to expose per-queue information for NVMe controllers. For NVMe-TCP, this includes the CPU handling each I/O queue and the associated TCP flow (source and destination address/port).

This information can be useful for understanding and tuning the interaction between NVMe-TCP I/O queues and network stack components, such as IRQ affinity, RPS/RFS, XPS, or NIC flow steering (ntuple).

The data is exported using seq_file interfaces to allow iteration over all controller queues.

---
 drivers/nvme/host/core.c    |  3 ++
 drivers/nvme/host/debugfs.c | 64 ++++++++++++++++++++++++++++++++++++-
 drivers/nvme/host/nvme.h    |  2 ++
 drivers/nvme/host/tcp.c     | 54 +++++++++++++++++++++++++++++++
 4 files changed, 122 insertions(+), 1 deletion(-)
drivers/nvme/host/core.c +3 -0
index 453c1f0b2dd0..50e81892a9d6 100644
@@ -4264,6 +4264,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, struct nvme_ns_info *info)
 	if (device_add_disk(ctrl->device, ns->disk, nvme_ns_attr_groups))
 		goto out_cleanup_ns_from_list;
 
+	nvme_debugfs_register(ns->disk);
+
 	if (!nvme_ns_head_multipath(ns->head))
 		nvme_add_ns_cdev(ns);
 
@@ -4344,6 +4346,7 @@ static void nvme_ns_remove(struct nvme_ns *ns)
 
 	nvme_mpath_remove_sysfs_link(ns);
 
+	nvme_debugfs_unregister(ns->disk);
 	del_gendisk(ns->disk);
 
 	mutex_lock(&ns->ctrl->namespaces_lock);
drivers/nvme/host/debugfs.c +63 -1

76 lines not on this page · raw message

drivers/nvme/host/nvme.h +2 -0
index 72f9d9c668a1..430971c56406 100644
@@ -663,6 +663,8 @@ struct nvme_ctrl_ops {
 	void (*print_device_info)(struct nvme_ctrl *ctrl);
 	bool (*supports_pci_p2pdma)(struct nvme_ctrl *ctrl);
 	unsigned long (*get_virt_boundary)(struct nvme_ctrl *ctrl, bool is_admin);
+	int (*print_io_queue_info)(struct seq_file *m, struct nvme_ctrl *ctrl,
+			int qid);
 };
 
 /*
drivers/nvme/host/tcp.c +54 -0

66 lines not on this page · raw message

Signature · 1 line
2.53.0
#11 lore raw
In reply to Nilay Shroff
Quoted 39 lines · Nilay Shroff

Hi,

This is a resend of the previous series to include the networking maintainers and mailing list. There are no code or commit message changes since the previous posting.

This series has been updated based on the feedback received during LSFMM. The changelog is updated accordingly.

The NVMe/TCP host driver currently provisions I/O queues primarily based on CPU availability rather than the capabilities and topology of the underlying network interface.

On modern systems with many CPUs but fewer NIC hardware queues, this can lead to multiple NVMe/TCP I/O workers contending for the same TX/RX queue, resulting in increased lock contention, cacheline bouncing, and degraded throughput.

This RFC proposes a set of changes to better align NVMe/TCP I/O queues with NIC queue resources, and to expose queue/flow information to enable more effective system-level tuning.

Key ideas
---------

1. Scale NVMe/TCP I/O queues based on NIC queue count
Instead of relying solely on CPU count, limit the number of I/O workers to:

       min(num_online_cpus, netdev->real_num_{tx,rx}_queues)

2. Improve CPU locality
Align NVMe/TCP I/O workers with CPUs associated with NIC IRQ affinity to reduce cross-CPU traffic and improve cache locality.

3. Expose queue and flow information via debugfs
Export per-I/O queue information including:
- queue id (qid)
- CPU affinity
- TCP flow (src/dst IP and ports)

[..]

Quoted 5 lines

This enables userspace tools to configure:
- IRQ affinity
- RPS/XPS
- ntuple steering
- or any other scaling as deemed feasible

Can you expand on this a bit? What specifically helped the most for your tuned case?

#12 lore raw
Quoted 43 lines · Stanislav Fomichev
Quoted 39 lines · Nilay Shroff

Hi,

This is a resend of the previous series to include the networking maintainers and mailing list. There are no code or commit message changes since the previous posting.

This series has been updated based on the feedback received during LSFMM. The changelog is updated accordingly.

The NVMe/TCP host driver currently provisions I/O queues primarily based on CPU availability rather than the capabilities and topology of the underlying network interface.

On modern systems with many CPUs but fewer NIC hardware queues, this can lead to multiple NVMe/TCP I/O workers contending for the same TX/RX queue, resulting in increased lock contention, cacheline bouncing, and degraded throughput.

This RFC proposes a set of changes to better align NVMe/TCP I/O queues with NIC queue resources, and to expose queue/flow information to enable more effective system-level tuning.

Key ideas
---------

1. Scale NVMe/TCP I/O queues based on NIC queue count

    Instead of relying solely on CPU count, limit the number of I/O workers
    to:
        min(num_online_cpus, netdev->real_num_{tx,rx}_queues)

2. Improve CPU locality
Align NVMe/TCP I/O workers with CPUs associated with NIC IRQ affinity to reduce cross-CPU traffic and improve cache locality.

3. Expose queue and flow information via debugfs
Export per-I/O queue information including:
- queue id (qid)
- CPU affinity
- TCP flow (src/dst IP and ports)

[..]

Quoted 8 lines
Quoted 5 lines

This enables userspace tools to configure:
- IRQ affinity
- RPS/XPS
- ntuple steering
- or any other scaling as deemed feasible

Can you expand on this a bit? What specifically helped the most for your tuned case?

For my network topology and workload, configuring ntuple steering together with IRQ affinity and XPS provided the most benefit. The NIC used for testing supports ntuple filters, which allowed me to steer the TCP flow associated with an NVMe/TCP I/O queue to a specific NIC RX queue. I then configured the IRQ affinity for that RX queue and XPS for the corresponding TX path so that the NVMe/TCP I/O queue processing, RX interrupt processing, and TX/RX packet processing were aligned to the same CPU as much as possible. This reduced cross-CPU processing for an I/O flow and provided the best improvement among the tuning combinations I tested.

Thanks,
--Nilay