Change the inline function to macro with parameters
Signed-off-by: Jianbo Liu <jianbo.liu at linaro.org>
---
drivers/net/fm10k/fm10k_rxtx_vec.c | 8 ++++----
drivers/net/i40e/i40e_rxtx_vec.c | 8 ++++----
drivers/net/ixgbe/ixgbe_rxtx_vec.c | 8 ++++----
drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 12 ++++++++----
drivers/net/mlx4/mlx4.c | 4 ++--
drivers/net/mlx5/mlx5_rxtx.c | 4 ++--
examples/ipsec-secgw/ipsec-secgw.c | 2 +-
lib/librte_mbuf/rte_mbuf.h | 25 +++++++++++++------------
8 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c
b/drivers/net/fm10k/fm10k_rxtx_vec.c
index ef256a5..0e4c91c 100644
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -487,10 +487,10 @@ fm10k_recv_raw_pkts_vec(void *rx_queue, struct rte_mbuf
**rx_pkts,
rte_compiler_barrier();
if (split_packet) {
- rte_mbuf_prefetch_part2(rx_pkts[pos]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 1]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 2]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 3]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 1]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 2]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 3]);
}
/* D.1 pkt 3,4 convert format from desc to pktmbuf */
diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
index eef80d9..a5c4847 100644
--- a/drivers/net/i40e/i40e_rxtx_vec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec.c
@@ -297,10 +297,10 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
_mm_storeu_si128((__m128i *)&rx_pkts[pos+2], mbp2);
if (split_packet) {
- rte_mbuf_prefetch_part2(rx_pkts[pos]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 1]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 2]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 3]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 1]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 2]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 3]);
}
/* avoid compiler reorder optimization */
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec.c
b/drivers/net/ixgbe/ixgbe_rxtx_vec.c
index 09f4892..55adb56 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec.c
@@ -308,10 +308,10 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
_mm_storeu_si128((__m128i *)&rx_pkts[pos+2], mbp2);
if (split_packet) {
- rte_mbuf_prefetch_part2(rx_pkts[pos]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 1]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 2]);
- rte_mbuf_prefetch_part2(rx_pkts[pos + 3]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 1]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 2]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, rx_pkts[pos + 3]);
}
/* avoid compiler reorder optimization */
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
index 9c1d124..941b2d5 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
@@ -280,10 +280,14 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct
rte_mbuf **rx_pkts,
vst1q_u64((uint64_t *)&rx_pkts[pos + 2], mbp2);
if (split_packet) {
- rte_prefetch_non_temporal(&rx_pkts[pos]->cacheline1);
- rte_prefetch_non_temporal(&rx_pkts[pos +
1]->cacheline1);
- rte_prefetch_non_temporal(&rx_pkts[pos +
2]->cacheline1);
- rte_prefetch_non_temporal(&rx_pkts[pos +
3]->cacheline1);
+ RTE_MBUF_PREFETCH_PART2(prefetch_non_temporal,
+ rx_pkts[pos]);
+ RTE_MBUF_PREFETCH_PART2(prefetch_non_temporal,
+ rx_pkts[pos + 1]);
+ RTE_MBUF_PREFETCH_PART2(prefetch_non_temporal,
+ rx_pkts[pos + 2]);
+ RTE_MBUF_PREFETCH_PART2(prefetch_non_temporal,
+ rx_pkts[pos + 3]);
}
/* D.1 pkt 3,4 convert format from desc to pktmbuf */
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 9ed1491..677ca02 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -3283,8 +3283,8 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts,
uint16_t pkts_n)
* Fetch initial bytes of packet descriptor into a
* cacheline while allocating rep.
*/
- rte_mbuf_prefetch_part1(seg);
- rte_mbuf_prefetch_part2(seg);
+ RTE_MBUF_PREFETCH_PART1(prefetch0, seg);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, seg);
ret = rxq->if_cq->poll_length_flags(rxq->cq, NULL, NULL,
&flags);
if (unlikely(ret < 0)) {
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 29bfcec..3d853c5 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -1134,8 +1134,8 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts,
uint16_t pkts_n)
* Fetch initial bytes of packet descriptor into a
* cacheline while allocating rep.
*/
- rte_mbuf_prefetch_part1(seg);
- rte_mbuf_prefetch_part2(seg);
+ RTE_MBUF_PREFETCH_PART1(prefetch0, seg);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, seg);
ret = rxq->poll(rxq->cq, NULL, NULL, &flags, &vlan_tci);
if (unlikely(ret < 0)) {
struct ibv_wc wc;
diff --git a/examples/ipsec-secgw/ipsec-secgw.c
b/examples/ipsec-secgw/ipsec-secgw.c
index ebd7c23..2da94b3 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -298,7 +298,7 @@ prepare_tx_burst(struct rte_mbuf *pkts[], uint16_t nb_pkts,
uint8_t port)
const int32_t prefetch_offset = 2;
for (i = 0; i < (nb_pkts - prefetch_offset); i++) {
- rte_mbuf_prefetch_part2(pkts[i + prefetch_offset]);
+ RTE_MBUF_PREFETCH_PART2(prefetch0, pkts[i + prefetch_offset]);
prepare_tx_pkt(pkts[i], port);
}
/* Process left packets */
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 11fa06d..f01754c 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -849,14 +849,15 @@ struct rte_mbuf {
* in the receive path. If the cache line of the architecture is higher than
* 64B, the second part will also be prefetched.
*
+ * @param method
+ * The prefetch method: prefetch0, prefetch1, prefetch2 or
+ * prefetch_non_temporal.
+ *
* @param m
* The pointer to the mbuf.
*/
-static inline void
-rte_mbuf_prefetch_part1(struct rte_mbuf *m)
-{
- rte_prefetch0(&m->cacheline0);
-}
+#define RTE_MBUF_PREFETCH_PART1(method, m) \
+ rte_##method(&(m)->cacheline0)
/**
* Prefetch the second part of the mbuf
@@ -866,19 +867,19 @@ rte_mbuf_prefetch_part1(struct rte_mbuf *m)
* this function does nothing as it is expected that the full mbuf is
* already in cache.
*
+ * @param method
+ * The prefetch method: prefetch0, prefetch1, prefetch2 or
+ * prefetch_non_temporal.
+ *
* @param m
* The pointer to the mbuf.
*/
-static inline void
-rte_mbuf_prefetch_part2(struct rte_mbuf *m)
-{
#if RTE_CACHE_LINE_SIZE == 64
- rte_prefetch0(&m->cacheline1);
+#define RTE_MBUF_PREFETCH_PART2(method, m) \
+ rte_##method(&(m)->cacheline1)
#else
- RTE_SET_USED(m);
+#define RTE_MBUF_PREFETCH_PART2(method, m)
#endif
-}
-
static inline uint16_t rte_pktmbuf_priv_size(struct rte_mempool *mp);
--
2.4.11
