Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/135258/?format=api
{ "id": 135258, "url": "http://patches.dpdk.org/api/patches/135258/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231218092738.749604-10-david.marchand@redhat.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": "<20231218092738.749604-10-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231218092738.749604-10-david.marchand@redhat.com", "date": "2023-12-18T09:27:31", "name": "[v3,09/14] rcu: introduce a logging helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "cfc8a58a5e13aff44f69b9d0e95881e996879a8d", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "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/20231218092738.749604-10-david.marchand@redhat.com/mbox/", "series": [ { "id": 30587, "url": "http://patches.dpdk.org/api/series/30587/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30587", "date": "2023-12-18T09:27:22", "name": "Detect superfluous newline in logs", "version": 3, "mbox": "http://patches.dpdk.org/series/30587/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/135258/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/135258/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 1D79043733;\n\tMon, 18 Dec 2023 10:29:02 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 51EF8427D9;\n\tMon, 18 Dec 2023 10:28:29 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 4A63C40E09\n for <dev@dpdk.org>; Mon, 18 Dec 2023 10:28:27 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-528-0E__gkIaO8SeUIJYQ0LvMQ-1; Mon, 18 Dec 2023 04:28:23 -0500", "from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com\n [10.11.54.6])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94912881F49;\n Mon, 18 Dec 2023 09:28:22 +0000 (UTC)", "from dmarchan.redhat.com (unknown [10.45.224.218])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 291792166B31;\n Mon, 18 Dec 2023 09:28:21 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1702891706;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=65EQsXBikjuLBqYYRnKAaW5ur6YMVzcPFCx3w7C7deA=;\n b=OnWan84CMlhvkBxwdFOaIqKZHuxdCvf1RhVM1hVk+WGjOi65RHjZy9o2psBjcLBBIN53IG\n 7xKd1K3mtoQxpoaVnPlFFLxBERgmfNDcBOIupFe716lPy1tAuTPfNYmUQuJJFymLIpT9oN\n /LuLEXx8XtZ8WelM7vuCipKWfEx2FI8=", "X-MC-Unique": "0E__gkIaO8SeUIJYQ0LvMQ-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net, ferruh.yigit@amd.com, bruce.richardson@intel.com,\n stephen@networkplumber.org, mb@smartsharesystems.com,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH v3 09/14] rcu: introduce a logging helper", "Date": "Mon, 18 Dec 2023 10:27:31 +0100", "Message-ID": "<20231218092738.749604-10-david.marchand@redhat.com>", "In-Reply-To": "<20231218092738.749604-1-david.marchand@redhat.com>", "References": "<20231117131824.1977792-1-david.marchand@redhat.com>\n <20231218092738.749604-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.6", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "Add a simple helper for logging messages in this library.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\nReviewed-by: Stephen Hemminger <stephen@networkplumber.org>\nReviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>\nReviewed-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\n---\n lib/rcu/rte_rcu_qsbr.c | 62 ++++++++++++++++--------------------------\n lib/rcu/rte_rcu_qsbr.h | 1 +\n 2 files changed, 24 insertions(+), 39 deletions(-)", "diff": "diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c\nindex 41a44be4b9..5b6530788a 100644\n--- a/lib/rcu/rte_rcu_qsbr.c\n+++ b/lib/rcu/rte_rcu_qsbr.c\n@@ -19,6 +19,9 @@\n #include \"rte_rcu_qsbr.h\"\n #include \"rcu_qsbr_pvt.h\"\n \n+#define RCU_LOG(level, fmt, args...) \\\n+\tRTE_LOG(level, RCU, \"%s(): \" fmt \"\\n\", __func__, ## args)\n+\n /* Get the memory size of QSBR variable */\n size_t\n rte_rcu_qsbr_get_memsize(uint32_t max_threads)\n@@ -26,9 +29,7 @@ rte_rcu_qsbr_get_memsize(uint32_t max_threads)\n \tsize_t sz;\n \n \tif (max_threads == 0) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid max_threads %u\\n\",\n-\t\t\t__func__, max_threads);\n+\t\tRCU_LOG(ERR, \"Invalid max_threads %u\", max_threads);\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -52,8 +53,7 @@ rte_rcu_qsbr_init(struct rte_rcu_qsbr *v, uint32_t max_threads)\n \tsize_t sz;\n \n \tif (v == NULL) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -85,8 +85,7 @@ rte_rcu_qsbr_thread_register(struct rte_rcu_qsbr *v, unsigned int thread_id)\n \tuint64_t old_bmap, new_bmap;\n \n \tif (v == NULL || thread_id >= v->max_threads) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -137,8 +136,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr *v, unsigned int thread_id)\n \tuint64_t old_bmap, new_bmap;\n \n \tif (v == NULL || thread_id >= v->max_threads) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -211,8 +209,7 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v)\n \tuint32_t i, t, id;\n \n \tif (v == NULL || f == NULL) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -282,8 +279,7 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params)\n \t\tparams->v == NULL || params->name == NULL ||\n \t\tparams->size == 0 || params->esize == 0 ||\n \t\t(params->esize % 4 != 0)) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn NULL;\n@@ -293,9 +289,10 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params)\n \t */\n \tif ((params->trigger_reclaim_limit <= params->size) &&\n \t (params->max_reclaim_size == 0)) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter, size = %u, trigger_reclaim_limit = %u, max_reclaim_size = %u\\n\",\n-\t\t\t__func__, params->size, params->trigger_reclaim_limit,\n+\t\tRCU_LOG(ERR,\n+\t\t\t\"Invalid input parameter, size = %u, trigger_reclaim_limit = %u, \"\n+\t\t\t\"max_reclaim_size = %u\",\n+\t\t\tparams->size, params->trigger_reclaim_limit,\n \t\t\tparams->max_reclaim_size);\n \t\trte_errno = EINVAL;\n \n@@ -328,8 +325,7 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params)\n \t\t\t__RTE_QSBR_TOKEN_SIZE + params->esize,\n \t\t\tqs_fifo_size, SOCKET_ID_ANY, flags);\n \tif (dq->r == NULL) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): defer queue create failed\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"defer queue create failed\");\n \t\trte_free(dq);\n \t\treturn NULL;\n \t}\n@@ -354,8 +350,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e)\n \tuint32_t cur_size;\n \n \tif (dq == NULL || e == NULL) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -372,8 +367,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e)\n \t */\n \tcur_size = rte_ring_count(dq->r);\n \tif (cur_size > dq->trigger_reclaim_limit) {\n-\t\trte_log(RTE_LOG_INFO, rte_rcu_log_type,\n-\t\t\t\"%s(): Triggering reclamation\\n\", __func__);\n+\t\tRCU_LOG(INFO, \"Triggering reclamation\");\n \t\trte_rcu_qsbr_dq_reclaim(dq, dq->max_reclaim_size,\n \t\t\t\t\t\tNULL, NULL, NULL);\n \t}\n@@ -391,23 +385,18 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e)\n \t * Enqueue uses the configured flags when the DQ was created.\n \t */\n \tif (rte_ring_enqueue_elem(dq->r, data, dq->esize) != 0) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Enqueue failed\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Enqueue failed\");\n \t\t/* Note that the token generated above is not used.\n \t\t * Other than wasting tokens, it should not cause any\n \t\t * other issues.\n \t\t */\n-\t\trte_log(RTE_LOG_INFO, rte_rcu_log_type,\n-\t\t\t\"%s(): Skipped enqueuing token = %\" PRIu64 \"\\n\",\n-\t\t\t__func__, dq_elem->token);\n+\t\tRCU_LOG(INFO, \"Skipped enqueuing token = %\" PRIu64, dq_elem->token);\n \n \t\trte_errno = ENOSPC;\n \t\treturn 1;\n \t}\n \n-\trte_log(RTE_LOG_INFO, rte_rcu_log_type,\n-\t\t\"%s(): Enqueued token = %\" PRIu64 \"\\n\",\n-\t\t__func__, dq_elem->token);\n+\tRCU_LOG(INFO, \"Enqueued token = %\" PRIu64, dq_elem->token);\n \n \treturn 0;\n }\n@@ -422,8 +411,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n,\n \t__rte_rcu_qsbr_dq_elem_t *dq_elem;\n \n \tif (dq == NULL || n == 0) {\n-\t\trte_log(RTE_LOG_ERR, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(ERR, \"Invalid input parameter\");\n \t\trte_errno = EINVAL;\n \n \t\treturn 1;\n@@ -445,17 +433,14 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n,\n \t\t}\n \t\trte_ring_dequeue_elem_finish(dq->r, 1);\n \n-\t\trte_log(RTE_LOG_INFO, rte_rcu_log_type,\n-\t\t\t\"%s(): Reclaimed token = %\" PRIu64 \"\\n\",\n-\t\t\t__func__, dq_elem->token);\n+\t\tRCU_LOG(INFO, \"Reclaimed token = %\" PRIu64, dq_elem->token);\n \n \t\tdq->free_fn(dq->p, dq_elem->elem, 1);\n \n \t\tcnt++;\n \t}\n \n-\trte_log(RTE_LOG_INFO, rte_rcu_log_type,\n-\t\t\"%s(): Reclaimed %u resources\\n\", __func__, cnt);\n+\tRCU_LOG(INFO, \"Reclaimed %u resources\", cnt);\n \n \tif (freed != NULL)\n \t\t*freed = cnt;\n@@ -472,8 +457,7 @@ rte_rcu_qsbr_dq_delete(struct rte_rcu_qsbr_dq *dq)\n \tunsigned int pending;\n \n \tif (dq == NULL) {\n-\t\trte_log(RTE_LOG_DEBUG, rte_rcu_log_type,\n-\t\t\t\"%s(): Invalid input parameter\\n\", __func__);\n+\t\tRCU_LOG(DEBUG, \"Invalid input parameter\");\n \n \t\treturn 0;\n \t}\ndiff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h\nindex 6b908e7ee0..0dca8310c0 100644\n--- a/lib/rcu/rte_rcu_qsbr.h\n+++ b/lib/rcu/rte_rcu_qsbr.h\n@@ -36,6 +36,7 @@ extern \"C\" {\n #include <rte_ring.h>\n \n extern int rte_rcu_log_type;\n+#define RTE_LOGTYPE_RCU rte_rcu_log_type\n \n #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG\n #define __RTE_RCU_DP_LOG(level, fmt, args...) \\\n", "prefixes": [ "v3", "09/14" ] }