[PATCH v2 06/16] net: support Vlan in software packet type parser
From: Olivier Matz <hidden>
Date: 2016-08-29 14:35:53
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
Add a new RTE_PTYPE_L2_ETHER_VLAN packet type, and its support in rte_net_get_ptype(). Signed-off-by: Didier Pallard <redacted> Signed-off-by: Olivier Matz <redacted> --- lib/librte_mbuf/rte_mbuf_ptype.h | 7 +++++++ lib/librte_net/rte_net.c | 13 +++++++++++++ 2 files changed, 20 insertions(+)
diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h
index 4a34678..101e7fa 100644
--- a/lib/librte_mbuf/rte_mbuf_ptype.h
+++ b/lib/librte_mbuf/rte_mbuf_ptype.h@@ -136,6 +136,13 @@ extern "C" { */ #define RTE_PTYPE_L2_ETHER_NSH 0x00000005 /** + * VLAN packet type. + * + * Packet format: + * <'ether type'=[0x8100]> + */ +#define RTE_PTYPE_L2_ETHER_VLAN 0x00000006 +/** * Mask of layer 2 packet types. * It is used for outer packet for tunneling cases. */
diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c
index a542fb5..7d34532 100644
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c@@ -167,6 +167,19 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, off = sizeof(*eh); hdr_lens->l2_len = off; + if (proto == rte_cpu_to_be_16(ETHER_TYPE_VLAN)) { + const struct vlan_hdr *vh; + struct vlan_hdr vh_copy; + + pkt_type = RTE_PTYPE_L2_ETHER_VLAN; + vh = rte_pktmbuf_read(m, off, sizeof(*vh), &vh_copy); + if (unlikely(vh == NULL)) + return pkt_type; + off += sizeof(*vh); + hdr_lens->l2_len += sizeof(*vh); + proto = vh->eth_proto; + } + if (proto == rte_cpu_to_be_16(ETHER_TYPE_IPv4)) { const struct ipv4_hdr *ip4h; struct ipv4_hdr ip4h_copy;
--
2.8.1