git: 568d9aa2b5bc - stable/12 - cxgbe(4): Check for descriptors before writing a TLS or raw work request.

[Navdeep Parhar]

The branch stable/12 has been updated by np:

URL: https://cgit.FreeBSD.org/src/commit/?id=568d9aa2b5bc1ce3c54dbb2586c75a4423db3399

commit 568d9aa2b5bc1ce3c54dbb2586c75a4423db3399
Author:     Navdeep Parhar <np at FreeBSD.org>
AuthorDate: 2020-08-31 22:44:59 +0000
Commit:     Navdeep Parhar <np at FreeBSD.org>
CommitDate: 2021-02-16 20:32:35 +0000

    cxgbe(4): Check for descriptors before writing a TLS or raw work request.
    
    (cherry picked from commit 565b8fce23e6250b673a956ce753e37b201a5847)
---
 sys/dev/cxgbe/t4_sge.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 64a85440e440..d8f947d20f7e 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -3136,16 +3136,18 @@ eth_tx(struct mp_ring *r, u_int cidx, u_int pidx, bool *coalescing)
 
 		MPASS(rc != 0 && rc != EAGAIN);
 		MPASS(txp->npkt == 0);
+
+		n = tx_len16_to_desc(mbuf_len16(m0));
+		if (__predict_false(avail < n)) {
+			avail += reclaim_tx_descs(txq, min(n, 32));
+			if (avail < n)
+				break;	/* out of descriptors */
+		}
+
 		wr = &eq->desc[eq->pidx];
 		if (mbuf_cflags(m0) & MC_RAW_WR) {
 			n = write_raw_wr(txq, wr, m0, avail);
 		} else {
-			n = tx_len16_to_desc(mbuf_len16(m0));
-			if (__predict_false(avail < n)) {
-				avail += reclaim_tx_descs(txq, 32);
-				if (avail < n)
-					break;	/* out of descriptors */
-			}
 			ETHER_BPF_MTAP(ifp, m0);
 			if (vi->flags & TX_USES_VM_WR)
 				n = write_txpkt_vm_wr(sc, txq, m0);