d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: change error-prone code on Tx path

Browse Source 
In the main loop of mlx5_tx_burst(), pointers/indexes are advanced at the
beginning. Therefore, those should be rolled back if checking resource
availability fails and breaks the loop. And some of them are even
redundant.

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
This commit is contained in:
Yongseok Koh 2017-05-09 13:49:31 -07:00 committed by Thomas Monjalon
parent ac180a21f6
commit 3730e6c6d7
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/net/mlx5/mlx5_rxtx.c
View File

@ -538,7 +538,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
#endif #endif
/* first_seg */ /* first_seg */
buf = *(pkts++); buf = *pkts;
segs_n = buf->nb_segs; segs_n = buf->nb_segs;
/* /*
* Make sure there is enough room to store this packet and * Make sure there is enough room to store this packet and
@ -549,15 +549,13 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
break; break;
max -= segs_n; max -= segs_n;
--segs_n; --segs_n;
if (!segs_n)
--pkts_n;
if (unlikely(--max_wqe == 0)) if (unlikely(--max_wqe == 0))
break; break;
wqe = (volatile struct mlx5_wqe_v *) wqe = (volatile struct mlx5_wqe_v *)
tx_mlx5_wqe(txq, txq->wqe_ci); tx_mlx5_wqe(txq, txq->wqe_ci);
rte_prefetch0(tx_mlx5_wqe(txq, txq->wqe_ci + 1)); rte_prefetch0(tx_mlx5_wqe(txq, txq->wqe_ci + 1));
if (pkts_n > 1) if (pkts_n - i > 1)
rte_prefetch0(*pkts); rte_prefetch0(*(pkts + 1));
addr = rte_pktmbuf_mtod(buf, uintptr_t); addr = rte_pktmbuf_mtod(buf, uintptr_t);
length = DATA_LEN(buf); length = DATA_LEN(buf);
ehdr = (((uint8_t *)addr)[1] << 8) | ehdr = (((uint8_t *)addr)[1] << 8) |
@ -569,14 +567,10 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
break; break;
/* Update element. */ /* Update element. */
(*txq->elts)[elts_head] = buf; (*txq->elts)[elts_head] = buf;
elts_head = (elts_head + 1) & (elts_n - 1);
/* Prefetch next buffer data. */ /* Prefetch next buffer data. */
if (pkts_n > 1) { if (pkts_n - i > 1)
volatile void *pkt_addr; rte_prefetch0(
rte_pktmbuf_mtod(*(pkts + 1), volatile void *));
pkt_addr = rte_pktmbuf_mtod(*pkts, volatile void *);
rte_prefetch0(pkt_addr);
}
/* Should we enable HW CKSUM offload */ /* Should we enable HW CKSUM offload */
if (buf->ol_flags & if (buf->ol_flags &
(PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM)) { (PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM)) {
@ -679,10 +673,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
}; };
ds = 1; ds = 1;
total_length = 0; total_length = 0;
pkts--;
pkts_n++;
elts_head = (elts_head - 1) &
(elts_n - 1);
k++; k++;
goto next_wqe; goto next_wqe;
} }
@ -815,17 +805,17 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
naddr, naddr,
naddr >> 32, naddr >> 32,
}; };
(*txq->elts)[elts_head] = buf;
elts_head = (elts_head + 1) & (elts_n - 1); elts_head = (elts_head + 1) & (elts_n - 1);
(*txq->elts)[elts_head] = buf;
++sg; ++sg;
/* Advance counter only if all segs are successfully posted. */ /* Advance counter only if all segs are successfully posted. */
if (sg < segs_n) { if (sg < segs_n)
goto next_seg; goto next_seg;
} else { else
--pkts_n;
j += sg; j += sg;
}
next_pkt: next_pkt:
elts_head = (elts_head + 1) & (elts_n - 1);
++pkts;
++i; ++i;
/* Initialize known and common part of the WQE structure. */ /* Initialize known and common part of the WQE structure. */
if (tso) { if (tso) {
@ -863,7 +853,7 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
/* Increment sent bytes counter. */ /* Increment sent bytes counter. */
txq->stats.obytes += total_length; txq->stats.obytes += total_length;
#endif #endif
} while (pkts_n); } while (i < pkts_n);
/* Take a shortcut if nothing must be sent. */ /* Take a shortcut if nothing must be sent. */
if (unlikely((i + k) == 0)) if (unlikely((i + k) == 0))
return 0; return 0;