Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/110976/?format=api
{ "id": 110976, "url": "http://patches.dpdk.org/api/patches/110976/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220510115824.457885-1-kda@semihalf.com/", "project": { "id": 1, "url": "http://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": "<20220510115824.457885-1-kda@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220510115824.457885-1-kda@semihalf.com", "date": "2022-05-10T11:58:24", "name": "[1/1] lpm: add a scalar version of lookupx4 function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b7fbce6d09ff8801b39c459b85da4011827d6323", "submitter": { "id": 2179, "url": "http://patches.dpdk.org/api/people/2179/?format=api", "name": "Stanislaw Kardach", "email": "kda@semihalf.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220510115824.457885-1-kda@semihalf.com/mbox/", "series": [ { "id": 22868, "url": "http://patches.dpdk.org/api/series/22868/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=22868", "date": "2022-05-10T11:58:24", "name": "[1/1] lpm: add a scalar version of lookupx4 function", "version": 1, "mbox": "http://patches.dpdk.org/series/22868/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/110976/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/110976/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8CD87A0093;\n\tTue, 10 May 2022 13:58:32 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7CF5B4161A;\n\tTue, 10 May 2022 13:58:32 +0200 (CEST)", "from mail-lf1-f52.google.com (mail-lf1-f52.google.com\n [209.85.167.52]) by mails.dpdk.org (Postfix) with ESMTP id 7966B4069D\n for <dev@dpdk.org>; Tue, 10 May 2022 13:58:31 +0200 (CEST)", "by mail-lf1-f52.google.com with SMTP id y32so28857020lfa.6\n for <dev@dpdk.org>; Tue, 10 May 2022 04:58:31 -0700 (PDT)", "from toster.office.semihalf.net ([83.142.187.84])\n by smtp.gmail.com with ESMTPSA id\n v25-20020a05651203b900b0047255d21116sm2275703lfp.69.2022.05.10.04.58.30\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 10 May 2022 04:58:30 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=semihalf-com.20210112.gappssmtp.com; s=20210112;\n h=from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=1Wk+ZuKOXwx5T/3tM1PNn8WP+uxjLyS1Oi4GdwPsNdk=;\n b=CaC19LwCKUamfHtDA2m65wO6+7hWqYc310wE5aAcs4cUag9C2T8TJSj5bPKOel0v8q\n jGJ9xiJ6ugYGC1GtELsJlHbXXOaOR9a+X5GfHLE6nBTLgpAx+35+Vm3BhL+7xxpFGmXq\n /tBRPgE4OnC/QM0rL3slfmqhkTxvrBgZAeCSksThqkwy6J/ET8AEdqWjP8hMrJJRrKDK\n 2JLcwobI92LByTZYsRN754O7qL4w5bvR22Cun2R+PcvwWV3Wpbx4b02FlL2u3VmAQgkw\n e5+kr4iPGS3XeK7vLLppYp2ZTwNxtjKPruHhSB8C+8g07NbUwZGGmE1DVC7ArzOvqBeW\n c5PA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n :content-transfer-encoding;\n bh=1Wk+ZuKOXwx5T/3tM1PNn8WP+uxjLyS1Oi4GdwPsNdk=;\n b=wS2NpNALvl8fQfgB5/vFy6H6ioAUC3M2yXtdHxmAg8fdR1ULmnmMZZcp5dzwqLA0B0\n Qb5KE5tE1aDlwjU8VJuK1vt2z56otdqg3N6NanPm6rDgDTq1PwAB2z/djdIhHllfWWjD\n Ty4yBFL7MiJEsmF1We79bNAcpXy+IJRw59jIY6ughaCsOGHqlqmU6FkQmBedK8Ql5JPy\n C6UTScPAet+W7X6TxdwmKYtfJU0Rcj56BVQC1aMlioUtAveKRy9C8NXYTMoaYCORs1Kx\n kqYTqallyHn88Qcsq34RsZ6eypzdwQp/7sqGccmY2tCSGGhjlo0sI+pUmiRnzohrEtnb\n v9uw==", "X-Gm-Message-State": "AOAM532vBFJ8kEz9R7IqVOeBPdlEMJwBAoAJFnYLJUal+OGEHLKiAcyN\n 9aKEo3sv99uFyM5i9imT2zWyoA==", "X-Google-Smtp-Source": "\n ABdhPJxt0n9gVklj0UC3IacDXGsPg8EXRtgJ+ALsQA5+OTkQjqYuQM1btWz1xFDF9z//gu+eSXx7ZA==", "X-Received": "by 2002:ac2:4d14:0:b0:472:90d:d008 with SMTP id\n r20-20020ac24d14000000b00472090dd008mr16566117lfi.240.1652183911072;\n Tue, 10 May 2022 04:58:31 -0700 (PDT)", "From": "Stanislaw Kardach <kda@semihalf.com>", "To": "Bruce Richardson <bruce.richardson@intel.com>", "Cc": "Michal Mazurek <maz@semihalf.com>, dev@dpdk.org,\n Frank Zhao <Frank.Zhao@starfivetech.com>, Sam Grove <sam.grove@sifive.com>,\n mw@semihalf.com, upstream@semihalf.com,\n Stanislaw Kardach <kda@semihalf.com>", "Subject": "[PATCH 1/1] lpm: add a scalar version of lookupx4 function", "Date": "Tue, 10 May 2022 13:58:24 +0200", "Message-Id": "<20220510115824.457885-1-kda@semihalf.com>", "X-Mailer": "git-send-email 2.30.2", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Michal Mazurek <maz@semihalf.com>\n\nAdd an implementation of the rte_lpm_lookupx4() function for platforms\nwithout support for vector operations.\n\nThis will be useful in the upcoming RISC-V port as well as any platform\nwhich may want to start with a basic level of LPM support.\n\nSigned-off-by: Michal Mazurek <maz@semihalf.com>\nSigned-off-by: Stanislaw Kardach <kda@semihalf.com>\n---\n doc/guides/rel_notes/release_22_07.rst | 5 +\n lib/lpm/meson.build | 1 +\n lib/lpm/rte_lpm.h | 4 +-\n lib/lpm/rte_lpm_scalar.h | 122 +++++++++++++++++++++++++\n 4 files changed, 131 insertions(+), 1 deletion(-)\n create mode 100644 lib/lpm/rte_lpm_scalar.h", "diff": "diff --git a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst\nindex 4ae91dd94d..73e8d632f2 100644\n--- a/doc/guides/rel_notes/release_22_07.rst\n+++ b/doc/guides/rel_notes/release_22_07.rst\n@@ -70,6 +70,11 @@ New Features\n * Added AH mode support in lookaside protocol (IPsec) for CN9K & CN10K.\n * Added AES-GMAC support in lookaside protocol (IPsec) for CN9K & CN10K.\n \n+* **Added scalar version of the LPM library.**\n+\n+ * Added scalar implementation of ``rte_lpm_lookupx4``. This is a fall-back\n+ implementation for platforms that don't support vector operations.\n+\n \n Removed Items\n -------------\ndiff --git a/lib/lpm/meson.build b/lib/lpm/meson.build\nindex 78d91d3421..6b47361fce 100644\n--- a/lib/lpm/meson.build\n+++ b/lib/lpm/meson.build\n@@ -14,6 +14,7 @@ headers = files('rte_lpm.h', 'rte_lpm6.h')\n indirect_headers += files(\n 'rte_lpm_altivec.h',\n 'rte_lpm_neon.h',\n+ 'rte_lpm_scalar.h',\n 'rte_lpm_sse.h',\n 'rte_lpm_sve.h',\n )\ndiff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h\nindex eb91960e81..b5db6a353a 100644\n--- a/lib/lpm/rte_lpm.h\n+++ b/lib/lpm/rte_lpm.h\n@@ -405,8 +405,10 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4],\n #endif\n #elif defined(RTE_ARCH_PPC_64)\n #include \"rte_lpm_altivec.h\"\n-#else\n+#elif defined(RTE_ARCH_X86)\n #include \"rte_lpm_sse.h\"\n+#else\n+#include \"rte_lpm_scalar.h\"\n #endif\n \n #ifdef __cplusplus\ndiff --git a/lib/lpm/rte_lpm_scalar.h b/lib/lpm/rte_lpm_scalar.h\nnew file mode 100644\nindex 0000000000..991b94e687\n--- /dev/null\n+++ b/lib/lpm/rte_lpm_scalar.h\n@@ -0,0 +1,122 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2022 StarFive\n+ * Copyright(c) 2022 SiFive\n+ * Copyright(c) 2022 Semihalf\n+ */\n+\n+#ifndef _RTE_LPM_SCALAR_H_\n+#define _RTE_LPM_SCALAR_H_\n+\n+#include <rte_branch_prediction.h>\n+#include <rte_byteorder.h>\n+#include <rte_common.h>\n+#include <rte_vect.h>\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+static inline void\n+rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4],\n+\t\tuint32_t defv)\n+{\n+\trte_xmm_t i24;\n+\trte_xmm_t i8;\n+\tuint32_t tbl[4];\n+\tuint64_t pt, pt2;\n+\tconst uint32_t *ptbl;\n+\n+\tconst rte_xmm_t mask8 = {\n+\t\t.u32 = {UINT8_MAX, UINT8_MAX, UINT8_MAX, UINT8_MAX}};\n+\n+\t/*\n+\t * RTE_LPM_VALID_EXT_ENTRY_BITMASK for 2 LPM entries\n+\t * as one 64-bit value (0x0300000003000000).\n+\t */\n+\tconst uint64_t mask_xv =\n+\t\t((uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK |\n+\t\t(uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 32);\n+\n+\t/*\n+\t * RTE_LPM_LOOKUP_SUCCESS for 2 LPM entries\n+\t * as one 64-bit value (0x0100000001000000).\n+\t */\n+\tconst uint64_t mask_v =\n+\t\t((uint64_t)RTE_LPM_LOOKUP_SUCCESS |\n+\t\t(uint64_t)RTE_LPM_LOOKUP_SUCCESS << 32);\n+\n+\t/* get 4 indexes for tbl24[]. */\n+\ti24.x = ip;\n+\ti24.u32[0] >>= CHAR_BIT;\n+\ti24.u32[1] >>= CHAR_BIT;\n+\ti24.u32[2] >>= CHAR_BIT;\n+\ti24.u32[3] >>= CHAR_BIT;\n+\n+\t/* extract values from tbl24[] */\n+\tptbl = (const uint32_t *)&lpm->tbl24[i24.u32[0]];\n+\ttbl[0] = *ptbl;\n+\tptbl = (const uint32_t *)&lpm->tbl24[i24.u32[1]];\n+\ttbl[1] = *ptbl;\n+\tptbl = (const uint32_t *)&lpm->tbl24[i24.u32[2]];\n+\ttbl[2] = *ptbl;\n+\tptbl = (const uint32_t *)&lpm->tbl24[i24.u32[3]];\n+\ttbl[3] = *ptbl;\n+\n+\t/* get 4 indexes for tbl8[]. */\n+\ti8.x = ip;\n+\ti8.u64[0] &= mask8.u64[0];\n+\ti8.u64[1] &= mask8.u64[1];\n+\n+\tpt = (uint64_t)tbl[0] |\n+\t\t(uint64_t)tbl[1] << 32;\n+\tpt2 = (uint64_t)tbl[2] |\n+\t\t(uint64_t)tbl[3] << 32;\n+\n+\t/* search successfully finished for all 4 IP addresses. */\n+\tif (likely((pt & mask_xv) == mask_v) &&\n+\t\t\tlikely((pt2 & mask_xv) == mask_v)) {\n+\t\t*(uint64_t *)hop = pt & RTE_LPM_MASKX4_RES;\n+\t\t*(uint64_t *)(hop + 2) = pt2 & RTE_LPM_MASKX4_RES;\n+\t\treturn;\n+\t}\n+\n+\tif (unlikely((pt & RTE_LPM_VALID_EXT_ENTRY_BITMASK) ==\n+\t\t\tRTE_LPM_VALID_EXT_ENTRY_BITMASK)) {\n+\t\ti8.u32[0] = i8.u32[0] +\n+\t\t\t(tbl[0] & 0x00FFFFFF) * RTE_LPM_TBL8_GROUP_NUM_ENTRIES;\n+\t\tptbl = (const uint32_t *)&lpm->tbl8[i8.u32[0]];\n+\t\ttbl[0] = *ptbl;\n+\t}\n+\tif (unlikely((pt >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) ==\n+\t\t\tRTE_LPM_VALID_EXT_ENTRY_BITMASK)) {\n+\t\ti8.u32[1] = i8.u32[1] +\n+\t\t\t(tbl[1] & 0x00FFFFFF) * RTE_LPM_TBL8_GROUP_NUM_ENTRIES;\n+\t\tptbl = (const uint32_t *)&lpm->tbl8[i8.u32[1]];\n+\t\ttbl[1] = *ptbl;\n+\t}\n+\tif (unlikely((pt2 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) ==\n+\t\t\tRTE_LPM_VALID_EXT_ENTRY_BITMASK)) {\n+\t\ti8.u32[2] = i8.u32[2] +\n+\t\t\t(tbl[2] & 0x00FFFFFF) * RTE_LPM_TBL8_GROUP_NUM_ENTRIES;\n+\t\tptbl = (const uint32_t *)&lpm->tbl8[i8.u32[2]];\n+\t\ttbl[2] = *ptbl;\n+\t}\n+\tif (unlikely((pt2 >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) ==\n+\t\t\tRTE_LPM_VALID_EXT_ENTRY_BITMASK)) {\n+\t\ti8.u32[3] = i8.u32[3] +\n+\t\t\t(tbl[3] & 0x00FFFFFF) * RTE_LPM_TBL8_GROUP_NUM_ENTRIES;\n+\t\tptbl = (const uint32_t *)&lpm->tbl8[i8.u32[3]];\n+\t\ttbl[3] = *ptbl;\n+\t}\n+\n+\thop[0] = (tbl[0] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[0] & 0x00FFFFFF : defv;\n+\thop[1] = (tbl[1] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[1] & 0x00FFFFFF : defv;\n+\thop[2] = (tbl[2] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[2] & 0x00FFFFFF : defv;\n+\thop[3] = (tbl[3] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[3] & 0x00FFFFFF : defv;\n+}\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* _RTE_LPM_SCALAR_H_ */\n", "prefixes": [ "1/1" ] }