Re: [dpdk-dev] [PATCH v3 3/3] net/softnic: modify softnic to use librte_table headers

["Gavin Hu (Arm Technology China)" <Gavin.Hu@arm.com>]

> -----Original Message-----
> From: Kevin Laatz <kevin.laatz@intel.com>
> Sent: Friday, September 7, 2018 6:06 PM
> To: dev@dpdk.org
> Cc: cristian.dumitrescu@intel.com; Jianbo Liu <Jianbo.Liu@arm.com>; Gavin
> Hu (Arm Technology China) <Gavin.Hu@arm.com>;
> jerin.jacob@caviumnetworks.com; Kevin Laatz <kevin.laatz@intel.com>
> Subject: [PATCH v3 3/3] net/softnic: modify softnic to use librte_table
> headers
>
> This commit modifies SoftNIC to make use of the new header files in
> librte_table.
>
> As we are now using the new header files in librte_table in SoftNIC, we no
> longer need the old header files so they can be removed.
>
> Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
> Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Gavin Hu <gavin.hu@arm.com>
> ---
>  drivers/net/softnic/hash_func.h                | 359 -------------------------
>  drivers/net/softnic/hash_func_arm64.h          | 261 ------------------
>  drivers/net/softnic/rte_eth_softnic_action.c   |  34 +--
>  drivers/net/softnic/rte_eth_softnic_pipeline.c |  19 +-
>  4 files changed, 26 insertions(+), 647 deletions(-)  delete mode 100644
> drivers/net/softnic/hash_func.h  delete mode 100644
> drivers/net/softnic/hash_func_arm64.h
>
> diff --git a/drivers/net/softnic/hash_func.h
> b/drivers/net/softnic/hash_func.h deleted file mode 100644 index
> 198d2b2..0000000
> --- a/drivers/net/softnic/hash_func.h
> +++ /dev/null
> @@ -1,359 +0,0 @@
> -/* SPDX-License-Identifier: BSD-3-Clause
> - * Copyright(c) 2010-2018 Intel Corporation
> - */
> -
> -#ifndef __INCLUDE_HASH_FUNC_H__
> -#define __INCLUDE_HASH_FUNC_H__
> -
> -#include <rte_common.h>
> -
> -static inline uint64_t
> -hash_xor_key8(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0;
> -
> -xor0 = seed ^ (k[0] & m[0]);
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key16(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key24(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -
> -xor0 ^= k[2] & m[2];
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key32(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0, xor1;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -xor1 = (k[2] & m[2]) ^ (k[3] & m[3]);
> -
> -xor0 ^= xor1;
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key40(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0, xor1;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -xor1 = (k[2] & m[2]) ^ (k[3] & m[3]);
> -
> -xor0 ^= xor1;
> -
> -xor0 ^= k[4] & m[4];
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key48(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0, xor1, xor2;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -xor1 = (k[2] & m[2]) ^ (k[3] & m[3]);
> -xor2 = (k[4] & m[4]) ^ (k[5] & m[5]);
> -
> -xor0 ^= xor1;
> -
> -xor0 ^= xor2;
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key56(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0, xor1, xor2;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -xor1 = (k[2] & m[2]) ^ (k[3] & m[3]);
> -xor2 = (k[4] & m[4]) ^ (k[5] & m[5]);
> -
> -xor0 ^= xor1;
> -xor2 ^= k[6] & m[6];
> -
> -xor0 ^= xor2;
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -static inline uint64_t
> -hash_xor_key64(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t xor0, xor1, xor2, xor3;
> -
> -xor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);
> -xor1 = (k[2] & m[2]) ^ (k[3] & m[3]);
> -xor2 = (k[4] & m[4]) ^ (k[5] & m[5]);
> -xor3 = (k[6] & m[6]) ^ (k[7] & m[7]);
> -
> -xor0 ^= xor1;
> -xor2 ^= xor3;
> -
> -xor0 ^= xor2;
> -
> -return (xor0 >> 32) ^ xor0;
> -}
> -
> -#if defined(RTE_ARCH_X86_64)
> -
> -#include <x86intrin.h>
> -
> -static inline uint64_t
> -hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t crc0;
> -
> -crc0 = _mm_crc32_u64(seed, k[0] & m[0]);
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, crc0, crc1;
> -
> -k0 = k[0] & m[0];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, crc0, crc1;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc0 = _mm_crc32_u64(crc0, k2);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc2 = _mm_crc32_u64(k2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -
> -crc0 = _mm_crc32_u64(crc0, crc1);
> -crc1 = _mm_crc32_u64(crc2, crc3);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc2 = _mm_crc32_u64(k2, k[3] & m[3]);
> -crc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);
> -
> -crc0 = _mm_crc32_u64(crc0, crc1);
> -crc1 = _mm_crc32_u64(crc2, crc3);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc2 = _mm_crc32_u64(k2, k[3] & m[3]);
> -crc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);
> -
> -crc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);
> -crc1 = _mm_crc32_u64(crc3, k5);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc2 = _mm_crc32_u64(k2, k[3] & m[3]);
> -crc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);
> -
> -crc4 = _mm_crc32_u64(k5, k[6] & m[6]);
> -crc5 = k5 >> 32;
> -
> -crc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);
> -crc1 = _mm_crc32_u64(crc3, (crc4 << 32) ^ crc5);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = _mm_crc32_u64(k0, seed);
> -crc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);
> -
> -crc2 = _mm_crc32_u64(k2, k[3] & m[3]);
> -crc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);
> -
> -crc4 = _mm_crc32_u64(k5, k[6] & m[6]);
> -crc5 = _mm_crc32_u64(k5 >> 32, k[7] & m[7]);
> -
> -crc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);
> -crc1 = _mm_crc32_u64(crc3, (crc4 << 32) ^ crc5);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -#define hash_default_key8hash_crc_key8
> -#define hash_default_key16hash_crc_key16
> -#define hash_default_key24hash_crc_key24
> -#define hash_default_key32hash_crc_key32
> -#define hash_default_key40hash_crc_key40
> -#define hash_default_key48hash_crc_key48
> -#define hash_default_key56hash_crc_key56
> -#define hash_default_key64hash_crc_key64
> -
> -#elif defined(RTE_ARCH_ARM64)
> -#include "hash_func_arm64.h"
> -#else
> -
> -#define hash_default_key8hash_xor_key8
> -#define hash_default_key16hash_xor_key16
> -#define hash_default_key24hash_xor_key24
> -#define hash_default_key32hash_xor_key32
> -#define hash_default_key40hash_xor_key40
> -#define hash_default_key48hash_xor_key48
> -#define hash_default_key56hash_xor_key56
> -#define hash_default_key64hash_xor_key64
> -
> -#endif
> -
> -#endif
> diff --git a/drivers/net/softnic/hash_func_arm64.h
> b/drivers/net/softnic/hash_func_arm64.h
> deleted file mode 100644
> index ae6c0f4..0000000
> --- a/drivers/net/softnic/hash_func_arm64.h
> +++ /dev/null
> @@ -1,261 +0,0 @@
> -/*-
> - *   BSD LICENSE
> - *
> - *   Copyright(c) 2017 Linaro Limited. All rights reserved.
> - *   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.
> - */
> -#ifndef __HASH_FUNC_ARM64_H__
> -#define __HASH_FUNC_ARM64_H__
> -
> -#define _CRC32CX(crc, val)\
> -__asm__("crc32cx %w[c], %w[c], %x[v]":[c] "+r" (crc):[v] "r" (val))
> -
> -static inline uint64_t
> -hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key;
> -uint64_t *m = mask;
> -uint32_t crc0;
> -
> -crc0 = seed;
> -_CRC32CX(crc0, k[0] & m[0]);
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1;
> -
> -k0 = k[0] & m[0];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -_CRC32CX(crc0, k2);
> -
> -crc0 ^= crc1;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc2 = k2;
> -_CRC32CX(crc2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -
> -_CRC32CX(crc0, crc1);
> -_CRC32CX(crc2, crc3);
> -
> -crc0 ^= crc2;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc2 = k2;
> -_CRC32CX(crc2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -_CRC32CX(crc3, k[4] & m[4]);
> -
> -_CRC32CX(crc0, crc1);
> -_CRC32CX(crc2, crc3);
> -
> -crc0 ^= crc2;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2, k5;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1, crc2, crc3;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc2 = k2;
> -_CRC32CX(crc2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -_CRC32CX(crc3, k[4] & m[4]);
> -
> -_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);
> -_CRC32CX(crc3, k5);
> -
> -crc0 ^= crc3;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2, k5;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1, crc2, crc3, crc4, crc5;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc2 = k2;
> -_CRC32CX(crc2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -_CRC32CX(crc3, k[4] & m[4]);
> -
> -crc4 = k5;
> - _CRC32CX(crc4, k[6] & m[6]);
> -crc5 = k5 >> 32;
> -
> -_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);
> -_CRC32CX(crc3, ((uint64_t)crc4 << 32) ^ crc5);
> -
> -crc0 ^= crc3;
> -
> -return crc0;
> -}
> -
> -static inline uint64_t
> -hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size,
> -uint64_t seed)
> -{
> -uint64_t *k = key, k0, k2, k5;
> -uint64_t *m = mask;
> -uint32_t crc0, crc1, crc2, crc3, crc4, crc5;
> -
> -k0 = k[0] & m[0];
> -k2 = k[2] & m[2];
> -k5 = k[5] & m[5];
> -
> -crc0 = k0;
> -_CRC32CX(crc0, seed);
> -crc1 = k0 >> 32;
> -_CRC32CX(crc1, k[1] & m[1]);
> -
> -crc2 = k2;
> -_CRC32CX(crc2, k[3] & m[3]);
> -crc3 = k2 >> 32;
> -_CRC32CX(crc3, k[4] & m[4]);
> -
> -crc4 = k5;
> - _CRC32CX(crc4, k[6] & m[6]);
> -crc5 = k5 >> 32;
> -_CRC32CX(crc5, k[7] & m[7]);
> -
> -_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);
> -_CRC32CX(crc3, ((uint64_t)crc4 << 32) ^ crc5);
> -
> -crc0 ^= crc3;
> -
> -return crc0;
> -}
> -
> -#define hash_default_key8hash_crc_key8
> -#define hash_default_key16hash_crc_key16
> -#define hash_default_key24hash_crc_key24
> -#define hash_default_key32hash_crc_key32
> -#define hash_default_key40hash_crc_key40
> -#define hash_default_key48hash_crc_key48
> -#define hash_default_key56hash_crc_key56
> -#define hash_default_key64hash_crc_key64
> -
> -#endif
> diff --git a/drivers/net/softnic/rte_eth_softnic_action.c
> b/drivers/net/softnic/rte_eth_softnic_action.c
> index c25f4dd..c542688 100644
> --- a/drivers/net/softnic/rte_eth_softnic_action.c
> +++ b/drivers/net/softnic/rte_eth_softnic_action.c
> @@ -7,8 +7,8 @@
>  #include <string.h>
>
>  #include <rte_string_fns.h>
> +#include <rte_table_hash_func.h>
>
> -#include "hash_func.h"
>  #include "rte_eth_softnic_internals.h"
>
>  /**
> @@ -72,35 +72,35 @@ softnic_port_in_action_profile_create(struct
> pmd_internals *p,
>  params->lb.f_hash == NULL) {
>  switch (params->lb.key_size) {
>  case  8:
> -params->lb.f_hash = hash_default_key8;
> +params->lb.f_hash = rte_table_hash_crc_key8;
>  break;
>
>  case 16:
> -params->lb.f_hash = hash_default_key16;
> +params->lb.f_hash = rte_table_hash_crc_key16;
>  break;
>
>  case 24:
> -params->lb.f_hash = hash_default_key24;
> +params->lb.f_hash = rte_table_hash_crc_key24;
>  break;
>
>  case 32:
> -params->lb.f_hash = hash_default_key32;
> +params->lb.f_hash = rte_table_hash_crc_key32;
>  break;
>
>  case 40:
> -params->lb.f_hash = hash_default_key40;
> +params->lb.f_hash = rte_table_hash_crc_key40;
>  break;
>
>  case 48:
> -params->lb.f_hash = hash_default_key48;
> +params->lb.f_hash = rte_table_hash_crc_key48;
>  break;
>
>  case 56:
> -params->lb.f_hash = hash_default_key56;
> +params->lb.f_hash = rte_table_hash_crc_key56;
>  break;
>
>  case 64:
> -params->lb.f_hash = hash_default_key64;
> +params->lb.f_hash = rte_table_hash_crc_key64;
>  break;
>
>  default:
> @@ -223,35 +223,35 @@ softnic_table_action_profile_create(struct
> pmd_internals *p,
>  params->lb.f_hash == NULL) {
>  switch (params->lb.key_size) {
>  case 8:
> -params->lb.f_hash = hash_default_key8;
> +params->lb.f_hash = rte_table_hash_crc_key8;
>  break;
>
>  case 16:
> -params->lb.f_hash = hash_default_key16;
> +params->lb.f_hash = rte_table_hash_crc_key16;
>  break;
>
>  case 24:
> -params->lb.f_hash = hash_default_key24;
> +params->lb.f_hash = rte_table_hash_crc_key24;
>  break;
>
>  case 32:
> -params->lb.f_hash = hash_default_key32;
> +params->lb.f_hash = rte_table_hash_crc_key32;
>  break;
>
>  case 40:
> -params->lb.f_hash = hash_default_key40;
> +params->lb.f_hash = rte_table_hash_crc_key40;
>  break;
>
>  case 48:
> -params->lb.f_hash = hash_default_key48;
> +params->lb.f_hash = rte_table_hash_crc_key48;
>  break;
>
>  case 56:
> -params->lb.f_hash = hash_default_key56;
> +params->lb.f_hash = rte_table_hash_crc_key56;
>  break;
>
>  case 64:
> -params->lb.f_hash = hash_default_key64;
> +params->lb.f_hash = rte_table_hash_crc_key64;
>  break;
>
>  default:
> diff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c
> b/drivers/net/softnic/rte_eth_softnic_pipeline.c
> index 45136a4..0aababe 100644
> --- a/drivers/net/softnic/rte_eth_softnic_pipeline.c
> +++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c
> @@ -19,14 +19,13 @@
>  #include <rte_table_acl.h>
>  #include <rte_table_array.h>
>  #include <rte_table_hash.h>
> +#include <rte_table_hash_func.h>
>  #include <rte_table_lpm.h>
>  #include <rte_table_lpm_ipv6.h>
>  #include <rte_table_stub.h>
>
>  #include "rte_eth_softnic_internals.h"
>
> -#include "hash_func.h"
> -
>  #ifndef PIPELINE_MSGQ_SIZE
>  #define PIPELINE_MSGQ_SIZE                                 64
>  #endif
> @@ -797,28 +796,28 @@ softnic_pipeline_table_create(struct
> pmd_internals *softnic,
>
>  switch (params->match.hash.key_size) {
>  case  8:
> -f_hash = hash_default_key8;
> +f_hash = rte_table_hash_crc_key8;
>  break;
>  case 16:
> -f_hash = hash_default_key16;
> +f_hash = rte_table_hash_crc_key16;
>  break;
>  case 24:
> -f_hash = hash_default_key24;
> +f_hash = rte_table_hash_crc_key24;
>  break;
>  case 32:
> -f_hash = hash_default_key32;
> +f_hash = rte_table_hash_crc_key32;
>  break;
>  case 40:
> -f_hash = hash_default_key40;
> +f_hash = rte_table_hash_crc_key40;
>  break;
>  case 48:
> -f_hash = hash_default_key48;
> +f_hash = rte_table_hash_crc_key48;
>  break;
>  case 56:
> -f_hash = hash_default_key56;
> +f_hash = rte_table_hash_crc_key56;
>  break;
>  case 64:
> -f_hash = hash_default_key64;
> +f_hash = rte_table_hash_crc_key64;
>  break;
>  default:
>  return -1;
> --
> 2.9.5

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.