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

mbuf: use structure marker from EAL

Browse Source 
Use new marker typedef available in EAL and remove private marker
typedef.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Jerin Jacob 2019-12-19 16:55:07 +05:30 committed by Thomas Monjalon
parent 8f196dc897
commit 3e6181b070
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/librte_mbuf/rte_mbuf_core.h
View File

@ -406,19 +406,6 @@ extern "C" {
#define RTE_MBUF_DEFAULT_BUF_SIZE \ #define RTE_MBUF_DEFAULT_BUF_SIZE \
(RTE_MBUF_DEFAULT_DATAROOM + RTE_PKTMBUF_HEADROOM) (RTE_MBUF_DEFAULT_DATAROOM + RTE_PKTMBUF_HEADROOM)
/*
* define a set of marker types that can be used to refer to set points in the
* mbuf.
*/
__extension__
typedef void *MARKER[0]; /**< generic marker for a point in a structure */
__extension__
typedef uint8_t MARKER8[0]; /**< generic marker with 1B alignment */
/** marker that allows us to overwrite 8 bytes with a single assignment */
__extension__
typedef uint64_t MARKER64[0];
struct rte_mbuf_sched { struct rte_mbuf_sched {
uint32_t queue_id; /**< Queue ID. */ uint32_t queue_id; /**< Queue ID. */
uint8_t traffic_class; uint8_t traffic_class;
@ -478,7 +465,7 @@ enum {
* The generic rte_mbuf, containing a packet mbuf. * The generic rte_mbuf, containing a packet mbuf.
*/ */
struct rte_mbuf { struct rte_mbuf {
MARKER cacheline0; RTE_MARKER cacheline0;
void *buf_addr; /**< Virtual address of segment buffer. */ void *buf_addr; /**< Virtual address of segment buffer. */
/** /**
@ -494,7 +481,7 @@ struct rte_mbuf {
} __rte_aligned(sizeof(rte_iova_t)); } __rte_aligned(sizeof(rte_iova_t));
/* next 8 bytes are initialised on RX descriptor rearm */ /* next 8 bytes are initialised on RX descriptor rearm */
MARKER64 rearm_data; RTE_MARKER64 rearm_data;
uint16_t data_off; uint16_t data_off;
/** /**
@ -522,7 +509,7 @@ struct rte_mbuf {
uint64_t ol_flags; /**< Offload features. */ uint64_t ol_flags; /**< Offload features. */
/* remaining bytes are set on RX when pulling packet from descriptor */ /* remaining bytes are set on RX when pulling packet from descriptor */
MARKER rx_descriptor_fields1; RTE_MARKER rx_descriptor_fields1;
/* /*
* The packet type, which is the combination of outer/inner L2, L3, L4 * The packet type, which is the combination of outer/inner L2, L3, L4
@ -610,7 +597,7 @@ struct rte_mbuf {
uint64_t timestamp; uint64_t timestamp;
/* second cache line - fields only used in slow path or on TX */ /* second cache line - fields only used in slow path or on TX */
MARKER cacheline1 __rte_cache_min_aligned; RTE_MARKER cacheline1 __rte_cache_min_aligned;
RTE_STD_C11 RTE_STD_C11
union { union {