summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Ananyev <konstantin.ananyev@intel.com>2014-12-05 15:20:34 +0000
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-12-05 22:57:18 +0100
commit51e16682cf5c8ee64b4ce4cc6a18d6d8f5e68948 (patch)
treeeb8ddf716e42b2c055e515e0f4a14f5a114e2c14
parent661dfdf09ffc822621722ae9af46f1d7e080d0a5 (diff)
downloaddpdk-51e16682cf5c8ee64b4ce4cc6a18d6d8f5e68948.zip
dpdk-51e16682cf5c8ee64b4ce4cc6a18d6d8f5e68948.tar.gz
dpdk-51e16682cf5c8ee64b4ce4cc6a18d6d8f5e68948.tar.xz
ixgbe: do not override buffer length
The template mbuf_initializer is hard coded with a buflen which might have been set differently by the application at the time of mbuf pool creation. - move buf_len fields out of rearm_data marker. - make ixgbe_recv_pkts_vec() not touch buf_len field at all (as all other RX functions behave). Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com> Acked-by: Jean-Mickael Guerin <jean-mickael.guerin@6wind.com>
-rw-r--r--lib/librte_mbuf/rte_mbuf.h7
-rw-r--r--lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c20
2 files changed, 20 insertions, 7 deletions
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 8f1e923..efdefc4 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -189,8 +189,10 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask);
/* define a set of marker types that can be used to refer to set points in the
* mbuf */
typedef void *MARKER[0]; /**< generic marker for a point in a structure */
+typedef uint8_t MARKER8[0]; /**< generic marker with 1B alignment */
typedef uint64_t MARKER64[0]; /**< marker that allows us to overwrite 8 bytes
* with a single assignment */
+
/**
* The generic rte_mbuf, containing a packet mbuf.
*/
@@ -200,9 +202,10 @@ struct rte_mbuf {
void *buf_addr; /**< Virtual address of segment buffer. */
phys_addr_t buf_physaddr; /**< Physical address of segment buffer. */
- /* next 8 bytes are initialised on RX descriptor rearm */
- MARKER64 rearm_data;
uint16_t buf_len; /**< Length of segment buffer. */
+
+ /* next 6 bytes are initialised on RX descriptor rearm */
+ MARKER8 rearm_data;
uint16_t data_off;
/**
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c
index c1b5a78..3a30fa7 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx_vec.c
@@ -79,13 +79,22 @@ ixgbe_rxq_rearm(struct igb_rx_queue *rxq)
/* Initialize the mbufs in vector, process 2 mbufs in one loop */
for (i = 0; i < RTE_IXGBE_RXQ_REARM_THRESH; i += 2, rxep += 2) {
__m128i vaddr0, vaddr1;
+ uintptr_t p0, p1;
mb0 = rxep[0].mbuf;
mb1 = rxep[1].mbuf;
- /* flush mbuf with pkt template */
- mb0->rearm_data[0] = rxq->mbuf_initializer;
- mb1->rearm_data[0] = rxq->mbuf_initializer;
+ /*
+ * Flush mbuf with pkt template.
+ * Data to be rearmed is 6 bytes long.
+ * Though, RX will overwrite ol_flags that are coming next
+ * anyway. So overwrite whole 8 bytes with one load:
+ * 6 bytes of rearm_data plus first 2 bytes of ol_flags.
+ */
+ p0 = (uintptr_t)&mb0->rearm_data;
+ *(uint64_t *)p0 = rxq->mbuf_initializer;
+ p1 = (uintptr_t)&mb1->rearm_data;
+ *(uint64_t *)p1 = rxq->mbuf_initializer;
/* load buf_addr(lo 64bit) and buf_physaddr(hi 64bit) */
vaddr0 = _mm_loadu_si128((__m128i *)&(mb0->buf_addr));
@@ -732,17 +741,18 @@ static struct ixgbe_txq_ops vec_txq_ops = {
int
ixgbe_rxq_vec_setup(struct igb_rx_queue *rxq)
{
+ uintptr_t p;
struct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */
mb_def.nb_segs = 1;
mb_def.data_off = RTE_PKTMBUF_HEADROOM;
- mb_def.buf_len = rxq->mb_pool->elt_size - sizeof(struct rte_mbuf);
mb_def.port = rxq->port_id;
rte_mbuf_refcnt_set(&mb_def, 1);
/* prevent compiler reordering: rearm_data covers previous fields */
rte_compiler_barrier();
- rxq->mbuf_initializer = *((uint64_t *)&mb_def.rearm_data);
+ p = (uintptr_t)&mb_def.rearm_data;
+ rxq->mbuf_initializer = *(uint64_t *)p;
return 0;
}