From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 79E782BB4 for ; Mon, 29 Aug 2016 16:35:53 +0200 (CEST) Received: from glumotte.dev.6wind.com (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id 57F7824E39; Mon, 29 Aug 2016 16:35:53 +0200 (CEST) From: Olivier Matz To: dev@dpdk.org Cc: cunming.liang@intel.com, john.mcnamara@intel.com, andrey.chilikin@intel.com, konstantin.ananyev@intel.com Date: Mon, 29 Aug 2016 16:35:31 +0200 Message-Id: <1472481335-21226-13-git-send-email-olivier.matz@6wind.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1472481335-21226-1-git-send-email-olivier.matz@6wind.com> References: <1467733310-20875-1-git-send-email-olivier.matz@6wind.com> <1472481335-21226-1-git-send-email-olivier.matz@6wind.com> Subject: [dpdk-dev] [PATCH v2 12/16] net: get ptype for the first layers only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2016 14:35:54 -0000 Add a parameter to rte_net_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 --- lib/librte_net/rte_net.c | 33 ++++++++++++++++++++++++++++++++- lib/librte_net/rte_net.h | 7 ++++++- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c index 2b57ac1..a5fe07e 100644 --- a/lib/librte_net/rte_net.c +++ b/lib/librte_net/rte_net.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_net_get_ptype(const struct rte_mbuf *m, - struct rte_net_hdr_lens *hdr_lens) + struct rte_net_hdr_lens *hdr_lens, uint32_t layers) { struct rte_net_hdr_lens local_hdr_lens; const struct ether_hdr *eh; @@ -273,6 +273,9 @@ uint32_t rte_net_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 */ @@ -302,6 +305,9 @@ uint32_t rte_net_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; @@ -313,6 +319,10 @@ uint32_t rte_net_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; @@ -340,6 +350,10 @@ uint32_t rte_net_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; @@ -368,6 +382,10 @@ uint32_t rte_net_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; } @@ -375,6 +393,9 @@ uint32_t rte_net_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)) @@ -412,6 +433,9 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, proto = vh->eth_proto; } + 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; @@ -423,6 +447,9 @@ uint32_t rte_net_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)) { @@ -455,6 +482,10 @@ uint32_t rte_net_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_net/rte_net.h b/lib/librte_net/rte_net.h index 02299db..d4156ae 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -75,11 +75,16 @@ struct rte_net_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_net_get_ptype(const struct rte_mbuf *m, - struct rte_net_hdr_lens *hdr_lens); + struct rte_net_hdr_lens *hdr_lens, uint32_t layers); #ifdef __cplusplus } -- 2.8.1