Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123630/?format=api
{ "id": 123630, "url": "http://patches.dpdk.org/api/patches/123630/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230210010724.890413-6-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-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20230210010724.890413-6-stephen@networkplumber.org", "date": "2023-02-10T01:07:13", "name": "[v3,05/16] acl: replace LOGTYPE_ACL with dynamic type", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c1289bca7f6338bb54c0b22071f2e81cb5969c1c", "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-6-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/123630/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123630/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 52C4A41C58;\n\tFri, 10 Feb 2023 02:08:27 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C74CE42D13;\n\tFri, 10 Feb 2023 02:08:11 +0100 (CET)", "from mail-pl1-f175.google.com (mail-pl1-f175.google.com\n [209.85.214.175])\n by mails.dpdk.org (Postfix) with ESMTP id 7F54E42C4D\n for <dev@dpdk.org>; Fri, 10 Feb 2023 02:08:08 +0100 (CET)", "by mail-pl1-f175.google.com with SMTP id w5so4874377plg.8\n for <dev@dpdk.org>; Thu, 09 Feb 2023 17:08:08 -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.06\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 09 Feb 2023 17:08:06 -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=eVSpNaCMpdSLcdDy2JPj4FQ20idLaspbXmJCNoYTWJU=;\n b=yWy9xs79b4wucU4tb3cYF0YfKGHGGutNicRILqBecEu4JJAHq1zZi3vDSVBCNhlfBZ\n qBpBYYmIe0n5S9PnkBfPrHbmcwWvSlKD6rtY6v4/QSHjIY5P1P8moLlbnydPbyOBEqtc\n xIUB1fEyZHiaRDPOa33i9qEB+DWBlbP26Zd4SKAKczaeBQjD3QQHWtiAJZ4G2UCYkF1P\n lOAO4BO1ckuz/Hc6ZlGQl0031Uo+tiUEjyTAsUVaFTU1RwZcELKozfUjF9HegoE7luuX\n SP1dybU8g7ZMLNoYEbmjjQI1TT24e/1T4yaCwwaAwz0lke4nLFf6yTarBuzOVxb/pdrn\n hVAA==", "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=eVSpNaCMpdSLcdDy2JPj4FQ20idLaspbXmJCNoYTWJU=;\n b=UoPrffD9Zry5AFJ8TI4/xv1QAhkyPPXoBu2t+xcgW0lJr2NsubUky7OPrgrv60UIjJ\n wlFkDokjG9jaxlKzVwBmrVHGe8GF2zKbnMcY8q/KUGuKyakdWK5M1XSTASt9Fep2RB0R\n qNF6sdKSyI+LCF916FXakR5L9wRS1bG1R9XAemOQyW+y0XHimENmZJKfXcnvCYCzF65V\n 0fOxzZPb92caNPTzK7GZdN49dXWDVJEwdcBAkGuiJCJf30gds94OQ2l8JR85LOXQMV95\n YqsB8o9sUPneUA+ABZnmj6Nh9NvSFARZhw+MbQE9lmtWVdYiSolVqR9hM8k7ewGT9t5X\n MTTQ==", "X-Gm-Message-State": "AO0yUKWigStlRniI29mVL6hjAw58SpSJvnmYGvLCJpVAAx+FIBeCLFEX\n chhadU9D7CwoNnjZM24F+m1zsVQEKiC12VFb8+A=", "X-Google-Smtp-Source": "\n AK7set+rgrTh4MnYTtVItpj2GP1VXeOF9vBGfbZN76SJKA7NnxJkRQpGFJwArRbDNVr/JNZ4bM3gjw==", "X-Received": "by 2002:a17:902:ced1:b0:19a:593c:f385 with SMTP id\n d17-20020a170902ced100b0019a593cf385mr5132410plg.25.1675991287290;\n Thu, 09 Feb 2023 17:08:07 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>", "Subject": "[PATCH v3 05/16] acl: replace LOGTYPE_ACL with dynamic type", "Date": "Thu, 9 Feb 2023 17:07:13 -0800", "Message-Id": "<20230210010724.890413-6-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": "Get rid of RTE_LOGTYPE_ACL and RTE_LOGTYPE_MALLOC.\nFor ACL library use a dynamic type.\nThe one message using RTE_LOGTYPE_MALLOC should have been\nunder the ACL logtype anyway.\n\nThe test code should not have been using fixed log type\nso just change that to stderr.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n app/test/test_acl.c | 3 ++-\n lib/acl/acl_bld.c | 35 +++++++++++++++++----------------\n lib/acl/acl_gen.c | 20 ++++++++++---------\n lib/acl/acl_log.h | 13 ++++++++++++\n lib/acl/rte_acl.c | 14 ++++++++-----\n lib/acl/tb_mem.c | 8 ++++++--\n lib/eal/common/eal_common_log.c | 2 --\n lib/eal/include/rte_log.h | 4 ++--\n 8 files changed, 61 insertions(+), 38 deletions(-)\n create mode 100644 lib/acl/acl_log.h", "diff": "diff --git a/app/test/test_acl.c b/app/test/test_acl.c\nindex 623f34682e69..75588978a720 100644\n--- a/app/test/test_acl.c\n+++ b/app/test/test_acl.c\n@@ -154,7 +154,8 @@ rte_acl_ipv4vlan_add_rules(struct rte_acl_ctx *ctx,\n \tfor (i = 0; i != num; i++) {\n \t\trc = acl_ipv4vlan_check_rule(rules + i);\n \t\tif (rc != 0) {\n-\t\t\tRTE_LOG(ERR, ACL, \"%s: rule #%u is invalid\\n\",\n+\t\t\tfprintf(stderr,\n+\t\t\t\t\"%s: rule #%u is invalid\\n\",\n \t\t\t\t__func__, i + 1);\n \t\t\treturn rc;\n \t\t}\ndiff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c\nindex 2816632803bd..143564151e29 100644\n--- a/lib/acl/acl_bld.c\n+++ b/lib/acl/acl_bld.c\n@@ -5,6 +5,7 @@\n #include <rte_acl.h>\n #include \"tb_mem.h\"\n #include \"acl.h\"\n+#include \"acl_log.h\"\n \n #define\tACL_POOL_ALIGN\t\t8\n #define\tACL_POOL_ALLOC_MIN\t0x800000\n@@ -1014,8 +1015,8 @@ build_trie(struct acl_build_context *context, struct rte_acl_build_rule *head,\n \t\t\t\tbreak;\n \n \t\t\tdefault:\n-\t\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\t\t\"Error in rule[%u] type - %hhu\\n\",\n+\t\t\t\tACL_LOG(ERR,\n+\t\t\t\t\t\"Error in rule[%u] type - %hhu\",\n \t\t\t\t\trule->f->data.userdata,\n \t\t\t\t\trule->config->defs[n].type);\n \t\t\t\treturn NULL;\n@@ -1371,7 +1372,7 @@ acl_build_tries(struct acl_build_context *context,\n \n \t\tlast = build_one_trie(context, rule_sets, n, context->node_max);\n \t\tif (context->bld_tries[n].trie == NULL) {\n-\t\t\tRTE_LOG(ERR, ACL, \"Build of %u-th trie failed\\n\", n);\n+\t\t\tACL_LOG(ERR, \"Build of %u-th trie failed\", n);\n \t\t\treturn -ENOMEM;\n \t\t}\n \n@@ -1380,8 +1381,7 @@ acl_build_tries(struct acl_build_context *context,\n \t\t\tbreak;\n \n \t\tif (num_tries == RTE_DIM(context->tries)) {\n-\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\t\"Exceeded max number of tries: %u\\n\",\n+\t\t\tACL_LOG(ERR, \"Exceeded max number of tries: %u\",\n \t\t\t\tnum_tries);\n \t\t\treturn -ENOMEM;\n \t\t}\n@@ -1406,7 +1406,7 @@ acl_build_tries(struct acl_build_context *context,\n \t\t */\n \t\tlast = build_one_trie(context, rule_sets, n, INT32_MAX);\n \t\tif (context->bld_tries[n].trie == NULL || last != NULL) {\n-\t\t\tRTE_LOG(ERR, ACL, \"Build of %u-th trie failed\\n\", n);\n+\t\t\tACL_LOG(ERR, \"Build of %u-th trie failed\", n);\n \t\t\treturn -ENOMEM;\n \t\t}\n \n@@ -1421,10 +1421,11 @@ acl_build_log(const struct acl_build_context *ctx)\n {\n \tuint32_t n;\n \n-\tRTE_LOG(DEBUG, ACL, \"Build phase for ACL \\\"%s\\\":\\n\"\n+\tACL_LOG(DEBUG,\n+\t\t\"Build phase for ACL \\\"%s\\\":\\n\"\n \t\t\"node limit for tree split: %u\\n\"\n \t\t\"nodes created: %u\\n\"\n-\t\t\"memory consumed: %zu\\n\",\n+\t\t\"memory consumed: %zu\",\n \t\tctx->acx->name,\n \t\tctx->node_max,\n \t\tctx->num_nodes,\n@@ -1432,7 +1433,7 @@ acl_build_log(const struct acl_build_context *ctx)\n \n \tfor (n = 0; n < RTE_DIM(ctx->tries); n++) {\n \t\tif (ctx->tries[n].count != 0)\n-\t\t\tRTE_LOG(DEBUG, ACL,\n+\t\t\tACL_LOG(DEBUG,\n \t\t\t\t\"trie %u: number of rules: %u, indexes: %u\\n\",\n \t\t\t\tn, ctx->tries[n].count,\n \t\t\t\tctx->tries[n].num_data_indexes);\n@@ -1523,8 +1524,8 @@ acl_bld(struct acl_build_context *bcx, struct rte_acl_ctx *ctx,\n \n \t/* build phase runs out of memory. */\n \tif (rc != 0) {\n-\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\"ACL context: %s, %s() failed with error code: %d\\n\",\n+\t\tACL_LOG(ERR,\n+\t\t\t\"ACL context: %s, %s() failed with error code: %d\",\n \t\t\tbcx->acx->name, __func__, rc);\n \t\treturn rc;\n \t}\n@@ -1565,9 +1566,9 @@ acl_check_bld_param(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)\n \n \tfor (i = 0; i != cfg->num_fields; i++) {\n \t\tif (cfg->defs[i].type > RTE_ACL_FIELD_TYPE_BITMASK) {\n-\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\"ACL context: %s, invalid type: %hhu for %u-th field\\n\",\n-\t\t\tctx->name, cfg->defs[i].type, i);\n+\t\t\tACL_LOG(ERR,\n+\t\t\t\t\"ACL context: %s, invalid type: %hhu for %u-th field\",\n+\t\t\t\tctx->name, cfg->defs[i].type, i);\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tfor (j = 0;\n@@ -1577,9 +1578,9 @@ acl_check_bld_param(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg)\n \t\t\t;\n \n \t\tif (j == RTE_DIM(field_sizes)) {\n-\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\"ACL context: %s, invalid size: %hhu for %u-th field\\n\",\n-\t\t\tctx->name, cfg->defs[i].size, i);\n+\t\t\tACL_LOG(ERR,\n+\t\t\t\t\"ACL context: %s, invalid size: %hhu for %u-th field\\n\",\n+\t\t\t\tctx->name, cfg->defs[i].size, i);\n \t\t\treturn -EINVAL;\n \t\t}\n \t}\ndiff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c\nindex e759a2ca1598..84369b103947 100644\n--- a/lib/acl/acl_gen.c\n+++ b/lib/acl/acl_gen.c\n@@ -4,6 +4,7 @@\n \n #include <rte_acl.h>\n #include \"acl.h\"\n+#include \"acl_log.h\"\n \n #define\tQRANGE_MIN\t((uint8_t)INT8_MIN)\n \n@@ -32,18 +33,19 @@ struct rte_acl_indices {\n \n static void\n acl_gen_log_stats(const struct rte_acl_ctx *ctx,\n-\tconst struct acl_node_counters *counts,\n-\tconst struct rte_acl_indices *indices,\n-\tsize_t max_size)\n+\t\t const struct acl_node_counters *counts,\n+\t\t const struct rte_acl_indices *indices,\n+\t\t size_t max_size)\n {\n-\tRTE_LOG(DEBUG, ACL, \"Gen phase for ACL \\\"%s\\\":\\n\"\n+\tACL_LOG(DEBUG,\n+\t\t\"Gen phase for ACL \\\"%s\\\":\\n\"\n \t\t\"runtime memory footprint on socket %d:\\n\"\n \t\t\"single nodes/bytes used: %d/%zu\\n\"\n \t\t\"quad nodes/vectors/bytes used: %d/%d/%zu\\n\"\n \t\t\"DFA nodes/group64/bytes used: %d/%d/%zu\\n\"\n \t\t\"match nodes/bytes used: %d/%zu\\n\"\n \t\t\"total: %zu bytes\\n\"\n-\t\t\"max limit: %zu bytes\\n\",\n+\t\t\"max limit: %zu bytes\",\n \t\tctx->name, ctx->socket_id,\n \t\tcounts->single, counts->single * sizeof(uint64_t),\n \t\tcounts->quad, counts->quad_vectors,\n@@ -470,9 +472,9 @@ rte_acl_gen(struct rte_acl_ctx *ctx, struct rte_acl_trie *trie,\n \t\tXMM_SIZE;\n \n \tif (total_size > max_size) {\n-\t\tRTE_LOG(DEBUG, ACL,\n+\t\tACL_LOG(DEBUG,\n \t\t\t\"Gen phase for ACL ctx \\\"%s\\\" exceeds max_size limit, \"\n-\t\t\t\"bytes required: %zu, allowed: %zu\\n\",\n+\t\t\t\"bytes required: %zu, allowed: %zu\",\n \t\t\tctx->name, total_size, max_size);\n \t\treturn -ERANGE;\n \t}\n@@ -480,8 +482,8 @@ rte_acl_gen(struct rte_acl_ctx *ctx, struct rte_acl_trie *trie,\n \tmem = rte_zmalloc_socket(ctx->name, total_size, RTE_CACHE_LINE_SIZE,\n \t\t\tctx->socket_id);\n \tif (mem == NULL) {\n-\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\"allocation of %zu bytes on socket %d for %s failed\\n\",\n+\t\tACL_LOG(ERR,\n+\t\t\t\"allocation of %zu bytes on socket %d for %s failed\",\n \t\t\ttotal_size, ctx->socket_id, ctx->name);\n \t\treturn -ENOMEM;\n \t}\ndiff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h\nnew file mode 100644\nindex 000000000000..4d5adf965cd2\n--- /dev/null\n+++ b/lib/acl/acl_log.h\n@@ -0,0 +1,13 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2010-2014 Intel Corporation\n+ */\n+\n+#ifndef\t_ACL_LOG_H_\n+#define\t_ACL_LOG_H_\n+\n+extern int acl_logtype;\n+#define ACL_LOG(level, fmt, args...)\t\t\t\\\n+\trte_log(RTE_LOG_ ## level, acl_logtype,\t\\\n+\t\t\"%s(): \" fmt \"\\n\", __func__, ##args)\n+\n+#endif /* _ACL_LOG_H_ */\ndiff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c\nindex a61c3ba188da..5c8a9cd2f693 100644\n--- a/lib/acl/rte_acl.c\n+++ b/lib/acl/rte_acl.c\n@@ -6,8 +6,10 @@\n #include <rte_string_fns.h>\n #include <rte_acl.h>\n #include <rte_tailq.h>\n+#include <rte_log.h>\n \n #include \"acl.h\"\n+#include \"acl_log.h\"\n \n TAILQ_HEAD(rte_acl_list, rte_tailq_entry);\n \n@@ -400,15 +402,15 @@ rte_acl_create(const struct rte_acl_param *param)\n \t\tte = rte_zmalloc(\"ACL_TAILQ_ENTRY\", sizeof(*te), 0);\n \n \t\tif (te == NULL) {\n-\t\t\tRTE_LOG(ERR, ACL, \"Cannot allocate tailq entry!\\n\");\n+\t\t\tACL_LOG(ERR, \"Cannot allocate tailq entry!\");\n \t\t\tgoto exit;\n \t\t}\n \n \t\tctx = rte_zmalloc_socket(name, sz, RTE_CACHE_LINE_SIZE, param->socket_id);\n \n \t\tif (ctx == NULL) {\n-\t\t\tRTE_LOG(ERR, ACL,\n-\t\t\t\t\"allocation of %zu bytes on socket %d for %s failed\\n\",\n+\t\t\tACL_LOG(ERR,\n+\t\t\t\t\"allocation of %zu bytes on socket %d for %s failed\",\n \t\t\t\tsz, param->socket_id, name);\n \t\t\trte_free(te);\n \t\t\tgoto exit;\n@@ -474,8 +476,8 @@ rte_acl_add_rules(struct rte_acl_ctx *ctx, const struct rte_acl_rule *rules,\n \t\t\t((uintptr_t)rules + i * ctx->rule_sz);\n \t\trc = acl_check_rule(&rv->data);\n \t\tif (rc != 0) {\n-\t\t\tRTE_LOG(ERR, ACL, \"%s(%s): rule #%u is invalid\\n\",\n-\t\t\t\t__func__, ctx->name, i + 1);\n+\t\t\tACL_LOG(ERR, \"%s: rule #%u is invalid\",\n+\t\t\t\tctx->name, i + 1);\n \t\t\treturn rc;\n \t\t}\n \t}\n@@ -544,3 +546,5 @@ rte_acl_list_dump(void)\n \t}\n \trte_mcfg_tailq_read_unlock();\n }\n+\n+RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO);\ndiff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c\nindex f14d7b4fa26e..74a12159b868 100644\n--- a/lib/acl/tb_mem.c\n+++ b/lib/acl/tb_mem.c\n@@ -3,6 +3,9 @@\n */\n \n #include \"tb_mem.h\"\n+#include \"acl_log.h\"\n+\n+#include <rte_log.h>\n \n /*\n * Memory management routines for temporary memory.\n@@ -25,8 +28,9 @@ tb_pool(struct tb_mem_pool *pool, size_t sz)\n \tsize = sz + pool->alignment - 1;\n \tblock = calloc(1, size + sizeof(*pool->block));\n \tif (block == NULL) {\n-\t\tRTE_LOG(ERR, MALLOC, \"%s(%zu)\\n failed, currently allocated \"\n-\t\t\t\"by pool: %zu bytes\\n\", __func__, sz, pool->alloc);\n+\t\tACL_LOG(ERR,\n+\t\t\t\"allocation size %zu failed, currently allocated by pool: %zu bytes\\n\",\n+\t\t\tsz, pool->alloc);\n \t\tsiglongjmp(pool->fail, -ENOMEM);\n \t\treturn NULL;\n \t}\ndiff --git a/lib/eal/common/eal_common_log.c b/lib/eal/common/eal_common_log.c\nindex 128bfabd94e1..871f2c38298c 100644\n--- a/lib/eal/common/eal_common_log.c\n+++ b/lib/eal/common/eal_common_log.c\n@@ -349,14 +349,12 @@ struct logtype {\n \n static const struct logtype logtype_strings[] = {\n \t{RTE_LOGTYPE_EAL, \"lib.eal\"},\n-\t{RTE_LOGTYPE_MALLOC, \"lib.malloc\"},\n \t{RTE_LOGTYPE_RING, \"lib.ring\"},\n \t{RTE_LOGTYPE_MEMPOOL, \"lib.mempool\"},\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_ACL, \"lib.acl\"},\n \t{RTE_LOGTYPE_POWER, \"lib.power\"},\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 1f259b2abc5a..d707098b6359 100644\n--- a/lib/eal/include/rte_log.h\n+++ b/lib/eal/include/rte_log.h\n@@ -27,7 +27,7 @@ extern \"C\" {\n \n /* SDK log type */\n #define RTE_LOGTYPE_EAL 0 /**< Log related to eal. */\n-#define RTE_LOGTYPE_MALLOC 1 /**< Log related to malloc. */\n+\t\t\t\t /* was RTE_LOGTYPE_MALLOC */\n #define RTE_LOGTYPE_RING 2 /**< Log related to ring. */\n #define RTE_LOGTYPE_MEMPOOL 3 /**< Log related to mempool. */\n \t\t\t\t /* was RTE_LOGTYPE_TIMER */\n@@ -35,7 +35,7 @@ extern \"C\" {\n #define RTE_LOGTYPE_HASH 6 /**< Log related to hash table. */\n #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */\n #define RTE_LOGTYPE_KNI 8 /**< Log related to KNI. */\n-#define RTE_LOGTYPE_ACL 9 /**< Log related to ACL. */\n+\t\t\t\t /* was RTE_LOGTYPE_ACL */\n #define RTE_LOGTYPE_POWER 10 /**< Log related to power. */\n #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */\n #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */\n", "prefixes": [ "v3", "05/16" ] }