Rather than calling the mempool function rte_mempool_get_bulk we update
the code to use the mbuf function rte_mbuf_raw_alloc_bulk, which
properly supports debug flags and checks - when enabled.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
drivers/net/intel/common/rx_vec_arm.h | 6 +++---
drivers/net/intel/common/rx_vec_ppc.h | 6 +++---
drivers/net/intel/common/rx_vec_x86.h | 6 +++---
drivers/net/intel/fm10k/fm10k_ethdev.c | 2 +-
drivers/net/intel/fm10k/fm10k_rxtx.c | 8 ++++----
drivers/net/intel/fm10k/fm10k_rxtx_vec.c | 2 +-
drivers/net/intel/i40e/i40e_rxtx.c | 2 +-
drivers/net/intel/iavf/iavf_rxtx.c | 2 +-
drivers/net/intel/ice/ice_rxtx.c | 4 ++--
drivers/net/intel/idpf/idpf_common_rxtx_avx2.c | 2 +-
drivers/net/intel/idpf/idpf_common_rxtx_avx512.c | 4 ++--
drivers/net/intel/ixgbe/ixgbe_rxtx.c | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/drivers/net/intel/common/rx_vec_arm.h
b/drivers/net/intel/common/rx_vec_arm.h
index 2e48d4b6c0..f7e7b8c396 100644
--- a/drivers/net/intel/common/rx_vec_arm.h
+++ b/drivers/net/intel/common/rx_vec_arm.h
@@ -16,19 +16,19 @@
static inline int
_ci_rxq_rearm_get_bufs(struct ci_rx_queue *rxq)
{
- struct ci_rx_entry *rxp = &rxq->sw_ring[rxq->rxrearm_start];
+ struct rte_mbuf **rxp = &rxq->sw_ring[rxq->rxrearm_start].mbuf;
const uint16_t rearm_thresh = CI_VPMD_RX_REARM_THRESH;
volatile union ci_rx_desc *rxdp;
int i;
rxdp = &rxq->rx_ring[rxq->rxrearm_start];
- if (rte_mempool_get_bulk(rxq->mp, (void **)rxp, rearm_thresh) < 0) {
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp, rxp, rearm_thresh) < 0) {
if (rxq->rxrearm_nb + rearm_thresh >= rxq->nb_rx_desc) {
uint64x2_t zero = vdupq_n_u64(0);
for (i = 0; i < CI_VPMD_DESCS_PER_LOOP; i++) {
- rxp[i].mbuf = &rxq->fake_mbuf;
+ rxp[i] = &rxq->fake_mbuf;
vst1q_u64(RTE_CAST_PTR(uint64_t *, &rxdp[i]),
zero);
}
}
diff --git a/drivers/net/intel/common/rx_vec_ppc.h
b/drivers/net/intel/common/rx_vec_ppc.h
index 97affc34c2..7d02eb067b 100644
--- a/drivers/net/intel/common/rx_vec_ppc.h
+++ b/drivers/net/intel/common/rx_vec_ppc.h
@@ -16,19 +16,19 @@
static inline int
_ci_rxq_rearm_get_bufs(struct ci_rx_queue *rxq)
{
- struct ci_rx_entry *rxp = &rxq->sw_ring[rxq->rxrearm_start];
+ struct rte_mbuf **rxp = &rxq->sw_ring[rxq->rxrearm_start].mbuf;
const uint16_t rearm_thresh = CI_VPMD_RX_REARM_THRESH;
volatile union ci_rx_desc *rxdp;
int i;
rxdp = &rxq->rx_ring[rxq->rxrearm_start];
- if (rte_mempool_get_bulk(rxq->mp, (void **)rxp, rearm_thresh) < 0) {
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp, rxp, rearm_thresh) < 0) {
if (rxq->rxrearm_nb + rearm_thresh >= rxq->nb_rx_desc) {
__vector unsigned long dma_addr0 = (__vector unsigned
long){};
for (i = 0; i < CI_VPMD_DESCS_PER_LOOP; i++) {
- rxp[i].mbuf = &rxq->fake_mbuf;
+ rxp[i] = &rxq->fake_mbuf;
vec_st(dma_addr0, 0,
RTE_CAST_PTR(__vector unsigned long *,
&rxdp[i]));
}
diff --git a/drivers/net/intel/common/rx_vec_x86.h
b/drivers/net/intel/common/rx_vec_x86.h
index 3d7343b1ff..5160767385 100644
--- a/drivers/net/intel/common/rx_vec_x86.h
+++ b/drivers/net/intel/common/rx_vec_x86.h
@@ -21,19 +21,19 @@ enum ci_rx_vec_level {
static inline int
_ci_rxq_rearm_get_bufs(struct ci_rx_queue *rxq)
{
- struct ci_rx_entry *rxp = &rxq->sw_ring[rxq->rxrearm_start];
+ struct rte_mbuf **rxp = &rxq->sw_ring[rxq->rxrearm_start].mbuf;
const uint16_t rearm_thresh = CI_VPMD_RX_REARM_THRESH;
volatile union ci_rx_desc *rxdp;
int i;
rxdp = &rxq->rx_ring[rxq->rxrearm_start];
- if (rte_mempool_get_bulk(rxq->mp, (void **)rxp, rearm_thresh) < 0) {
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp, rxp, rearm_thresh) < 0) {
if (rxq->rxrearm_nb + rearm_thresh >= rxq->nb_rx_desc) {
const __m128i zero = _mm_setzero_si128();
for (i = 0; i < CI_VPMD_DESCS_PER_LOOP; i++) {
- rxp[i].mbuf = &rxq->fake_mbuf;
+ rxp[i] = &rxq->fake_mbuf;
_mm_store_si128(RTE_CAST_PTR(__m128i *,
&rxdp[i]), zero);
}
}
diff --git a/drivers/net/intel/fm10k/fm10k_ethdev.c
b/drivers/net/intel/fm10k/fm10k_ethdev.c
index 75ce2e19cf..216165a9bd 100644
--- a/drivers/net/intel/fm10k/fm10k_ethdev.c
+++ b/drivers/net/intel/fm10k/fm10k_ethdev.c
@@ -205,7 +205,7 @@ rx_queue_reset(struct fm10k_rx_queue *q)
int i, diag;
PMD_INIT_FUNC_TRACE();
- diag = rte_mempool_get_bulk(q->mp, (void **)q->sw_ring, q->nb_desc);
+ diag = rte_mbuf_raw_alloc_bulk(q->mp, (void *)q->sw_ring, q->nb_desc);
if (diag != 0)
return -ENOMEM;
diff --git a/drivers/net/intel/fm10k/fm10k_rxtx.c
b/drivers/net/intel/fm10k/fm10k_rxtx.c
index 690142b357..0557ee88df 100644
--- a/drivers/net/intel/fm10k/fm10k_rxtx.c
+++ b/drivers/net/intel/fm10k/fm10k_rxtx.c
@@ -164,8 +164,8 @@ fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
q->next_dd = next_dd;
if ((q->next_dd > q->next_trigger) || (alloc == 1)) {
- ret = rte_mempool_get_bulk(q->mp,
- (void **)&q->sw_ring[q->next_alloc],
+ ret = rte_mbuf_raw_alloc_bulk(q->mp,
+ (void *)&q->sw_ring[q->next_alloc],
q->alloc_thresh);
if (unlikely(ret != 0)) {
@@ -322,8 +322,8 @@ fm10k_recv_scattered_pkts(void *rx_queue, struct rte_mbuf
**rx_pkts,
q->next_dd = next_dd;
if ((q->next_dd > q->next_trigger) || (alloc == 1)) {
- ret = rte_mempool_get_bulk(q->mp,
- (void **)&q->sw_ring[q->next_alloc],
+ ret = rte_mbuf_raw_alloc_bulk(q->mp,
+ (void *)&q->sw_ring[q->next_alloc],
q->alloc_thresh);
if (unlikely(ret != 0)) {
diff --git a/drivers/net/intel/fm10k/fm10k_rxtx_vec.c
b/drivers/net/intel/fm10k/fm10k_rxtx_vec.c
index 715c891c30..1269a34e76 100644
--- a/drivers/net/intel/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/intel/fm10k/fm10k_rxtx_vec.c
@@ -259,7 +259,7 @@ fm10k_rxq_rearm(struct fm10k_rx_queue *rxq)
rxdp = rxq->hw_ring + rxq->rxrearm_start;
/* Pull 'n' more MBUFs into the software ring */
- if (rte_mempool_get_bulk(rxq->mp,
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp,
(void *)mb_alloc,
RTE_FM10K_RXQ_REARM_THRESH) < 0) {
dma_addr0 = _mm_setzero_si128();
diff --git a/drivers/net/intel/i40e/i40e_rxtx.c
b/drivers/net/intel/i40e/i40e_rxtx.c
index aba3c11ee5..a3ca8254ff 100644
--- a/drivers/net/intel/i40e/i40e_rxtx.c
+++ b/drivers/net/intel/i40e/i40e_rxtx.c
@@ -590,7 +590,7 @@ i40e_rx_alloc_bufs(struct ci_rx_queue *rxq)
alloc_idx = (uint16_t)(rxq->rx_free_trigger -
(rxq->rx_free_thresh - 1));
rxep = &(rxq->sw_ring[alloc_idx]);
- diag = rte_mempool_get_bulk(rxq->mp, (void *)rxep,
+ diag = rte_mbuf_raw_alloc_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
if (unlikely(diag != 0)) {
PMD_DRV_LOG(ERR, "Failed to get mbufs in bulk");
diff --git a/drivers/net/intel/iavf/iavf_rxtx.c
b/drivers/net/intel/iavf/iavf_rxtx.c
index 7033a74610..c0e3827066 100644
--- a/drivers/net/intel/iavf/iavf_rxtx.c
+++ b/drivers/net/intel/iavf/iavf_rxtx.c
@@ -2227,7 +2227,7 @@ iavf_rx_alloc_bufs(struct ci_rx_queue *rxq)
alloc_idx = (uint16_t)(rxq->rx_free_trigger -
(rxq->rx_free_thresh - 1));
rxep = &rxq->sw_ring[alloc_idx];
- diag = rte_mempool_get_bulk(rxq->mp, (void *)rxep,
+ diag = rte_mbuf_raw_alloc_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
if (unlikely(diag != 0)) {
PMD_RX_LOG(ERR, "Failed to get mbufs in bulk");
diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
index da508592aa..0294794bed 100644
--- a/drivers/net/intel/ice/ice_rxtx.c
+++ b/drivers/net/intel/ice/ice_rxtx.c
@@ -2039,7 +2039,7 @@ ice_rx_alloc_bufs(struct ci_rx_queue *rxq)
alloc_idx = (uint16_t)(rxq->rx_free_trigger -
(rxq->rx_free_thresh - 1));
rxep = &rxq->sw_ring[alloc_idx];
- diag = rte_mempool_get_bulk(rxq->mp, (void *)rxep,
+ diag = rte_mbuf_raw_alloc_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
if (unlikely(diag != 0)) {
PMD_RX_LOG(ERR, "Failed to get mbufs in bulk");
@@ -2047,7 +2047,7 @@ ice_rx_alloc_bufs(struct ci_rx_queue *rxq)
}
if (rxq->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT) {
- diag_pay = rte_mempool_get_bulk(rxq->rxseg[1].mp,
+ diag_pay = rte_mbuf_raw_alloc_bulk(rxq->rxseg[1].mp,
(void *)rxq->sw_split_buf, rxq->rx_free_thresh);
if (unlikely(diag_pay != 0)) {
rte_mempool_put_bulk(rxq->mp, (void *)rxep,
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
index 1babc5114b..21c8f79254 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
@@ -20,7 +20,7 @@ idpf_singleq_rx_rearm(struct idpf_rx_queue *rxq)
rxdp += rxq->rxrearm_start;
/* Pull 'n' more MBUFs into the software ring */
- if (rte_mempool_get_bulk(rxq->mp,
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp,
(void *)rxep,
IDPF_RXQ_REARM_THRESH) < 0) {
if (rxq->rxrearm_nb + IDPF_RXQ_REARM_THRESH >=
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
index 06e73c8725..bc2cadd738 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
@@ -22,7 +22,7 @@ idpf_singleq_rearm_common(struct idpf_rx_queue *rxq)
rxdp += rxq->rxrearm_start;
/* Pull 'n' more MBUFs into the software ring */
- if (rte_mempool_get_bulk(rxq->mp,
+ if (rte_mbuf_raw_alloc_bulk(rxq->mp,
(void *)rxp,
IDPF_RXQ_REARM_THRESH) < 0) {
if (rxq->rxrearm_nb + IDPF_RXQ_REARM_THRESH >=
@@ -551,7 +551,7 @@ idpf_splitq_rearm_common(struct idpf_rx_queue *rx_bufq)
rxdp += rx_bufq->rxrearm_start;
/* Pull 'n' more MBUFs into the software ring */
- if (rte_mempool_get_bulk(rx_bufq->mp,
+ if (rte_mbuf_raw_alloc_bulk(rx_bufq->mp,
(void *)rxp,
IDPF_RXQ_REARM_THRESH) < 0) {
if (rx_bufq->rxrearm_nb + IDPF_RXQ_REARM_THRESH >=
diff --git a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
index bbe665a6ff..6143d16377 100644
--- a/drivers/net/intel/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/intel/ixgbe/ixgbe_rxtx.c
@@ -1659,7 +1659,7 @@ ixgbe_rx_alloc_bufs(struct ci_rx_queue *rxq, bool
reset_mbuf)
/* allocate buffers in bulk directly into the S/W ring */
alloc_idx = rxq->rx_free_trigger - (rxq->rx_free_thresh - 1);
rxep = &rxq->sw_ring[alloc_idx];
- diag = rte_mempool_get_bulk(rxq->mp, (void *)rxep,
+ diag = rte_mbuf_raw_alloc_bulk(rxq->mp, (void *)rxep,
rxq->rx_free_thresh);
if (unlikely(diag != 0))
return -ENOMEM;
--
2.48.1
