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

net: support MPLS in software packet type parser

Browse Source 
Add RTE_PTYPE_L2_ETHER_MPLS packet type support in rte_net_get_ptype().

Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Olivier Matz 2018-10-23 09:46:49 +02:00 committed by Ferruh Yigit
parent e480cf487a
commit 140af04e63
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/librte_net/rte_ether.h
View File

@ -306,6 +306,8 @@ struct vxlan_hdr {
#define ETHER_TYPE_SLOW 0x8809 /**< Slow protocols (LACP and Marker). */
#define ETHER_TYPE_TEB 0x6558 /**< Transparent Ethernet Bridging. */
#define ETHER_TYPE_LLDP 0x88CC /**< LLDP Protocol. */
#define ETHER_TYPE_MPLS 0x8847 /**< MPLS ethertype. */
#define ETHER_TYPE_MPLSM 0x8848 /**< MPLS multicast ethertype. */
#define ETHER_VXLAN_HLEN (sizeof(struct udp_hdr) + sizeof(struct vxlan_hdr))
/**< VXLAN tunnel header length. */

21
lib/librte_net/rte_net.c
View File

@ -13,6 +13,7 @@
#include <rte_udp.h>
#include <rte_sctp.h>
#include <rte_gre.h>
#include <rte_mpls.h>
#include <rte_net.h>
/* get l3 packet type from ip6 next protocol */
@ -274,9 +275,27 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m,
off += 2 * sizeof(*vh);
hdr_lens->l2_len += 2 * sizeof(*vh);
proto = vh->eth_proto;
} else if ((proto == rte_cpu_to_be_16(ETHER_TYPE_MPLS)) ||
(proto == rte_cpu_to_be_16(ETHER_TYPE_MPLSM))) {
unsigned int i;
const struct mpls_hdr *mh;
struct mpls_hdr mh_copy;
#define MAX_MPLS_HDR 5
for (i = 0; i < MAX_MPLS_HDR; i++) {
mh = rte_pktmbuf_read(m, off + (i * sizeof(*mh)),
sizeof(*mh), &mh_copy);
if (unlikely(mh == NULL))
return pkt_type;
}
if (i == MAX_MPLS_HDR)
return pkt_type;
pkt_type = RTE_PTYPE_L2_ETHER_MPLS;
hdr_lens->l2_len += (sizeof(*mh) * i);
return pkt_type;
}
l3:
l3:
if ((layers & RTE_PTYPE_L3_MASK) == 0)
return pkt_type;