net: add rte prefix to IP structure

[dpdk.git] / lib / librte_hash / rte_thash.h

diff --git a/lib/librte_hash/rte_thash.h b/lib/librte_hash/rte_thash.h
index a4886a8..b4aaabe 100644 (file)
--- a/lib/librte_hash/rte_thash.h
+++ b/lib/librte_hash/rte_thash.h
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2015 Vladimir Medvedkin <medvedkinv@gmail.com>
- *   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 Intel Corporation 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(c) 2015-2019 Vladimir Medvedkin <medvedkinv@gmail.com>
  */
 
 #ifndef _RTE_THASH_H
@@ -53,14 +24,15 @@ extern "C" {
 
 #include <stdint.h>
 #include <rte_byteorder.h>
+#include <rte_config.h>
 #include <rte_ip.h>
 #include <rte_common.h>
 
-#ifdef __SSE3__
+#if defined(RTE_ARCH_X86) || defined(RTE_MACHINE_CPUFLAG_NEON)
 #include <rte_vect.h>
 #endif
 
-#ifdef __SSE3__
+#ifdef RTE_ARCH_X86
 /* Byte swap mask used for converting IPv6 address
  * 4-byte chunks to CPU byte order
  */
@@ -134,7 +106,7 @@ struct rte_ipv6_tuple {
 union rte_thash_tuple {
        struct rte_ipv4_tuple   v4;
        struct rte_ipv6_tuple   v6;
-#ifdef __SSE3__
+#ifdef RTE_ARCH_X86
 } __attribute__((aligned(XMM_SIZE)));
 #else
 };
@@ -167,15 +139,21 @@ rte_convert_rss_key(const uint32_t *orig, uint32_t *targ, int len)
  *   Pointer to rte_ipv6_tuple structure
  */
 static inline void
-rte_thash_load_v6_addrs(const struct ipv6_hdr *orig, union rte_thash_tuple *targ)
+rte_thash_load_v6_addrs(const struct rte_ipv6_hdr *orig,
+                       union rte_thash_tuple *targ)
 {
-#ifdef __SSE3__
+#ifdef RTE_ARCH_X86
        __m128i ipv6 = _mm_loadu_si128((const __m128i *)orig->src_addr);
        *(__m128i *)targ->v6.src_addr =
                        _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask);
        ipv6 = _mm_loadu_si128((const __m128i *)orig->dst_addr);
        *(__m128i *)targ->v6.dst_addr =
                        _mm_shuffle_epi8(ipv6, rte_thash_ipv6_bswap_mask);
+#elif defined(RTE_MACHINE_CPUFLAG_NEON)
+       uint8x16_t ipv6 = vld1q_u8((uint8_t const *)orig->src_addr);
+       vst1q_u8((uint8_t *)targ->v6.src_addr, vrev32q_u8(ipv6));
+       ipv6 = vld1q_u8((uint8_t const *)orig->dst_addr);
+       vst1q_u8((uint8_t *)targ->v6.dst_addr, vrev32q_u8(ipv6));
 #else
        int i;
        for (i = 0; i < 4; i++) {
@@ -202,15 +180,14 @@ static inline uint32_t
 rte_softrss(uint32_t *input_tuple, uint32_t input_len,
                const uint8_t *rss_key)
 {
-       uint32_t i, j, ret = 0;
+       uint32_t i, j, map, ret = 0;
 
        for (j = 0; j < input_len; j++) {
-               for (i = 0; i < 32; i++) {
-                       if (input_tuple[j] & (1 << (31 - i))) {
-                               ret ^= rte_cpu_to_be_32(((const uint32_t *)rss_key)[j]) << i |
+               for (map = input_tuple[j]; map; map &= (map - 1)) {
+                       i = rte_bsf32(map);
+                       ret ^= rte_cpu_to_be_32(((const uint32_t *)rss_key)[j]) << (31 - i) |
                                        (uint32_t)((uint64_t)(rte_cpu_to_be_32(((const uint32_t *)rss_key)[j + 1])) >>
-                                       (32 - i));
-                       }
+                                       (i + 1));
                }
        }
        return ret;
@@ -233,14 +210,13 @@ static inline uint32_t
 rte_softrss_be(uint32_t *input_tuple, uint32_t input_len,
                const uint8_t *rss_key)
 {
-       uint32_t i, j, ret = 0;
+       uint32_t i, j, map, ret = 0;
 
        for (j = 0; j < input_len; j++) {
-               for (i = 0; i < 32; i++) {
-                       if (input_tuple[j] & (1 << (31 - i))) {
-                               ret ^= ((const uint32_t *)rss_key)[j] << i |
-                                       (uint32_t)((uint64_t)(((const uint32_t *)rss_key)[j + 1]) >> (32 - i));
-                       }
+               for (map = input_tuple[j]; map; map &= (map - 1)) {
+                       i = rte_bsf32(map);
+                       ret ^= ((const uint32_t *)rss_key)[j] << (31 - i) |
+                               (uint32_t)((uint64_t)(((const uint32_t *)rss_key)[j + 1]) >> (i + 1));
                }
        }
        return ret;