Date: Thu, 2 Feb 2023 07:39:29 GMT From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: f9cc817c17b7 - stable/13 - cxgbe/t4_tom: Support for round-robin selection of offload queues. Message-ID: <202302020739.3127dTiH061978@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=f9cc817c17b7663e80d5418362d2da0be2c7a2a1 commit f9cc817c17b7663e80d5418362d2da0be2c7a2a1 Author: Navdeep Parhar <np@FreeBSD.org> AuthorDate: 2022-04-14 22:49:58 +0000 Commit: Navdeep Parhar <np@FreeBSD.org> CommitDate: 2023-02-02 07:13:55 +0000 cxgbe/t4_tom: Support for round-robin selection of offload queues. A COP (Connection Offload Policy) rule can now specify that the tx and/or rx queue for a new tid should be selected in a round-robin manner. There is no change in default behavior. Reviewed by: jhb@ Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34921 (cherry picked from commit db28d4a0cd1c7a8505d6cbb3e8772b794cd55e53) --- sys/dev/cxgbe/adapter.h | 2 ++ sys/dev/cxgbe/t4_ioctl.h | 5 +++++ sys/dev/cxgbe/tom/t4_tom.c | 22 ++++++++++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index b3bffcc32b52..f59fe4e7c4e4 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -255,6 +255,8 @@ struct vi_info { 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 index f3bb7d8b4aa4..3ef03f7c526c 100644 --- a/sys/dev/cxgbe/t4_ioctl.h +++ b/sys/dev/cxgbe/t4_ioctl.h @@ -376,6 +376,11 @@ enum { 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 index b36b4b934d12..8888265dd32a 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1217,17 +1217,23 @@ init_conn_params(struct vi_info *vi , struct offload_settings *s, 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)) { @@ -1587,8 +1593,8 @@ lookup_offload_policy(struct adapter *sc, int open_type, struct mbuf *m, .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 = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302020739.3127dTiH061978>