Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123399/?format=api
{ "id": 123399, "url": "http://patches.dpdk.org/api/patches/123399/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230207230438.1617331-14-stephen@networkplumber.org/", "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": "<20230207230438.1617331-14-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230207230438.1617331-14-stephen@networkplumber.org", "date": "2023-02-07T23:04:34", "name": "[RFC,v2,13/17] lpm: replace RTE_LOGTYPE_LPM with dynamic types", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "50ec75d3da3b13a1616913ece15e78c2560a9a1b", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230207230438.1617331-14-stephen@networkplumber.org/mbox/", "series": [ { "id": 26874, "url": "http://patches.dpdk.org/api/series/26874/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26874", "date": "2023-02-07T23:04:21", "name": "static logtype removal", "version": 2, "mbox": "http://patches.dpdk.org/series/26874/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123399/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123399/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 A198941C34;\n\tWed, 8 Feb 2023 00:06:44 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C849442D93;\n\tWed, 8 Feb 2023 00:05:24 +0100 (CET)", "from mail-pj1-f53.google.com (mail-pj1-f53.google.com\n [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id 357D642D4A\n for <dev@dpdk.org>; Wed, 8 Feb 2023 00:05:20 +0100 (CET)", "by mail-pj1-f53.google.com with SMTP id\n bg10-20020a17090b0d8a00b00230c7f312d4so368232pjb.3\n for <dev@dpdk.org>; Tue, 07 Feb 2023 15:05:20 -0800 (PST)", "from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218])\n by smtp.gmail.com with ESMTPSA id\n gq17-20020a17090b105100b0020dc318a43esm71189pjb.25.2023.02.07.15.05.18\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 07 Feb 2023 15:05:18 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20210112.gappssmtp.com; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=I/t267Q4Mx5FSR1VVjXRdtB5eKzqCvuevQu1xHH15Wo=;\n b=WQhxHvDUaKWSALxv3XmQB8a6M3sPJWYCMLfAGdO9ARpwT9Gq3ZlLo6uyb5yAI+QpXp\n vQ6pKnWxzz8tLFRxhmC1nTKe/Bu41mTWJy7YIoX3pFFJmasDVQLl5xIgymAfBZpST8zn\n LhWIRs/MN1hwqD4SuD0ZLOxvVYaenfsR2ibcTRFNI8/YEWLiMiU0D3ZCW9oTh0s19e8x\n CM709zJ8Tb0otT0bFoFwdzGV0pIvk3m4x30dHtfzyOoBkrTE7zpRNiGs91BdMTQ+qGY4\n mPDRUdmwio4eP2mVP6T6ikS1fNG1cf/hyEnFI5muxmBu0myUL88Kto/JYONlYkrif+LD\n 97yQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=I/t267Q4Mx5FSR1VVjXRdtB5eKzqCvuevQu1xHH15Wo=;\n b=yvW+iUvU0OnaNUgKsRPx8sQjQDO147yCB25gthcREqufnEW+QYphueazYlhrO/b4bi\n NhQGKqKiiQ4BhFGkulOcfZtr8vbS0tWWdtunVgBm1P8W97hIDdlK8PwTSTpsVKgo2OKA\n x4I9Z+nZtaNCamjsvTrwkFAKq4LkB6Uyxnyi7vrB25E6x6Sojr0BDge4O9KVYCTd6cjC\n qno7kE43PuwuYtNu4qO6SStuQJUp6oK7XIZkrsbcN5kbVWLI03Zzx/e+2d25lvzJbTBK\n Xi2ORArD4mrm/0G/EMhFogo6niMwQNZ+uF05TobttpFDzqr7CITmedFj2BG4OkVbsfay\n sR2w==", "X-Gm-Message-State": "AO0yUKWrlbva57RzgJxQaUUA6KHp/9YyWFxAmj9IeYrMpTF4FKlXfXK1\n AXKeToLVIolVCK7OoUS1eGjaG3kLppER4tZ/hB0=", "X-Google-Smtp-Source": "\n AK7set+xeGuhio+53V4PZwFujF3Q5M+sKRTDlCc+sLQXkrZK65kB6U91d+Ch0LHV3/gWjmAXMAGbyw==", "X-Received": "by 2002:a17:90b:4d92:b0:22b:f009:2e6 with SMTP id\n oj18-20020a17090b4d9200b0022bf00902e6mr5860724pjb.18.1675811118817;\n Tue, 07 Feb 2023 15:05:18 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n Bruce Richardson <bruce.richardson@intel.com>", "Subject": "[RFC v2 13/17] lpm: replace RTE_LOGTYPE_LPM with dynamic types", "Date": "Tue, 7 Feb 2023 15:04:34 -0800", "Message-Id": "<20230207230438.1617331-14-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230207230438.1617331-1-stephen@networkplumber.org>", "References": "<20230207204151.1503491-1-stephen@networkplumber.org>\n <20230207230438.1617331-1-stephen@networkplumber.org>", "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": "Split lpm and lpm6 into separate log types since they\nare in different files and user may want to change log\nlevels for IPv4 vs IPv6.\n\nFor rib and fib libraries give them own types as well.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/eal/common/eal_common_log.c | 1 -\n lib/eal/include/rte_log.h | 2 +-\n lib/fib/rte_fib.c | 23 +++++++++++++++--------\n lib/fib/rte_fib6.c | 21 ++++++++++++++-------\n lib/lpm/rte_lpm.c | 18 ++++++++++++------\n lib/lpm/rte_lpm6.c | 25 +++++++++++++++++--------\n lib/rib/rte_rib.c | 14 +++++++++-----\n lib/rib/rte_rib6.c | 16 +++++++++++-----\n 8 files changed, 79 insertions(+), 41 deletions(-)", "diff": "diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c\nindex 90d388192712..ff250b9a6d56 100644\n--- a/lib/eal/common/eal_common_log.c\n+++ b/lib/eal/common/eal_common_log.c\n@@ -351,7 +351,6 @@ static const struct logtype logtype_strings[] = {\n \t{RTE_LOGTYPE_EAL, \"lib.eal\"},\n \t{RTE_LOGTYPE_PMD, \"pmd\"},\n \t{RTE_LOGTYPE_HASH, \"lib.hash\"},\n-\t{RTE_LOGTYPE_LPM, \"lib.lpm\"},\n \t{RTE_LOGTYPE_KNI, \"lib.kni\"},\n \t{RTE_LOGTYPE_METER, \"lib.meter\"},\n \t{RTE_LOGTYPE_SCHED, \"lib.sched\"},\ndiff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h\nindex f583352ec1ea..55067efb0a84 100644\n--- a/lib/eal/include/rte_log.h\n+++ b/lib/eal/include/rte_log.h\n@@ -33,7 +33,7 @@ extern \"C\" {\n \t\t\t\t /* was RTE_LOGTYPE_TIMER */\n #define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */\n #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */\n-#define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */\n+\t\t\t\t /* was RTE_LOGTYPE_LPM */\n #define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */\n \t\t\t\t /* was RTE_LOGTYPE_ACL */\n \t\t\t\t /* was RTE_LOGTYPE_POWER */\ndiff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c\nindex 8af4c4091908..7fda4263f841 100644\n--- a/lib/fib/rte_fib.c\n+++ b/lib/fib/rte_fib.c\n@@ -8,6 +8,7 @@\n \n #include <rte_eal_memconfig.h>\n #include <rte_errno.h>\n+#include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_string_fns.h>\n #include <rte_tailq.h>\n@@ -17,6 +18,12 @@\n \n #include \"dir24_8.h\"\n \n+RTE_LOG_REGISTER_DEFAULT(fib_logtype, INFO);\n+\n+#define FIB_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, fib_logtype,\t\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n TAILQ_HEAD(rte_fib_list, rte_tailq_entry);\n static struct rte_tailq_elem rte_fib_tailq = {\n \t.name = \"RTE_FIB\",\n@@ -167,8 +174,8 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)\n \n \trib = rte_rib_create(name, socket_id, &rib_conf);\n \tif (rib == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate RIB %s\\n\", name);\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"Can not allocate RIB %s\", name);\n \t\treturn NULL;\n \t}\n \n@@ -192,8 +199,8 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"FIB_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (te == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate tailq entry for FIB %s\\n\", name);\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"Can not allocate tailq entry for FIB %s\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n@@ -202,7 +209,7 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)\n \tfib = rte_zmalloc_socket(mem_name,\n \t\tsizeof(struct rte_fib),\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (fib == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"FIB %s memory allocation failed\\n\", name);\n+\t\tFIB_LOG(ERR, \"FIB %s memory allocation failed\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto free_te;\n \t}\n@@ -213,9 +220,9 @@ rte_fib_create(const char *name, int socket_id, struct rte_fib_conf *conf)\n \tfib->def_nh = conf->default_nh;\n \tret = init_dataplane(fib, socket_id, conf);\n \tif (ret < 0) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"FIB dataplane struct %s memory allocation failed \"\n-\t\t\t\"with err %d\\n\", name, ret);\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"FIB dataplane struct %s memory allocation failed with err %d\",\n+\t\t\tname, ret);\n \t\trte_errno = -ret;\n \t\tgoto free_fib;\n \t}\ndiff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c\nindex 4b8e22b142b9..b6631fc19481 100644\n--- a/lib/fib/rte_fib6.c\n+++ b/lib/fib/rte_fib6.c\n@@ -9,6 +9,7 @@\n #include <rte_eal_memconfig.h>\n #include <rte_tailq.h>\n #include <rte_errno.h>\n+#include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_string_fns.h>\n \n@@ -17,6 +18,12 @@\n \n #include \"trie.h\"\n \n+RTE_LOG_REGISTER_SUFFIX(fib6_logtype, \"fib6\", INFO);\n+\n+#define FIB_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, fib6_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n TAILQ_HEAD(rte_fib6_list, rte_tailq_entry);\n static struct rte_tailq_elem rte_fib6_tailq = {\n \t.name = \"RTE_FIB6\",\n@@ -168,8 +175,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)\n \n \trib = rte_rib6_create(name, socket_id, &rib_conf);\n \tif (rib == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate RIB %s\\n\", name);\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"Can not allocate RIB %s\", name);\n \t\treturn NULL;\n \t}\n \n@@ -193,8 +200,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"FIB_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (te == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate tailq entry for FIB %s\\n\", name);\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"Can not allocate tailq entry for FIB %s\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n@@ -203,7 +210,7 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)\n \tfib = rte_zmalloc_socket(mem_name,\n \t\tsizeof(struct rte_fib6), RTE_CACHE_LINE_SIZE, socket_id);\n \tif (fib == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"FIB %s memory allocation failed\\n\", name);\n+\t\tFIB_LOG(ERR, \"FIB %s memory allocation failed\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto free_te;\n \t}\n@@ -214,8 +221,8 @@ rte_fib6_create(const char *name, int socket_id, struct rte_fib6_conf *conf)\n \tfib->def_nh = conf->default_nh;\n \tret = init_dataplane(fib, socket_id, conf);\n \tif (ret < 0) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"FIB dataplane struct %s memory allocation failed\\n\",\n+\t\tFIB_LOG(ERR,\n+\t\t\t\"FIB dataplane struct %s memory allocation failed\",\n \t\t\tname);\n \t\trte_errno = -ret;\n \t\tgoto free_fib;\ndiff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c\nindex cdcd1b7f9e47..ba3912a775a3 100644\n--- a/lib/lpm/rte_lpm.c\n+++ b/lib/lpm/rte_lpm.c\n@@ -19,6 +19,12 @@\n \n #include \"rte_lpm.h\"\n \n+RTE_LOG_REGISTER_DEFAULT(lpm_logtype, INFO);\n+\n+#define LPM_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, lpm_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n TAILQ_HEAD(rte_lpm_list, rte_tailq_entry);\n \n static struct rte_tailq_elem rte_lpm_tailq = {\n@@ -189,7 +195,7 @@ rte_lpm_create(const char *name, int socket_id,\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"LPM_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (te == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"Failed to allocate tailq entry\\n\");\n+\t\tLPM_LOG(ERR, \"Failed to allocate tailq entry\");\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n@@ -198,7 +204,7 @@ rte_lpm_create(const char *name, int socket_id,\n \ti_lpm = rte_zmalloc_socket(mem_name, mem_size,\n \t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (i_lpm == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM memory allocation failed\\n\");\n+\t\tLPM_LOG(ERR, \"LPM memory allocation failed\");\n \t\trte_free(te);\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n@@ -208,7 +214,7 @@ rte_lpm_create(const char *name, int socket_id,\n \t\t\t(size_t)rules_size, RTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (i_lpm->rules_tbl == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM rules_tbl memory allocation failed\\n\");\n+\t\tLPM_LOG(ERR, \"LPM rules_tbl memory allocation failed\");\n \t\trte_free(i_lpm);\n \t\ti_lpm = NULL;\n \t\trte_free(te);\n@@ -220,7 +226,7 @@ rte_lpm_create(const char *name, int socket_id,\n \t\t\t(size_t)tbl8s_size, RTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (i_lpm->lpm.tbl8 == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM tbl8 memory allocation failed\\n\");\n+\t\tLPM_LOG(ERR, \"LPM tbl8 memory allocation failed\");\n \t\trte_free(i_lpm->rules_tbl);\n \t\trte_free(i_lpm);\n \t\ti_lpm = NULL;\n@@ -335,7 +341,7 @@ rte_lpm_rcu_qsbr_add(struct rte_lpm *lpm, struct rte_lpm_rcu_config *cfg)\n \t\tparams.v = cfg->v;\n \t\ti_lpm->dq = rte_rcu_qsbr_dq_create(¶ms);\n \t\tif (i_lpm->dq == NULL) {\n-\t\t\tRTE_LOG(ERR, LPM, \"LPM defer queue creation failed\\n\");\n+\t\t\tLPM_LOG(ERR, \"LPM defer queue creation failed\");\n \t\t\treturn 1;\n \t\t}\n \t} else {\n@@ -562,7 +568,7 @@ tbl8_free(struct __rte_lpm *i_lpm, uint32_t tbl8_group_start)\n \t\tstatus = rte_rcu_qsbr_dq_enqueue(i_lpm->dq,\n \t\t\t\t(void *)&tbl8_group_start);\n \t\tif (status == 1) {\n-\t\t\tRTE_LOG(ERR, LPM, \"Failed to push QSBR FIFO\\n\");\n+\t\t\tLPM_LOG(ERR, \"Failed to push QSBR FIFO\");\n \t\t\treturn -rte_errno;\n \t\t}\n \t}\ndiff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c\nindex 8d21aeddb83c..7701e8112ed2 100644\n--- a/lib/lpm/rte_lpm6.c\n+++ b/lib/lpm/rte_lpm6.c\n@@ -45,6 +45,12 @@ enum valid_flag {\n \tVALID\n };\n \n+RTE_LOG_REGISTER_SUFFIX(lpm6_logtype, \"lpm6\", INFO);\n+\n+#define LPM_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, lpm6_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n TAILQ_HEAD(rte_lpm6_list, rte_tailq_entry);\n \n static struct rte_tailq_elem rte_lpm6_tailq = {\n@@ -279,8 +285,9 @@ rte_lpm6_create(const char *name, int socket_id,\n \n \trules_tbl = rte_hash_create(&rule_hash_tbl_params);\n \tif (rules_tbl == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM rules hash table allocation failed: %s (%d)\",\n-\t\t\t\t rte_strerror(rte_errno), rte_errno);\n+\t\tLPM_LOG(ERR,\n+\t\t\t\"LPM rules hash table allocation failed: %s (%d)\",\n+\t\t\trte_strerror(rte_errno), rte_errno);\n \t\tgoto fail_wo_unlock;\n \t}\n \n@@ -289,8 +296,9 @@ rte_lpm6_create(const char *name, int socket_id,\n \t\t\tsizeof(uint32_t) * config->number_tbl8s,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (tbl8_pool == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM tbl8 pool allocation failed: %s (%d)\",\n-\t\t\t\t rte_strerror(rte_errno), rte_errno);\n+\t\tLPM_LOG(ERR,\n+\t\t\t\"LPM tbl8 pool allocation failed: %s (%d)\",\n+\t\t\trte_strerror(rte_errno), rte_errno);\n \t\trte_errno = ENOMEM;\n \t\tgoto fail_wo_unlock;\n \t}\n@@ -300,8 +308,9 @@ rte_lpm6_create(const char *name, int socket_id,\n \t\t\tsizeof(struct rte_lpm_tbl8_hdr) * config->number_tbl8s,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (tbl8_hdrs == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM tbl8 headers allocation failed: %s (%d)\",\n-\t\t\t\t rte_strerror(rte_errno), rte_errno);\n+\t\tLPM_LOG(ERR,\n+\t\t\t\"LPM tbl8 headers allocation failed: %s (%d)\",\n+\t\t\trte_strerror(rte_errno), rte_errno);\n \t\trte_errno = ENOMEM;\n \t\tgoto fail_wo_unlock;\n \t}\n@@ -329,7 +338,7 @@ rte_lpm6_create(const char *name, int socket_id,\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"LPM6_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (te == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"Failed to allocate tailq entry!\\n\");\n+\t\tLPM_LOG(ERR, \"Failed to allocate tailq entry!\");\n \t\trte_errno = ENOMEM;\n \t\tgoto fail;\n \t}\n@@ -339,7 +348,7 @@ rte_lpm6_create(const char *name, int socket_id,\n \t\t\tRTE_CACHE_LINE_SIZE, socket_id);\n \n \tif (lpm == NULL) {\n-\t\tRTE_LOG(ERR, LPM, \"LPM memory allocation failed\\n\");\n+\t\tLPM_LOG(ERR, \"LPM memory allocation failed\");\n \t\trte_free(te);\n \t\trte_errno = ENOMEM;\n \t\tgoto fail;\ndiff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c\nindex b0794edf66f5..a81b4ed1cc04 100644\n--- a/lib/rib/rte_rib.c\n+++ b/lib/rib/rte_rib.c\n@@ -15,6 +15,12 @@\n \n #include <rte_rib.h>\n \n+RTE_LOG_REGISTER_DEFAULT(rib_logtype, INFO);\n+\n+#define RIB_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, rib_logtype,\t\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n TAILQ_HEAD(rte_rib_list, rte_tailq_entry);\n static struct rte_tailq_elem rte_rib_tailq = {\n \t.name = \"RTE_RIB\",\n@@ -412,8 +418,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)\n \t\tNULL, NULL, NULL, NULL, socket_id, 0);\n \n \tif (node_pool == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate mempool for RIB %s\\n\", name);\n+\t\tRIB_LOG(ERR, \"Can not allocate mempool for RIB %s\", name);\n \t\treturn NULL;\n \t}\n \n@@ -437,8 +442,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"RIB_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (unlikely(te == NULL)) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate tailq entry for RIB %s\\n\", name);\n+\t\tRIB_LOG(ERR, \"Can not allocate tailq entry for RIB %s\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n@@ -447,7 +451,7 @@ rte_rib_create(const char *name, int socket_id, const struct rte_rib_conf *conf)\n \trib = rte_zmalloc_socket(mem_name,\n \t\tsizeof(struct rte_rib),\tRTE_CACHE_LINE_SIZE, socket_id);\n \tif (unlikely(rib == NULL)) {\n-\t\tRTE_LOG(ERR, LPM, \"RIB %s memory allocation failed\\n\", name);\n+\t\tRIB_LOG(ERR, \"RIB %s memory allocation failed\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto free_te;\n \t}\ndiff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c\nindex 19e4ff97c479..39eba4d7032b 100644\n--- a/lib/rib/rte_rib6.c\n+++ b/lib/rib/rte_rib6.c\n@@ -8,6 +8,7 @@\n \n #include <rte_eal_memconfig.h>\n #include <rte_errno.h>\n+#include <rte_log.h>\n #include <rte_malloc.h>\n #include <rte_mempool.h>\n #include <rte_string_fns.h>\n@@ -15,6 +16,12 @@\n \n #include <rte_rib6.h>\n \n+RTE_LOG_REGISTER_SUFFIX(rib6_logtype, \"rib6\", INFO);\n+\n+#define RIB_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, rib6_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n #define RTE_RIB_VALID_NODE\t1\n #define RIB6_MAXDEPTH\t\t128\n /* Maximum length of a RIB6 name. */\n@@ -481,8 +488,7 @@ rte_rib6_create(const char *name, int socket_id,\n \t\tNULL, NULL, NULL, NULL, socket_id, 0);\n \n \tif (node_pool == NULL) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate mempool for RIB6 %s\\n\", name);\n+\t\tRIB_LOG(ERR, \"Can not allocate mempool for RIB6 %s\", name);\n \t\treturn NULL;\n \t}\n \n@@ -506,8 +512,8 @@ rte_rib6_create(const char *name, int socket_id,\n \t/* allocate tailq entry */\n \tte = rte_zmalloc(\"RIB6_TAILQ_ENTRY\", sizeof(*te), 0);\n \tif (unlikely(te == NULL)) {\n-\t\tRTE_LOG(ERR, LPM,\n-\t\t\t\"Can not allocate tailq entry for RIB6 %s\\n\", name);\n+\t\tRIB_LOG(ERR,\n+\t\t\t\"Can not allocate tailq entry for RIB6 %s\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n@@ -516,7 +522,7 @@ rte_rib6_create(const char *name, int socket_id,\n \trib = rte_zmalloc_socket(mem_name,\n \t\tsizeof(struct rte_rib6), RTE_CACHE_LINE_SIZE, socket_id);\n \tif (unlikely(rib == NULL)) {\n-\t\tRTE_LOG(ERR, LPM, \"RIB6 %s memory allocation failed\\n\", name);\n+\t\tRIB_LOG(ERR, \"RIB6 %s memory allocation failed\", name);\n \t\trte_errno = ENOMEM;\n \t\tgoto free_te;\n \t}\n", "prefixes": [ "RFC", "v2", "13/17" ] }