Page MenuHomeFreeBSD
Files F108350080

D34921.diff
No OneTemporary
Actions

D34921.diff
View Options

diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -254,6 +254,8 @@
struct sysctl_oid *ofld_txq_oid;
uint8_t hw_addr[ETHER_ADDR_LEN]; /* factory MAC address, won't change */
+ u_int txq_rr;
+ u_int rxq_rr;
};
struct tx_ch_rl_params {
diff --git a/sys/dev/cxgbe/t4_ioctl.h b/sys/dev/cxgbe/t4_ioctl.h
--- a/sys/dev/cxgbe/t4_ioctl.h
+++ b/sys/dev/cxgbe/t4_ioctl.h
@@ -376,6 +376,11 @@
OPEN_TYPE_DONTCARE = 'D',
};
+enum {
+ QUEUE_RANDOM = -1,
+ QUEUE_ROUNDROBIN = -2,
+};
+
struct offload_settings {
int8_t offload;
int8_t rx_coalesce;
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -1377,17 +1377,23 @@
cp->mtu_idx = find_best_mtu_idx(sc, inc, s);
/* Tx queue for this connection. */
- if (s->txq >= 0 && s->txq < vi->nofldtxq)
- cp->txq_idx = s->txq;
+ if (s->txq == QUEUE_RANDOM)
+ cp->txq_idx = arc4random();
+ else if (s->txq == QUEUE_ROUNDROBIN)
+ cp->txq_idx = atomic_fetchadd_int(&vi->txq_rr, 1);
else
- cp->txq_idx = arc4random() % vi->nofldtxq;
+ cp->txq_idx = s->txq;
+ cp->txq_idx %= vi->nofldtxq;
cp->txq_idx += vi->first_ofld_txq;
/* Rx queue for this connection. */
- if (s->rxq >= 0 && s->rxq < vi->nofldrxq)
- cp->rxq_idx = s->rxq;
+ if (s->rxq == QUEUE_RANDOM)
+ cp->rxq_idx = arc4random();
+ else if (s->rxq == QUEUE_ROUNDROBIN)
+ cp->rxq_idx = atomic_fetchadd_int(&vi->rxq_rr, 1);
else
- cp->rxq_idx = arc4random() % vi->nofldrxq;
+ cp->rxq_idx = s->rxq;
+ cp->rxq_idx %= vi->nofldrxq;
cp->rxq_idx += vi->first_ofld_rxq;
if (SOLISTENING(so)) {
@@ -1747,8 +1753,8 @@
.ecn = -1,
.ddp = -1,
.tls = -1,
- .txq = -1,
- .rxq = -1,
+ .txq = QUEUE_RANDOM,
+ .rxq = QUEUE_RANDOM,
.mss = -1,
};
static const struct offload_settings disallow_offloading_settings = {

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 25, 1:45 AM (19 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16117595
Default Alt Text
D34921.diff (1 KB)

Event Timeline