[dpdk-dev] [PATCH 14/18] mbuf: get ptype for the first layers only
Olivier Matz
olivier.matz at 6wind.com
Tue Jul 5 17:41:46 CEST 2016
Add a parameter to rte_pktmbuf_get_ptype() to select which
layers should be parsed. This avoids to parse all layers if
only the first ones are required.
Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
lib/librte_mbuf/rte_mbuf_ptype.c | 33 ++++++++++++++++++++++++++++++++-
lib/librte_mbuf/rte_mbuf_ptype.h | 7 ++++++-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.c b/lib/librte_mbuf/rte_mbuf_ptype.c
index e5be308..2abb896 100644
--- a/lib/librte_mbuf/rte_mbuf_ptype.c
+++ b/lib/librte_mbuf/rte_mbuf_ptype.c
@@ -254,7 +254,7 @@ skip_ip6_ext(uint16_t proto, const struct rte_mbuf *m, uint32_t *off,
/* parse mbuf data to get packet type */
uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
- struct rte_mbuf_hdr_lens *hdr_lens)
+ struct rte_mbuf_hdr_lens *hdr_lens, uint32_t layers)
{
struct rte_mbuf_hdr_lens local_hdr_lens;
const struct ether_hdr *eh;
@@ -273,6 +273,9 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
off = sizeof(*eh);
hdr_lens->l2_len = off;
+ if ((layers & RTE_PTYPE_L2_MASK) == 0)
+ return 0;
+
if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
goto l3; /* fast path if packet is IPv4 */
@@ -322,6 +325,9 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
}
l3:
+ if ((layers & RTE_PTYPE_L3_MASK) == 0)
+ return pkt_type;
+
if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
const struct ipv4_hdr *ip4h;
struct ipv4_hdr ip4h_copy;
@@ -333,6 +339,10 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
pkt_type |= ptype_l3_ip(ip4h->version_ihl);
hdr_lens->l3_len = ip4_hlen(ip4h);
off += hdr_lens->l3_len;
+
+ if ((layers & RTE_PTYPE_L4_MASK) == 0)
+ return pkt_type;
+
if (ip4h->fragment_offset & rte_cpu_to_be_16(
IPV4_HDR_OFFSET_MASK | IPV4_HDR_MF_FLAG)) {
pkt_type |= RTE_PTYPE_L4_FRAG;
@@ -360,6 +370,10 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
}
if (proto == 0)
return pkt_type;
+
+ if ((layers & RTE_PTYPE_L4_MASK) == 0)
+ return pkt_type;
+
if (frag) {
pkt_type |= RTE_PTYPE_L4_FRAG;
hdr_lens->l4_len = 0;
@@ -388,6 +402,10 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
uint32_t prev_off = off;
hdr_lens->l4_len = 0;
+
+ if ((layers & RTE_PTYPE_TUNNEL_MASK) == 0)
+ return pkt_type;
+
pkt_type |= ptype_tunnel(&proto, m, &off);
hdr_lens->tunnel_len = off - prev_off;
}
@@ -395,6 +413,9 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
/* same job for inner header: we need to duplicate the code
* because the packet types do not have the same value.
*/
+ if ((layers & RTE_PTYPE_INNER_L2_MASK) == 0)
+ return pkt_type;
+
if (proto == rte_cpu_to_be_16(ETHER_TYPE_TEB)) {
eh = rte_pktmbuf_read(m, off, sizeof(*eh), &eh_copy);
if (unlikely(eh == NULL))
@@ -438,6 +459,9 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
return pkt_type;
}
+ if ((layers & RTE_PTYPE_INNER_L3_MASK) == 0)
+ return pkt_type;
+
if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) {
const struct ipv4_hdr *ip4h;
struct ipv4_hdr ip4h_copy;
@@ -449,6 +473,9 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
pkt_type |= ptype_inner_l3_ip(ip4h->version_ihl);
hdr_lens->inner_l3_len = ip4_hlen(ip4h);
off += hdr_lens->inner_l3_len;
+
+ if ((layers & RTE_PTYPE_INNER_L4_MASK) == 0)
+ return pkt_type;
if (ip4h->fragment_offset &
rte_cpu_to_be_16(IPV4_HDR_OFFSET_MASK |
IPV4_HDR_MF_FLAG)) {
@@ -481,6 +508,10 @@ uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
}
if (proto == 0)
return pkt_type;
+
+ if ((layers & RTE_PTYPE_INNER_L4_MASK) == 0)
+ return pkt_type;
+
if (frag) {
pkt_type |= RTE_PTYPE_INNER_L4_FRAG;
hdr_lens->inner_l4_len = 0;
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h
index be3ad96..9af52b4 100644
--- a/lib/librte_mbuf/rte_mbuf_ptype.h
+++ b/lib/librte_mbuf/rte_mbuf_ptype.h
@@ -622,11 +622,16 @@ struct rte_mbuf_hdr_lens {
* @param hdr_lens
* A pointer to a structure where the header lengths will be returned,
* or NULL.
+ * @param layers
+ * List of layers to parse. The function will stop at the first
+ * empty layer. Examples:
+ * - To parse all known layers, use RTE_PTYPE_ALL_MASK.
+ * - To parse only L2 and L3, use RTE_PTYPE_L2_MASK | RTE_PTYPE_L3_MASK
* @return
* The packet type of the packet.
*/
uint32_t rte_pktmbuf_get_ptype(const struct rte_mbuf *m,
- struct rte_mbuf_hdr_lens *hdr_lens);
+ struct rte_mbuf_hdr_lens *hdr_lens, uint32_t layers);
#ifdef __cplusplus
}
--
2.8.1
More information about the dev
mailing list