Page MenuHomeFreeBSD
Files F102753137

D13096.diff
No OneTemporary
Actions

D13096.diff
View Options

Index: head/sys/net/iflib.c
===================================================================
--- head/sys/net/iflib.c
+++ head/sys/net/iflib.c
@@ -5312,11 +5312,11 @@
int iflib_num_tx_queues, iflib_num_rx_queues;
int err, admincnt, bar;
- iflib_num_tx_queues = scctx->isc_ntxqsets;
- iflib_num_rx_queues = scctx->isc_nrxqsets;
+ iflib_num_tx_queues = ctx->ifc_sysctl_ntxqs;
+ iflib_num_rx_queues = ctx->ifc_sysctl_nrxqs;
- device_printf(dev, "msix_init qsets capped at %d\n", iflib_num_tx_queues);
-
+ device_printf(dev, "msix_init qsets capped at %d\n", imax(scctx->isc_ntxqsets, scctx->isc_nrxqsets));
+
bar = ctx->ifc_softc_ctx.isc_msix_bar;
admincnt = sctx->isc_admin_intrcnt;
/* Override by global tuneable */
@@ -5414,6 +5414,10 @@
rx_queues = iflib_num_rx_queues;
else
rx_queues = queues;
+
+ if (rx_queues > scctx->isc_nrxqsets)
+ rx_queues = scctx->isc_nrxqsets;
+
/*
* We want this to be all logical CPUs by default
*/
@@ -5421,6 +5425,9 @@
tx_queues = iflib_num_tx_queues;
else
tx_queues = mp_ncpus;
+
+ if (tx_queues > scctx->isc_ntxqsets)
+ tx_queues = scctx->isc_ntxqsets;
if (ctx->ifc_sysctl_qs_eq_override == 0) {
#ifdef INVARIANTS

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 5:22 PM (21 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14682553
Default Alt Text
D13096.diff (1 KB)

Event Timeline