Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123629/?format=api
{ "id": 123629, "url": "http://patches.dpdk.org/api/patches/123629/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230210010724.890413-5-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": "<20230210010724.890413-5-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230210010724.890413-5-stephen@networkplumber.org", "date": "2023-02-10T01:07:12", "name": "[v3,04/16] mbuf: replace RTE_LOGTYPE_MBUF with dynamic type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c36e71bbd945ce0f60b184924d471cebae2ef760", "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/20230210010724.890413-5-stephen@networkplumber.org/mbox/", "series": [ { "id": 26935, "url": "http://patches.dpdk.org/api/series/26935/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26935", "date": "2023-02-10T01:07:08", "name": "Replace use of static logtypes", "version": 3, "mbox": "http://patches.dpdk.org/series/26935/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123629/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123629/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 0537241C58;\n\tFri, 10 Feb 2023 02:08:21 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A135E42D0D;\n\tFri, 10 Feb 2023 02:08:10 +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 5D963410F9\n for <dev@dpdk.org>; Fri, 10 Feb 2023 02:08:07 +0100 (CET)", "by mail-pj1-f53.google.com with SMTP id\n nn4-20020a17090b38c400b00233a6f118d0so1155289pjb.2\n for <dev@dpdk.org>; Thu, 09 Feb 2023 17:08:07 -0800 (PST)", "from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218])\n by smtp.gmail.com with ESMTPSA id\n jd9-20020a170903260900b0019625428cefsm2103023plb.281.2023.02.09.17.08.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 09 Feb 2023 17:08:05 -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=UpTet1GyA1n7NMsLggHkgFdnQKwxWl7iUtPSJR1Vmn0=;\n b=OSQDuQXZjiwf74N3cX4RHjDky0pqgEUWCRA7Jr6l9BLTMvKsD2H6rdJC8tZbRb8eQG\n rOspcgYfXBRsGAVrnGvYk59PnD5uIPeBY0G2Q3h1I79zhqswKzWP4e1OtvmJbfJHMVEP\n VIs5nJPuaqn58jKv+8WH6I4UB6irgZz3p3Ljd6+ma3fr6McxxvowrGrC/SB0gEhsBK/S\n /NmoFe+oTa7Y+W7CVdUQK9iQTqKbBiYeHCQUjLiEQvjYSpXCRCyAerL91flpMH4QhvPa\n AaZ8rnBTkmd0Q4BH0Xp4jKrqq0Hb7EfCm/+Z68B0UwHMM6KGJmy2Seg1akOC4Ho+gCPP\n QcLg==", "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=UpTet1GyA1n7NMsLggHkgFdnQKwxWl7iUtPSJR1Vmn0=;\n b=Ef0d91mBjCpdRRv4omMvr7gCDudN73gTLcZHxgT6MSg09pbj8/1n1Un878oOb9Z+TV\n 0IKtXwoC3NOkQvBp3llqPKDHHaY062/sMJG2McKILuXiitAEwWvUOSzKPICJko4wKMl+\n sKPvGR/F4T9O47NZPd++7KbXPMP86ZZv4x4kJmeOyFnsb4HQSABecceat21k8PYOq+qW\n BnJojI0I0okdHDK+CTFnrWS01N4qSi/uRcVUhyWxPTML3u+z/8mPTcyGnUbr7m8uxnw0\n yKbr+gIFdC8y7AtJziwQijC2qzCeLJYQR1OPoVZw3nefyxobElujuuc5NEIEIRwKphVC\n bArQ==", "X-Gm-Message-State": "AO0yUKXU6izAicpgPFo5wNMfpeT7hiPIloe2PH50FntXqauC6S4ZGJX5\n 4D8eqlXgDOa9rP5TaxY+Tc9D+uKyad5Ot3lTmL4=", "X-Google-Smtp-Source": "\n AK7set8N0S10T7UFFy0vwPU1J53h+Hw3Blp6TznOB6m4TIVPOcTg+M0rFmtQNZWNbu7KgUOtZU8NEQ==", "X-Received": "by 2002:a17:902:c94e:b0:19a:7217:32be with SMTP id\n i14-20020a170902c94e00b0019a721732bemr452711pla.1.1675991286182;\n Thu, 09 Feb 2023 17:08:06 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Olivier Matz <olivier.matz@6wind.com>", "Subject": "[PATCH v3 04/16] mbuf: replace RTE_LOGTYPE_MBUF with dynamic type", "Date": "Thu, 9 Feb 2023 17:07:12 -0800", "Message-Id": "<20230210010724.890413-5-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20230210010724.890413-1-stephen@networkplumber.org>", "References": "<20230207204151.1503491-1-stephen@networkplumber.org>\n <20230210010724.890413-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": "Introduce a new dynamic logtype for mbuf related messages.\nSince this is used in multiple files put one macro in mbuf_log.h\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/mbuf/mbuf_log.h | 10 ++++++++++\n lib/mbuf/rte_mbuf.c | 20 ++++++++++++--------\n lib/mbuf/rte_mbuf_dyn.c | 15 ++++++++-------\n lib/mbuf/rte_mbuf_pool_ops.c | 5 +++--\n 6 files changed, 34 insertions(+), 19 deletions(-)\n create mode 100644 lib/mbuf/mbuf_log.h", "diff": "diff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c\nindex 675f3d07bbe3..128bfabd94e1 100644\n--- a/lib/eal/common/eal_common_log.c\n+++ b/lib/eal/common/eal_common_log.c\n@@ -363,7 +363,6 @@ static const struct logtype logtype_strings[] = {\n \t{RTE_LOGTYPE_PORT, \"lib.port\"},\n \t{RTE_LOGTYPE_TABLE, \"lib.table\"},\n \t{RTE_LOGTYPE_PIPELINE, \"lib.pipeline\"},\n-\t{RTE_LOGTYPE_MBUF, \"lib.mbuf\"},\n \t{RTE_LOGTYPE_CRYPTODEV, \"lib.cryptodev\"},\n \t{RTE_LOGTYPE_EVENTDEV, \"lib.eventdev\"},\n \ndiff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h\nindex a90fa629168d..1f259b2abc5a 100644\n--- a/lib/eal/include/rte_log.h\n+++ b/lib/eal/include/rte_log.h\n@@ -42,7 +42,7 @@ extern \"C\" {\n #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */\n #define RTE_LOGTYPE_TABLE 14 /**< Log related to table. */\n #define RTE_LOGTYPE_PIPELINE 15 /**< Log related to pipeline. */\n-#define RTE_LOGTYPE_MBUF 16 /**< Log related to mbuf. */\n+\t\t\t\t /* was RTE_LOGTYPE_MBUF */\n #define RTE_LOGTYPE_CRYPTODEV 17 /**< Log related to cryptodev. */\n \t\t\t\t /* was RTE_LOGTYPE_EFD */\n #define RTE_LOGTYPE_EVENTDEV 19 /**< Log related to eventdev. */\ndiff --git a/lib/mbuf/mbuf_log.h b/lib/mbuf/mbuf_log.h\nnew file mode 100644\nindex 000000000000..fe97f338c9b7\n--- /dev/null\n+++ b/lib/mbuf/mbuf_log.h\n@@ -0,0 +1,10 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2010-2014 Intel Corporation.\n+ * Copyright 2014 6WIND S.A.\n+ */\n+\n+extern int mbuf_logtype;\n+\n+#define MBUF_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, mbuf_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\ndiff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c\nindex cfd8062f1e6a..133fd3ba55be 100644\n--- a/lib/mbuf/rte_mbuf.c\n+++ b/lib/mbuf/rte_mbuf.c\n@@ -20,6 +20,8 @@\n #include <rte_errno.h>\n #include <rte_memcpy.h>\n \n+#include \"mbuf_log.h\"\n+\n /*\n * pktmbuf pool constructor, given as a callback function to\n * rte_mempool_create(), or called directly if using\n@@ -227,8 +229,8 @@ rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,\n \tint ret;\n \n \tif (RTE_ALIGN(priv_size, RTE_MBUF_PRIV_ALIGN) != priv_size) {\n-\t\tRTE_LOG(ERR, MBUF, \"mbuf priv_size=%u is not aligned\\n\",\n-\t\t\tpriv_size);\n+\t\tMBUF_LOG(ERR, \"mbuf priv_size=%u is not aligned\",\n+\t\t\t priv_size);\n \t\trte_errno = EINVAL;\n \t\treturn NULL;\n \t}\n@@ -247,7 +249,7 @@ rte_pktmbuf_pool_create_by_ops(const char *name, unsigned int n,\n \t\tmp_ops_name = rte_mbuf_best_mempool_ops();\n \tret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);\n \tif (ret != 0) {\n-\t\tRTE_LOG(ERR, MBUF, \"error setting mempool handler\\n\");\n+\t\tMBUF_LOG(ERR, \"error setting mempool handler\");\n \t\trte_mempool_free(mp);\n \t\trte_errno = -ret;\n \t\treturn NULL;\n@@ -293,7 +295,7 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,\n \tint ret;\n \n \tif (RTE_ALIGN(priv_size, RTE_MBUF_PRIV_ALIGN) != priv_size) {\n-\t\tRTE_LOG(ERR, MBUF, \"mbuf priv_size=%u is not aligned\\n\",\n+\t\tMBUF_LOG(ERR, \"mbuf priv_size=%u is not aligned\",\n \t\t\tpriv_size);\n \t\trte_errno = EINVAL;\n \t\treturn NULL;\n@@ -303,12 +305,12 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,\n \t\tconst struct rte_pktmbuf_extmem *extm = ext_mem + i;\n \n \t\tif (!extm->elt_size || !extm->buf_len || !extm->buf_ptr) {\n-\t\t\tRTE_LOG(ERR, MBUF, \"invalid extmem descriptor\\n\");\n+\t\t\tMBUF_LOG(ERR, \"invalid extmem descriptor\");\n \t\t\trte_errno = EINVAL;\n \t\t\treturn NULL;\n \t\t}\n \t\tif (data_room_size > extm->elt_size) {\n-\t\t\tRTE_LOG(ERR, MBUF, \"ext elt_size=%u is too small\\n\",\n+\t\t\tMBUF_LOG(ERR, \"ext elt_size=%u is too small\",\n \t\t\t\tpriv_size);\n \t\t\trte_errno = EINVAL;\n \t\t\treturn NULL;\n@@ -317,7 +319,7 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,\n \t}\n \t/* Check whether enough external memory provided. */\n \tif (n_elts < n) {\n-\t\tRTE_LOG(ERR, MBUF, \"not enough extmem\\n\");\n+\t\tMBUF_LOG(ERR, \"not enough extmem\");\n \t\trte_errno = ENOMEM;\n \t\treturn NULL;\n \t}\n@@ -338,7 +340,7 @@ rte_pktmbuf_pool_create_extbuf(const char *name, unsigned int n,\n \tmp_ops_name = rte_mbuf_best_mempool_ops();\n \tret = rte_mempool_set_ops_byname(mp, mp_ops_name, NULL);\n \tif (ret != 0) {\n-\t\tRTE_LOG(ERR, MBUF, \"error setting mempool handler\\n\");\n+\t\tMBUF_LOG(ERR, \"error setting mempool handler\");\n \t\trte_mempool_free(mp);\n \t\trte_errno = -ret;\n \t\treturn NULL;\n@@ -936,3 +938,5 @@ rte_get_tx_ol_flag_list(uint64_t mask, char *buf, size_t buflen)\n \n \treturn 0;\n }\n+\n+RTE_LOG_REGISTER_DEFAULT(mbuf_logtype, INFO);\ndiff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c\nindex 35839e938cc5..ef8d6069b37a 100644\n--- a/lib/mbuf/rte_mbuf_dyn.c\n+++ b/lib/mbuf/rte_mbuf_dyn.c\n@@ -17,6 +17,8 @@\n #include <rte_mbuf.h>\n #include <rte_mbuf_dyn.h>\n \n+#include \"mbuf_log.h\"\n+\n #define RTE_MBUF_DYN_MZNAME \"rte_mbuf_dyn\"\n \n struct mbuf_dynfield_elt {\n@@ -116,7 +118,7 @@ init_shared_mem(void)\n \t\tmz = rte_memzone_lookup(RTE_MBUF_DYN_MZNAME);\n \t}\n \tif (mz == NULL) {\n-\t\tRTE_LOG(ERR, MBUF, \"Failed to get mbuf dyn shared memory\\n\");\n+\t\tMBUF_LOG(ERR, \"Failed to get mbuf dyn shared memory\");\n \t\treturn -1;\n \t}\n \n@@ -315,7 +317,8 @@ __rte_mbuf_dynfield_register_offset(const struct rte_mbuf_dynfield *params,\n \t\tshm->free_space[i] = 0;\n \tprocess_score();\n \n-\tRTE_LOG(DEBUG, MBUF, \"Registered dynamic field %s (sz=%zu, al=%zu, fl=0x%x) -> %zd\\n\",\n+\tMBUF_LOG(DEBUG,\n+\t\t \"Registered dynamic field %s (sz=%zu, al=%zu, fl=0x%x) -> %zd\",\n \t\tparams->name, params->size, params->align, params->flags,\n \t\toffset);\n \n@@ -489,7 +492,7 @@ __rte_mbuf_dynflag_register_bitnum(const struct rte_mbuf_dynflag *params,\n \n \tshm->free_flags &= ~(1ULL << bitnum);\n \n-\tRTE_LOG(DEBUG, MBUF, \"Registered dynamic flag %s (fl=0x%x) -> %u\\n\",\n+\tMBUF_LOG(DEBUG, \"Registered dynamic flag %s (fl=0x%x) -> %u\",\n \t\tparams->name, params->flags, bitnum);\n \n \treturn bitnum;\n@@ -590,8 +593,7 @@ rte_mbuf_dyn_timestamp_register(int *field_offset, uint64_t *flag,\n \n \toffset = rte_mbuf_dynfield_register(&field_desc);\n \tif (offset < 0) {\n-\t\tRTE_LOG(ERR, MBUF,\n-\t\t\t\"Failed to register mbuf field for timestamp\\n\");\n+\t\tMBUF_LOG(ERR, \"Failed to register mbuf field for timestamp\");\n \t\treturn -1;\n \t}\n \tif (field_offset != NULL)\n@@ -600,8 +602,7 @@ rte_mbuf_dyn_timestamp_register(int *field_offset, uint64_t *flag,\n \tstrlcpy(flag_desc.name, flag_name, sizeof(flag_desc.name));\n \toffset = rte_mbuf_dynflag_register(&flag_desc);\n \tif (offset < 0) {\n-\t\tRTE_LOG(ERR, MBUF,\n-\t\t\t\"Failed to register mbuf flag for %s timestamp\\n\",\n+\t\tMBUF_LOG(ERR, \"Failed to register mbuf flag for %s timestamp\",\n \t\t\tdirection);\n \t\treturn -1;\n \t}\ndiff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c\nindex 4c91f4ce8569..8ec2710dc86d 100644\n--- a/lib/mbuf/rte_mbuf_pool_ops.c\n+++ b/lib/mbuf/rte_mbuf_pool_ops.c\n@@ -8,6 +8,8 @@\n #include <rte_errno.h>\n #include <rte_mbuf_pool_ops.h>\n \n+#include \"mbuf_log.h\"\n+\n int\n rte_mbuf_set_platform_mempool_ops(const char *ops_name)\n {\n@@ -31,8 +33,7 @@ rte_mbuf_set_platform_mempool_ops(const char *ops_name)\n \t\treturn 0;\n \t}\n \n-\tRTE_LOG(ERR, MBUF,\n-\t\t\"%s is already registered as platform mbuf pool ops\\n\",\n+\tMBUF_LOG(ERR, \"%s is already registered as platform mbuf pool ops\",\n \t\t(char *)mz->addr);\n \treturn -EEXIST;\n }\n", "prefixes": [ "v3", "04/16" ] }