Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134834/?format=api
{ "id": 134834, "url": "https://patches.dpdk.org/api/patches/134834/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20231205021330.260017-7-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://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": "<20231205021330.260017-7-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20231205021330.260017-7-stephen@networkplumber.org", "date": "2023-12-05T02:09:44", "name": "[06/18] acl: convert RTE_LOGTYPE_ACL to dynamic type", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "04b2100c6744812d51de8bee3b237b51e40ca953", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 24651, "url": "https://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20231205021330.260017-7-stephen@networkplumber.org/mbox/", "series": [ { "id": 30446, "url": "https://patches.dpdk.org/api/series/30446/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=30446", "date": "2023-12-05T02:09:38", "name": "Convert static log types in libraries to dynamic", "version": 1, "mbox": "https://patches.dpdk.org/series/30446/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/134834/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/134834/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 C723E433FD;\n\tTue, 5 Dec 2023 03:14:26 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4B5E042D9D;\n\tTue, 5 Dec 2023 03:13:57 +0100 (CET)", "from mail-pf1-f173.google.com (mail-pf1-f173.google.com\n [209.85.210.173])\n by mails.dpdk.org (Postfix) with ESMTP id 0753A42D76\n for <dev@dpdk.org>; Tue, 5 Dec 2023 03:13:55 +0100 (CET)", "by mail-pf1-f173.google.com with SMTP id\n d2e1a72fcca58-6cdcef787ffso5452704b3a.0\n for <dev@dpdk.org>; Mon, 04 Dec 2023 18:13:54 -0800 (PST)", "from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141])\n by smtp.gmail.com with ESMTPSA id\n p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.53\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 04 Dec 2023 18:13:53 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742434;\n x=1702347234; darn=dpdk.org;\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=DcPgwKOIrZDCJ4NHJ0867FpXDPnBRCJSvSb5jRhEO/8=;\n b=UAKp9Y7sAtm7fwzoJDQimKiPL1LF8NhTSm3JI4xmoWSaEEawQUwCiKRQo8bjHdGslm\n 6/tFL5dQtxdaNy1trWxLshqpipMgp5omvD56Su8EIiytUVwqPxHIOuKcMlH/tSIddABt\n Hp0TV6N/p40/KIEfbRqpsxm1N0zEBq+CqZMFk89NfD+ehbWb3KHaVQ98rGaGEVY8U7v3\n +/0rB5P6j3P+/sxYQZyUke/KlhKPlW262E01zTerF5qKNAsY6Axe/t26m+yNPs0SbpiD\n JThwVOsH7Svi5vVS3PLtc9TJrsYtg2vQSzSDdECBBOuTvcK4G5bA3pNRo+H7o2PZBrT+\n ui9w==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1701742434; x=1702347234;\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=DcPgwKOIrZDCJ4NHJ0867FpXDPnBRCJSvSb5jRhEO/8=;\n b=GmrSO78P+N2gsns8tsVTzDITidBQav6Co5NfDs6D9FJM0KqHKkMfnII0Tmm5BkHgRX\n eZnWj8XHfB5yvl2Pv6e5/mbLsNAyEzBuC1CTvjn6R54U2NhGCkWHSpKMz3Fa0eZCudaN\n Q2+fvO+tQKcLa9eprBKYKHdWUslER9YTyICVey66NfnW2U4eGozZkBiAB43LlGC5XTRB\n CNfDof0RAVcKpdDa26pEtQPcNYt7t2mPJ3t68bKDXm6abmpKcWxbXZlVVR7oyENp8C9x\n gMG7RBq7dmTKgkn8AmpVBbjYLCre22GPsD6LTLvU6eHN5ZB0lbJiHyFdYN/Nz/OUaDsy\n m1rw==", "X-Gm-Message-State": "AOJu0YwZMQqgj6KlxSAfFvGe0AFlP1VQwXfm4Q8t8muVMgEAJX4JJV+8\n 6MuqIK4XxRsuCaM9G9e8TMU4WZmCI7SNKo0yioc=", "X-Google-Smtp-Source": "\n AGHT+IEStY8YDQy2cQ2IPiFKRkJ/cEmOUwYxmSqEtqpA4kq1QZQ3N/GtsgPriLscL1eM+xNf8th0gg==", "X-Received": "by 2002:a05:6a00:2d89:b0:6cd:e8c3:f733 with SMTP id\n fb9-20020a056a002d8900b006cde8c3f733mr782255pfb.3.1701742434116;\n Mon, 04 Dec 2023 18:13:54 -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 06/18] acl: convert RTE_LOGTYPE_ACL to dynamic type", "Date": "Mon, 4 Dec 2023 18:09:44 -0800", "Message-ID": "<20231205021330.260017-7-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.42.0", "In-Reply-To": "<20231205021330.260017-1-stephen@networkplumber.org>", "References": "<20230329234049.11071-1-stephen@networkplumber.org>\n <20231205021330.260017-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 | 2 +-\n lib/acl/acl.h | 1 +\n lib/acl/acl_bld.c | 3 +++\n lib/acl/acl_gen.c | 1 +\n lib/acl/acl_log.h | 6 ++++++\n lib/acl/rte_acl.c | 3 +++\n lib/acl/tb_mem.c | 3 ++-\n lib/log/log.c | 2 --\n lib/log/rte_log.h | 4 ++--\n 9 files changed, 19 insertions(+), 6 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 8011639ddd1f..503ff0889405 100644\n--- a/app/test/test_acl.c\n+++ b/app/test/test_acl.c\n@@ -154,7 +154,7 @@ 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, \"%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.h b/lib/acl/acl.h\nindex c8e4e72fabfb..baed9513cb31 100644\n--- a/lib/acl/acl.h\n+++ b/lib/acl/acl.h\n@@ -225,6 +225,7 @@ int\n rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data,\n \tuint32_t *results, uint32_t num, uint32_t categories);\n \n+\n #ifdef __cplusplus\n }\n #endif /* __cplusplus */\ndiff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c\nindex 418751e9f4c7..eaf8770415a5 100644\n--- a/lib/acl/acl_bld.c\n+++ b/lib/acl/acl_bld.c\n@@ -3,8 +3,11 @@\n */\n \n #include <rte_acl.h>\n+#include <rte_log.h>\n+\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\ndiff --git a/lib/acl/acl_gen.c b/lib/acl/acl_gen.c\nindex 25e75fec3534..03a47ea231ec 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 \ndiff --git a/lib/acl/acl_log.h b/lib/acl/acl_log.h\nnew file mode 100644\nindex 000000000000..6147116d8d12\n--- /dev/null\n+++ b/lib/acl/acl_log.h\n@@ -0,0 +1,6 @@\n+/* SPDX-License-Identifier: BSD-3-Clause */\n+\n+#include <rte_log.h>\n+\n+extern int acl_logtype;\n+#define RTE_LOGTYPE_ACL\tacl_logtype\ndiff --git a/lib/acl/rte_acl.c b/lib/acl/rte_acl.c\nindex 4182006d1d1c..760c3587d4dc 100644\n--- a/lib/acl/rte_acl.c\n+++ b/lib/acl/rte_acl.c\n@@ -8,6 +8,9 @@\n #include <rte_tailq.h>\n \n #include \"acl.h\"\n+#include \"acl_log.h\"\n+\n+RTE_LOG_REGISTER_DEFAULT(acl_logtype, INFO);\n \n TAILQ_HEAD(rte_acl_list, rte_tailq_entry);\n \ndiff --git a/lib/acl/tb_mem.c b/lib/acl/tb_mem.c\nindex f14d7b4fa26e..6a9d96aaeda2 100644\n--- a/lib/acl/tb_mem.c\n+++ b/lib/acl/tb_mem.c\n@@ -3,6 +3,7 @@\n */\n \n #include \"tb_mem.h\"\n+#include \"acl_log.h\"\n \n /*\n * Memory management routines for temporary memory.\n@@ -25,7 +26,7 @@ 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\tRTE_LOG(ERR, ACL, \"%s(%zu)\\n failed, currently allocated \"\n \t\t\t\"by pool: %zu bytes\\n\", __func__, sz, pool->alloc);\n \t\tsiglongjmp(pool->fail, -ENOMEM);\n \t\treturn NULL;\ndiff --git a/lib/log/log.c b/lib/log/log.c\nindex 0718b84dcb04..49ee89ffdd97 100644\n--- a/lib/log/log.c\n+++ b/lib/log/log.c\n@@ -352,13 +352,11 @@ 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_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/log/rte_log.h b/lib/log/rte_log.h\nindex bd10e32fe164..0c651f58b58e 100644\n--- a/lib/log/rte_log.h\n+++ b/lib/log/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 \t\t\t\t /* was RTE_LOGTYPE_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": [ "06/18" ] }