ethdev: fix shallow copy of flow API RSS action

[dpdk.git] / lib / librte_net / rte_net.c

diff --git a/lib/librte_net/rte_net.c b/lib/librte_net/rte_net.c
index 53cfef8..56a13e3 100644 (file)
--- a/lib/librte_net/rte_net.c
+++ b/lib/librte_net/rte_net.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2016 6WIND S.A.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016 6WIND S.A.
  */
 
 #include <stdint.h>
@@ -254,7 +225,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 +244,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 +276,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 +290,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 +321,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 +353,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 +364,10 @@ 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;
+
+       hdr_lens->inner_l2_len = 0;
        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 +405,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 +419,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 +454,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;