Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/79909/?format=api
{ "id": 79909, "url": "http://patches.dpdk.org/api/patches/79909/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d37fece37066070712873318b4d513978721bc75.1602086562.git.vladimir.medvedkin@intel.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": "<d37fece37066070712873318b4d513978721bc75.1602086562.git.vladimir.medvedkin@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d37fece37066070712873318b4d513978721bc75.1602086562.git.vladimir.medvedkin@intel.com", "date": "2020-10-07T16:10:36", "name": "[v9,2/8] fib: make lookup function type configurable", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8a4aefe669bf75d981ffbe273002e67156ef2e2b", "submitter": { "id": 1216, "url": "http://patches.dpdk.org/api/people/1216/?format=api", "name": "Vladimir Medvedkin", "email": "vladimir.medvedkin@intel.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/d37fece37066070712873318b4d513978721bc75.1602086562.git.vladimir.medvedkin@intel.com/mbox/", "series": [ { "id": 12758, "url": "http://patches.dpdk.org/api/series/12758/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12758", "date": "2020-10-07T16:10:34", "name": "fib: implement AVX512 vector lookup", "version": 9, "mbox": "http://patches.dpdk.org/series/12758/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/79909/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/79909/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7C436A04BA;\n\tWed, 7 Oct 2020 18:11:39 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 484111BD17;\n\tWed, 7 Oct 2020 18:10:55 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by dpdk.org (Postfix) with ESMTP id A93C61BB47\n for <dev@dpdk.org>; Wed, 7 Oct 2020 18:10:51 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 Oct 2020 09:10:50 -0700", "from silpixa00400072.ir.intel.com ([10.237.222.213])\n by fmsmga004.fm.intel.com with ESMTP; 07 Oct 2020 09:10:48 -0700" ], "IronPort-SDR": [ "\n ixCMIGhnESs5msWScDdSLtQXeAqtoqTNofe7Qq9GFCzh2NBCeK6PwcZXr6PIqxZ72+VFAjm4sh\n WqYWl2YrxgcA==", "\n yuyrqCUXOBm0bLNpkgMFvmjIbP1hppeIJSfLLJsZmi3+6bUOVf3A4M+nN8fe9R9kGVBVJnWVh6\n iJA6mS6wb3AA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9767\"; a=\"162384083\"", "E=Sophos;i=\"5.77,347,1596524400\"; d=\"scan'208\";a=\"162384083\"", "E=Sophos;i=\"5.77,347,1596524400\"; d=\"scan'208\";a=\"342953009\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Vladimir Medvedkin <vladimir.medvedkin@intel.com>", "To": "dev@dpdk.org", "Cc": "david.marchand@redhat.com, jerinj@marvell.com, mdr@ashroe.eu,\n thomas@monjalon.net, konstantin.ananyev@intel.com,\n bruce.richardson@intel.com, ciara.power@intel.com", "Date": "Wed, 7 Oct 2020 17:10:36 +0100", "Message-Id": "\n <d37fece37066070712873318b4d513978721bc75.1602086562.git.vladimir.medvedkin@intel.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": [ "<cover.1602086562.git.vladimir.medvedkin@intel.com>", "<cover.1602086562.git.vladimir.medvedkin@intel.com>" ], "References": [ "<cover.1602086562.git.vladimir.medvedkin@intel.com>", "<cover.1601461541.git.vladimir.medvedkin@intel.com>\n <cover.1602086562.git.vladimir.medvedkin@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v9 2/8] fib: make lookup function type\n\tconfigurable", "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 <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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add type argument to dir24_8_get_lookup_fn()\nNow it supports 3 different lookup implementations:\n RTE_FIB_DIR24_8_SCALAR_MACRO\n RTE_FIB_DIR24_8_SCALAR_INLINE\n RTE_FIB_DIR24_8_SCALAR_UNI\n\nAdd new rte_fib_set_lookup_fn() - user can change lookup\nfunction type runtime.\n\nSigned-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>\nAcked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n lib/librte_fib/dir24_8.c | 84 +++++++++++++++++++++++---------------\n lib/librte_fib/dir24_8.h | 2 +-\n lib/librte_fib/rte_fib.c | 21 +++++++++-\n lib/librte_fib/rte_fib.h | 24 +++++++++++\n lib/librte_fib/rte_fib_version.map | 1 +\n 5 files changed, 98 insertions(+), 34 deletions(-)", "diff": "diff --git a/lib/librte_fib/dir24_8.c b/lib/librte_fib/dir24_8.c\nindex c9dce3c..ff51f65 100644\n--- a/lib/librte_fib/dir24_8.c\n+++ b/lib/librte_fib/dir24_8.c\n@@ -45,13 +45,6 @@ struct dir24_8_tbl {\n \n #define ROUNDUP(x, y)\t RTE_ALIGN_CEIL(x, (1 << (32 - y)))\n \n-enum lookup_type {\n-\tMACRO,\n-\tINLINE,\n-\tUNI\n-};\n-enum lookup_type test_lookup = MACRO;\n-\n static inline void *\n get_tbl24_p(struct dir24_8_tbl *dp, uint32_t ip, uint8_t nh_sz)\n {\n@@ -252,35 +245,62 @@ dir24_8_lookup_bulk_uni(void *p, const uint32_t *ips,\n \t}\n }\n \n+static inline rte_fib_lookup_fn_t\n+get_scalar_fn(enum rte_fib_dir24_8_nh_sz nh_sz)\n+{\n+\tswitch (nh_sz) {\n+\tcase RTE_FIB_DIR24_8_1B:\n+\t\treturn dir24_8_lookup_bulk_1b;\n+\tcase RTE_FIB_DIR24_8_2B:\n+\t\treturn dir24_8_lookup_bulk_2b;\n+\tcase RTE_FIB_DIR24_8_4B:\n+\t\treturn dir24_8_lookup_bulk_4b;\n+\tcase RTE_FIB_DIR24_8_8B:\n+\t\treturn dir24_8_lookup_bulk_8b;\n+\tdefault:\n+\t\treturn NULL;\n+\t}\n+}\n+\n+static inline rte_fib_lookup_fn_t\n+get_scalar_fn_inlined(enum rte_fib_dir24_8_nh_sz nh_sz)\n+{\n+\tswitch (nh_sz) {\n+\tcase RTE_FIB_DIR24_8_1B:\n+\t\treturn dir24_8_lookup_bulk_0;\n+\tcase RTE_FIB_DIR24_8_2B:\n+\t\treturn dir24_8_lookup_bulk_1;\n+\tcase RTE_FIB_DIR24_8_4B:\n+\t\treturn dir24_8_lookup_bulk_2;\n+\tcase RTE_FIB_DIR24_8_8B:\n+\t\treturn dir24_8_lookup_bulk_3;\n+\tdefault:\n+\t\treturn NULL;\n+\t}\n+}\n+\n rte_fib_lookup_fn_t\n-dir24_8_get_lookup_fn(struct rte_fib_conf *fib_conf)\n+dir24_8_get_lookup_fn(void *p, enum rte_fib_dir24_8_lookup_type type)\n {\n-\tenum rte_fib_dir24_8_nh_sz nh_sz = fib_conf->dir24_8.nh_sz;\n+\tenum rte_fib_dir24_8_nh_sz nh_sz;\n+\tstruct dir24_8_tbl *dp = p;\n \n-\tif (test_lookup == MACRO) {\n-\t\tswitch (nh_sz) {\n-\t\tcase RTE_FIB_DIR24_8_1B:\n-\t\t\treturn dir24_8_lookup_bulk_1b;\n-\t\tcase RTE_FIB_DIR24_8_2B:\n-\t\t\treturn dir24_8_lookup_bulk_2b;\n-\t\tcase RTE_FIB_DIR24_8_4B:\n-\t\t\treturn dir24_8_lookup_bulk_4b;\n-\t\tcase RTE_FIB_DIR24_8_8B:\n-\t\t\treturn dir24_8_lookup_bulk_8b;\n-\t\t}\n-\t} else if (test_lookup == INLINE) {\n-\t\tswitch (nh_sz) {\n-\t\tcase RTE_FIB_DIR24_8_1B:\n-\t\t\treturn dir24_8_lookup_bulk_0;\n-\t\tcase RTE_FIB_DIR24_8_2B:\n-\t\t\treturn dir24_8_lookup_bulk_1;\n-\t\tcase RTE_FIB_DIR24_8_4B:\n-\t\t\treturn dir24_8_lookup_bulk_2;\n-\t\tcase RTE_FIB_DIR24_8_8B:\n-\t\t\treturn dir24_8_lookup_bulk_3;\n-\t\t}\n-\t} else\n+\tif (dp == NULL)\n+\t\treturn NULL;\n+\n+\tnh_sz = dp->nh_sz;\n+\n+\tswitch (type) {\n+\tcase RTE_FIB_DIR24_8_SCALAR_MACRO:\n+\t\treturn get_scalar_fn(nh_sz);\n+\tcase RTE_FIB_DIR24_8_SCALAR_INLINE:\n+\t\treturn get_scalar_fn_inlined(nh_sz);\n+\tcase RTE_FIB_DIR24_8_SCALAR_UNI:\n \t\treturn dir24_8_lookup_bulk_uni;\n+\tdefault:\n+\t\treturn NULL;\n+\t}\n+\n \treturn NULL;\n }\n \ndiff --git a/lib/librte_fib/dir24_8.h b/lib/librte_fib/dir24_8.h\nindex 1ec437c..53c5dd2 100644\n--- a/lib/librte_fib/dir24_8.h\n+++ b/lib/librte_fib/dir24_8.h\n@@ -22,7 +22,7 @@ void\n dir24_8_free(void *p);\n \n rte_fib_lookup_fn_t\n-dir24_8_get_lookup_fn(struct rte_fib_conf *conf);\n+dir24_8_get_lookup_fn(void *p, enum rte_fib_dir24_8_lookup_type type);\n \n int\n dir24_8_modify(struct rte_fib *fib, uint32_t ip, uint8_t depth,\ndiff --git a/lib/librte_fib/rte_fib.c b/lib/librte_fib/rte_fib.c\nindex e090808..b9f6efb 100644\n--- a/lib/librte_fib/rte_fib.c\n+++ b/lib/librte_fib/rte_fib.c\n@@ -107,7 +107,8 @@ init_dataplane(struct rte_fib *fib, __rte_unused int socket_id,\n \t\tfib->dp = dir24_8_create(dp_name, socket_id, conf);\n \t\tif (fib->dp == NULL)\n \t\t\treturn -rte_errno;\n-\t\tfib->lookup = dir24_8_get_lookup_fn(conf);\n+\t\tfib->lookup = dir24_8_get_lookup_fn(fib->dp,\n+\t\t\tRTE_FIB_DIR24_8_SCALAR_MACRO);\n \t\tfib->modify = dir24_8_modify;\n \t\treturn 0;\n \tdefault:\n@@ -317,3 +318,21 @@ rte_fib_get_rib(struct rte_fib *fib)\n {\n \treturn (fib == NULL) ? NULL : fib->rib;\n }\n+\n+int\n+rte_fib_set_lookup_fn(struct rte_fib *fib,\n+\tenum rte_fib_dir24_8_lookup_type type)\n+{\n+\trte_fib_lookup_fn_t fn;\n+\n+\tswitch (fib->type) {\n+\tcase RTE_FIB_DIR24_8:\n+\t\tfn = dir24_8_get_lookup_fn(fib->dp, type);\n+\t\tif (fn == NULL)\n+\t\t\treturn -EINVAL;\n+\t\tfib->lookup = fn;\n+\t\treturn 0;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+}\ndiff --git a/lib/librte_fib/rte_fib.h b/lib/librte_fib/rte_fib.h\nindex 84ee774..a9bd0da 100644\n--- a/lib/librte_fib/rte_fib.h\n+++ b/lib/librte_fib/rte_fib.h\n@@ -58,6 +58,13 @@ enum rte_fib_dir24_8_nh_sz {\n \tRTE_FIB_DIR24_8_8B\n };\n \n+/** Type of lookup function implementation */\n+enum rte_fib_dir24_8_lookup_type {\n+\tRTE_FIB_DIR24_8_SCALAR_MACRO,\n+\tRTE_FIB_DIR24_8_SCALAR_INLINE,\n+\tRTE_FIB_DIR24_8_SCALAR_UNI\n+};\n+\n /** FIB configuration structure */\n struct rte_fib_conf {\n \tenum rte_fib_type type; /**< Type of FIB struct */\n@@ -196,6 +203,23 @@ __rte_experimental\n struct rte_rib *\n rte_fib_get_rib(struct rte_fib *fib);\n \n+/**\n+ * Set lookup function based on type\n+ *\n+ * @param fib\n+ * FIB object handle\n+ * @param type\n+ * type of lookup function\n+ *\n+ * @return\n+ * -EINVAL on failure\n+ * 0 on success\n+ */\n+__rte_experimental\n+int\n+rte_fib_set_lookup_fn(struct rte_fib *fib,\n+\tenum rte_fib_dir24_8_lookup_type type);\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/librte_fib/rte_fib_version.map b/lib/librte_fib/rte_fib_version.map\nindex 9527417..216af66 100644\n--- a/lib/librte_fib/rte_fib_version.map\n+++ b/lib/librte_fib/rte_fib_version.map\n@@ -9,6 +9,7 @@ EXPERIMENTAL {\n \trte_fib_lookup_bulk;\n \trte_fib_get_dp;\n \trte_fib_get_rib;\n+\trte_fib_set_lookup_fn;\n \n \trte_fib6_add;\n \trte_fib6_create;\n", "prefixes": [ "v9", "2/8" ] }