Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/45335/?format=api
{ "id": 45335, "url": "https://patches.dpdk.org/api/patches/45335/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180925153230.72096-3-kevin.laatz@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180925153230.72096-3-kevin.laatz@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180925153230.72096-3-kevin.laatz@intel.com", "date": "2018-09-25T15:32:30", "name": "[v4,3/3] net/softnic: modify to use new table lib headers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2b4322f0158bca0d17425bd9301067d62d958ad7", "submitter": { "id": 921, "url": "https://patches.dpdk.org/api/people/921/?format=api", "name": "Kevin Laatz", "email": "kevin.laatz@intel.com" }, "delegate": { "id": 10018, "url": "https://patches.dpdk.org/api/users/10018/?format=api", "username": "cristian_dumitrescu", "first_name": "Cristian", "last_name": "Dumitrescu", "email": "cristian.dumitrescu@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180925153230.72096-3-kevin.laatz@intel.com/mbox/", "series": [ { "id": 1500, "url": "https://patches.dpdk.org/api/series/1500/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1500", "date": "2018-09-25T15:32:29", "name": "[v4,1/3] lib/librte_table: add hash func header files", "version": 4, "mbox": "https://patches.dpdk.org/series/1500/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/45335/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/45335/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 198331B445;\n\tTue, 25 Sep 2018 17:34:41 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby dpdk.org (Postfix) with ESMTP id 698FF5F25\n\tfor <dev@dpdk.org>; Tue, 25 Sep 2018 17:34:37 +0200 (CEST)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Sep 2018 08:34:36 -0700", "from silpixa00397517.ir.intel.com (HELO\n\tsilpixa00397517.ger.corp.intel.com) ([10.237.222.54])\n\tby orsmga004.jf.intel.com with ESMTP; 25 Sep 2018 08:32:38 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.54,302,1534834800\"; d=\"scan'208\";a=\"235804451\"", "From": "Kevin Laatz <kevin.laatz@intel.com>", "To": "dev@dpdk.org", "Cc": "jianbo.liu@arm.com, gavin.hu@arm.com, jerin.jacob@caviumnetworks.com,\n\tcristian.dumitrescu@intel.com, Kevin Laatz <kevin.laatz@intel.com>", "Date": "Tue, 25 Sep 2018 16:32:30 +0100", "Message-Id": "<20180925153230.72096-3-kevin.laatz@intel.com>", "X-Mailer": "git-send-email 2.9.5", "In-Reply-To": "<20180925153230.72096-1-kevin.laatz@intel.com>", "References": "<20180907100626.8165-1-kevin.laatz@intel.com>\n\t<20180925153230.72096-1-kevin.laatz@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 3/3] net/softnic: modify to use new table lib\n\theaders", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This commit modifies SoftNIC to make use of the new header files in\nlibrte_table.\n\nAs we are now using the new header files in librte_table in SoftNIC, we no\nlonger need the old header files so they can be removed.\n\nSigned-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>\nSigned-off-by: Kevin Laatz <kevin.laatz@intel.com>\nAcked-by: Gavin Hu <gavin.hu@arm.com>\n---\n drivers/net/softnic/hash_func.h | 359 -------------------------\n drivers/net/softnic/hash_func_arm64.h | 261 ------------------\n drivers/net/softnic/rte_eth_softnic_action.c | 34 +--\n drivers/net/softnic/rte_eth_softnic_pipeline.c | 19 +-\n 4 files changed, 26 insertions(+), 647 deletions(-)\n delete mode 100644 drivers/net/softnic/hash_func.h\n delete mode 100644 drivers/net/softnic/hash_func_arm64.h", "diff": "diff --git a/drivers/net/softnic/hash_func.h b/drivers/net/softnic/hash_func.h\ndeleted file mode 100644\nindex 198d2b2..0000000\n--- a/drivers/net/softnic/hash_func.h\n+++ /dev/null\n@@ -1,359 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2010-2018 Intel Corporation\n- */\n-\n-#ifndef __INCLUDE_HASH_FUNC_H__\n-#define __INCLUDE_HASH_FUNC_H__\n-\n-#include <rte_common.h>\n-\n-static inline uint64_t\n-hash_xor_key8(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0;\n-\n-\txor0 = seed ^ (k[0] & m[0]);\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key16(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key24(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\n-\txor0 ^= k[2] & m[2];\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key32(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0, xor1;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\txor1 = (k[2] & m[2]) ^ (k[3] & m[3]);\n-\n-\txor0 ^= xor1;\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key40(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0, xor1;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\txor1 = (k[2] & m[2]) ^ (k[3] & m[3]);\n-\n-\txor0 ^= xor1;\n-\n-\txor0 ^= k[4] & m[4];\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key48(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0, xor1, xor2;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\txor1 = (k[2] & m[2]) ^ (k[3] & m[3]);\n-\txor2 = (k[4] & m[4]) ^ (k[5] & m[5]);\n-\n-\txor0 ^= xor1;\n-\n-\txor0 ^= xor2;\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key56(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0, xor1, xor2;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\txor1 = (k[2] & m[2]) ^ (k[3] & m[3]);\n-\txor2 = (k[4] & m[4]) ^ (k[5] & m[5]);\n-\n-\txor0 ^= xor1;\n-\txor2 ^= k[6] & m[6];\n-\n-\txor0 ^= xor2;\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-static inline uint64_t\n-hash_xor_key64(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t xor0, xor1, xor2, xor3;\n-\n-\txor0 = ((k[0] & m[0]) ^ seed) ^ (k[1] & m[1]);\n-\txor1 = (k[2] & m[2]) ^ (k[3] & m[3]);\n-\txor2 = (k[4] & m[4]) ^ (k[5] & m[5]);\n-\txor3 = (k[6] & m[6]) ^ (k[7] & m[7]);\n-\n-\txor0 ^= xor1;\n-\txor2 ^= xor3;\n-\n-\txor0 ^= xor2;\n-\n-\treturn (xor0 >> 32) ^ xor0;\n-}\n-\n-#if defined(RTE_ARCH_X86_64)\n-\n-#include <x86intrin.h>\n-\n-static inline uint64_t\n-hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t crc0;\n-\n-\tcrc0 = _mm_crc32_u64(seed, k[0] & m[0]);\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, crc0, crc1;\n-\n-\tk0 = k[0] & m[0];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, crc0, crc1;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc0 = _mm_crc32_u64(crc0, k2);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc2 = _mm_crc32_u64(k2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\n-\tcrc0 = _mm_crc32_u64(crc0, crc1);\n-\tcrc1 = _mm_crc32_u64(crc2, crc3);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc2 = _mm_crc32_u64(k2, k[3] & m[3]);\n-\tcrc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);\n-\n-\tcrc0 = _mm_crc32_u64(crc0, crc1);\n-\tcrc1 = _mm_crc32_u64(crc2, crc3);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, k5, crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc2 = _mm_crc32_u64(k2, k[3] & m[3]);\n-\tcrc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);\n-\n-\tcrc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);\n-\tcrc1 = _mm_crc32_u64(crc3, k5);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc2 = _mm_crc32_u64(k2, k[3] & m[3]);\n-\tcrc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);\n-\n-\tcrc4 = _mm_crc32_u64(k5, k[6] & m[6]);\n-\tcrc5 = k5 >> 32;\n-\n-\tcrc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);\n-\tcrc1 = _mm_crc32_u64(crc3, (crc4 << 32) ^ crc5);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint64_t k0, k2, k5, crc0, crc1, crc2, crc3, crc4, crc5;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = _mm_crc32_u64(k0, seed);\n-\tcrc1 = _mm_crc32_u64(k0 >> 32, k[1] & m[1]);\n-\n-\tcrc2 = _mm_crc32_u64(k2, k[3] & m[3]);\n-\tcrc3 = _mm_crc32_u64(k2 >> 32, k[4] & m[4]);\n-\n-\tcrc4 = _mm_crc32_u64(k5, k[6] & m[6]);\n-\tcrc5 = _mm_crc32_u64(k5 >> 32, k[7] & m[7]);\n-\n-\tcrc0 = _mm_crc32_u64(crc0, (crc1 << 32) ^ crc2);\n-\tcrc1 = _mm_crc32_u64(crc3, (crc4 << 32) ^ crc5);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-#define hash_default_key8\t\t\thash_crc_key8\n-#define hash_default_key16\t\t\thash_crc_key16\n-#define hash_default_key24\t\t\thash_crc_key24\n-#define hash_default_key32\t\t\thash_crc_key32\n-#define hash_default_key40\t\t\thash_crc_key40\n-#define hash_default_key48\t\t\thash_crc_key48\n-#define hash_default_key56\t\t\thash_crc_key56\n-#define hash_default_key64\t\t\thash_crc_key64\n-\n-#elif defined(RTE_ARCH_ARM64)\n-#include \"hash_func_arm64.h\"\n-#else\n-\n-#define hash_default_key8\t\t\thash_xor_key8\n-#define hash_default_key16\t\t\thash_xor_key16\n-#define hash_default_key24\t\t\thash_xor_key24\n-#define hash_default_key32\t\t\thash_xor_key32\n-#define hash_default_key40\t\t\thash_xor_key40\n-#define hash_default_key48\t\t\thash_xor_key48\n-#define hash_default_key56\t\t\thash_xor_key56\n-#define hash_default_key64\t\t\thash_xor_key64\n-\n-#endif\n-\n-#endif\ndiff --git a/drivers/net/softnic/hash_func_arm64.h b/drivers/net/softnic/hash_func_arm64.h\ndeleted file mode 100644\nindex ae6c0f4..0000000\n--- a/drivers/net/softnic/hash_func_arm64.h\n+++ /dev/null\n@@ -1,261 +0,0 @@\n-/*-\n- * BSD LICENSE\n- *\n- * Copyright(c) 2017 Linaro Limited. All rights reserved.\n- * All rights reserved.\n- *\n- * Redistribution and use in source and binary forms, with or without\n- * modification, are permitted provided that the following conditions\n- * are met:\n- *\n- * * Redistributions of source code must retain the above copyright\n- * notice, this list of conditions and the following disclaimer.\n- * * Redistributions in binary form must reproduce the above copyright\n- * notice, this list of conditions and the following disclaimer in\n- * the documentation and/or other materials provided with the\n- * distribution.\n- * * Neither the name of Intel Corporation nor the names of its\n- * contributors may be used to endorse or promote products derived\n- * from this software without specific prior written permission.\n- *\n- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n- * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n- */\n-#ifndef __HASH_FUNC_ARM64_H__\n-#define __HASH_FUNC_ARM64_H__\n-\n-#define _CRC32CX(crc, val)\t\\\n-\t__asm__(\"crc32cx %w[c], %w[c], %x[v]\":[c] \"+r\" (crc):[v] \"r\" (val))\n-\n-static inline uint64_t\n-hash_crc_key8(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0;\n-\n-\tcrc0 = seed;\n-\t_CRC32CX(crc0, k[0] & m[0]);\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key16(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1;\n-\n-\tk0 = k[0] & m[0];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key24(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\t_CRC32CX(crc0, k2);\n-\n-\tcrc0 ^= crc1;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key32(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc2 = k2;\n-\t_CRC32CX(crc2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\n-\t_CRC32CX(crc0, crc1);\n-\t_CRC32CX(crc2, crc3);\n-\n-\tcrc0 ^= crc2;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key40(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc2 = k2;\n-\t_CRC32CX(crc2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\t_CRC32CX(crc3, k[4] & m[4]);\n-\n-\t_CRC32CX(crc0, crc1);\n-\t_CRC32CX(crc2, crc3);\n-\n-\tcrc0 ^= crc2;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key48(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2, k5;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1, crc2, crc3;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc2 = k2;\n-\t_CRC32CX(crc2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\t_CRC32CX(crc3, k[4] & m[4]);\n-\n-\t_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);\n-\t_CRC32CX(crc3, k5);\n-\n-\tcrc0 ^= crc3;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key56(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2, k5;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1, crc2, crc3, crc4, crc5;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc2 = k2;\n-\t_CRC32CX(crc2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\t_CRC32CX(crc3, k[4] & m[4]);\n-\n-\tcrc4 = k5;\n-\t _CRC32CX(crc4, k[6] & m[6]);\n-\tcrc5 = k5 >> 32;\n-\n-\t_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);\n-\t_CRC32CX(crc3, ((uint64_t)crc4 << 32) ^ crc5);\n-\n-\tcrc0 ^= crc3;\n-\n-\treturn crc0;\n-}\n-\n-static inline uint64_t\n-hash_crc_key64(void *key, void *mask, __rte_unused uint32_t key_size,\n-\tuint64_t seed)\n-{\n-\tuint64_t *k = key, k0, k2, k5;\n-\tuint64_t *m = mask;\n-\tuint32_t crc0, crc1, crc2, crc3, crc4, crc5;\n-\n-\tk0 = k[0] & m[0];\n-\tk2 = k[2] & m[2];\n-\tk5 = k[5] & m[5];\n-\n-\tcrc0 = k0;\n-\t_CRC32CX(crc0, seed);\n-\tcrc1 = k0 >> 32;\n-\t_CRC32CX(crc1, k[1] & m[1]);\n-\n-\tcrc2 = k2;\n-\t_CRC32CX(crc2, k[3] & m[3]);\n-\tcrc3 = k2 >> 32;\n-\t_CRC32CX(crc3, k[4] & m[4]);\n-\n-\tcrc4 = k5;\n-\t _CRC32CX(crc4, k[6] & m[6]);\n-\tcrc5 = k5 >> 32;\n-\t_CRC32CX(crc5, k[7] & m[7]);\n-\n-\t_CRC32CX(crc0, ((uint64_t)crc1 << 32) ^ crc2);\n-\t_CRC32CX(crc3, ((uint64_t)crc4 << 32) ^ crc5);\n-\n-\tcrc0 ^= crc3;\n-\n-\treturn crc0;\n-}\n-\n-#define hash_default_key8\t\t\thash_crc_key8\n-#define hash_default_key16\t\t\thash_crc_key16\n-#define hash_default_key24\t\t\thash_crc_key24\n-#define hash_default_key32\t\t\thash_crc_key32\n-#define hash_default_key40\t\t\thash_crc_key40\n-#define hash_default_key48\t\t\thash_crc_key48\n-#define hash_default_key56\t\t\thash_crc_key56\n-#define hash_default_key64\t\t\thash_crc_key64\n-\n-#endif\ndiff --git a/drivers/net/softnic/rte_eth_softnic_action.c b/drivers/net/softnic/rte_eth_softnic_action.c\nindex c25f4dd..c542688 100644\n--- a/drivers/net/softnic/rte_eth_softnic_action.c\n+++ b/drivers/net/softnic/rte_eth_softnic_action.c\n@@ -7,8 +7,8 @@\n #include <string.h>\n \n #include <rte_string_fns.h>\n+#include <rte_table_hash_func.h>\n \n-#include \"hash_func.h\"\n #include \"rte_eth_softnic_internals.h\"\n \n /**\n@@ -72,35 +72,35 @@ softnic_port_in_action_profile_create(struct pmd_internals *p,\n \t\tparams->lb.f_hash == NULL) {\n \t\tswitch (params->lb.key_size) {\n \t\tcase 8:\n-\t\t\tparams->lb.f_hash = hash_default_key8;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key8;\n \t\t\tbreak;\n \n \t\tcase 16:\n-\t\t\tparams->lb.f_hash = hash_default_key16;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key16;\n \t\t\tbreak;\n \n \t\tcase 24:\n-\t\t\tparams->lb.f_hash = hash_default_key24;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key24;\n \t\t\tbreak;\n \n \t\tcase 32:\n-\t\t\tparams->lb.f_hash = hash_default_key32;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key32;\n \t\t\tbreak;\n \n \t\tcase 40:\n-\t\t\tparams->lb.f_hash = hash_default_key40;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key40;\n \t\t\tbreak;\n \n \t\tcase 48:\n-\t\t\tparams->lb.f_hash = hash_default_key48;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key48;\n \t\t\tbreak;\n \n \t\tcase 56:\n-\t\t\tparams->lb.f_hash = hash_default_key56;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key56;\n \t\t\tbreak;\n \n \t\tcase 64:\n-\t\t\tparams->lb.f_hash = hash_default_key64;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key64;\n \t\t\tbreak;\n \n \t\tdefault:\n@@ -223,35 +223,35 @@ softnic_table_action_profile_create(struct pmd_internals *p,\n \t\tparams->lb.f_hash == NULL) {\n \t\tswitch (params->lb.key_size) {\n \t\tcase 8:\n-\t\t\tparams->lb.f_hash = hash_default_key8;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key8;\n \t\t\tbreak;\n \n \t\tcase 16:\n-\t\t\tparams->lb.f_hash = hash_default_key16;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key16;\n \t\t\tbreak;\n \n \t\tcase 24:\n-\t\t\tparams->lb.f_hash = hash_default_key24;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key24;\n \t\t\tbreak;\n \n \t\tcase 32:\n-\t\t\tparams->lb.f_hash = hash_default_key32;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key32;\n \t\t\tbreak;\n \n \t\tcase 40:\n-\t\t\tparams->lb.f_hash = hash_default_key40;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key40;\n \t\t\tbreak;\n \n \t\tcase 48:\n-\t\t\tparams->lb.f_hash = hash_default_key48;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key48;\n \t\t\tbreak;\n \n \t\tcase 56:\n-\t\t\tparams->lb.f_hash = hash_default_key56;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key56;\n \t\t\tbreak;\n \n \t\tcase 64:\n-\t\t\tparams->lb.f_hash = hash_default_key64;\n+\t\t\tparams->lb.f_hash = rte_table_hash_crc_key64;\n \t\t\tbreak;\n \n \t\tdefault:\ndiff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c\nindex 45136a4..0aababe 100644\n--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c\n+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c\n@@ -19,14 +19,13 @@\n #include <rte_table_acl.h>\n #include <rte_table_array.h>\n #include <rte_table_hash.h>\n+#include <rte_table_hash_func.h>\n #include <rte_table_lpm.h>\n #include <rte_table_lpm_ipv6.h>\n #include <rte_table_stub.h>\n \n #include \"rte_eth_softnic_internals.h\"\n \n-#include \"hash_func.h\"\n-\n #ifndef PIPELINE_MSGQ_SIZE\n #define PIPELINE_MSGQ_SIZE 64\n #endif\n@@ -797,28 +796,28 @@ softnic_pipeline_table_create(struct pmd_internals *softnic,\n \n \t\tswitch (params->match.hash.key_size) {\n \t\tcase 8:\n-\t\t\tf_hash = hash_default_key8;\n+\t\t\tf_hash = rte_table_hash_crc_key8;\n \t\t\tbreak;\n \t\tcase 16:\n-\t\t\tf_hash = hash_default_key16;\n+\t\t\tf_hash = rte_table_hash_crc_key16;\n \t\t\tbreak;\n \t\tcase 24:\n-\t\t\tf_hash = hash_default_key24;\n+\t\t\tf_hash = rte_table_hash_crc_key24;\n \t\t\tbreak;\n \t\tcase 32:\n-\t\t\tf_hash = hash_default_key32;\n+\t\t\tf_hash = rte_table_hash_crc_key32;\n \t\t\tbreak;\n \t\tcase 40:\n-\t\t\tf_hash = hash_default_key40;\n+\t\t\tf_hash = rte_table_hash_crc_key40;\n \t\t\tbreak;\n \t\tcase 48:\n-\t\t\tf_hash = hash_default_key48;\n+\t\t\tf_hash = rte_table_hash_crc_key48;\n \t\t\tbreak;\n \t\tcase 56:\n-\t\t\tf_hash = hash_default_key56;\n+\t\t\tf_hash = rte_table_hash_crc_key56;\n \t\t\tbreak;\n \t\tcase 64:\n-\t\t\tf_hash = hash_default_key64;\n+\t\t\tf_hash = rte_table_hash_crc_key64;\n \t\t\tbreak;\n \t\tdefault:\n \t\t\treturn -1;\n", "prefixes": [ "v4", "3/3" ] }