From patchwork Mon Dec 18 09:27:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 135258 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 1D79043733; Mon, 18 Dec 2023 10:29:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51EF8427D9; Mon, 18 Dec 2023 10:28:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4A63C40E09 for ; Mon, 18 Dec 2023 10:28:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702891706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=65EQsXBikjuLBqYYRnKAaW5ur6YMVzcPFCx3w7C7deA=; b=OnWan84CMlhvkBxwdFOaIqKZHuxdCvf1RhVM1hVk+WGjOi65RHjZy9o2psBjcLBBIN53IG 7xKd1K3mtoQxpoaVnPlFFLxBERgmfNDcBOIupFe716lPy1tAuTPfNYmUQuJJFymLIpT9oN /LuLEXx8XtZ8WelM7vuCipKWfEx2FI8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-528-0E__gkIaO8SeUIJYQ0LvMQ-1; Mon, 18 Dec 2023 04:28:23 -0500 X-MC-Unique: 0E__gkIaO8SeUIJYQ0LvMQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 94912881F49; Mon, 18 Dec 2023 09:28:22 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.224.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 291792166B31; Mon, 18 Dec 2023 09:28:21 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@amd.com, bruce.richardson@intel.com, stephen@networkplumber.org, mb@smartsharesystems.com, Honnappa Nagarahalli , Tyler Retzlaff 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> <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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add a simple helper for logging messages in this library. Signed-off-by: David Marchand Reviewed-by: Stephen Hemminger Reviewed-by: Honnappa Nagarahalli Reviewed-by: Tyler Retzlaff --- lib/rcu/rte_rcu_qsbr.c | 62 ++++++++++++++++-------------------------- lib/rcu/rte_rcu_qsbr.h | 1 + 2 files changed, 24 insertions(+), 39 deletions(-) diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c index 41a44be4b9..5b6530788a 100644 --- a/lib/rcu/rte_rcu_qsbr.c +++ b/lib/rcu/rte_rcu_qsbr.c @@ -19,6 +19,9 @@ #include "rte_rcu_qsbr.h" #include "rcu_qsbr_pvt.h" +#define RCU_LOG(level, fmt, args...) \ + RTE_LOG(level, RCU, "%s(): " fmt "\n", __func__, ## args) + /* Get the memory size of QSBR variable */ size_t rte_rcu_qsbr_get_memsize(uint32_t max_threads) @@ -26,9 +29,7 @@ rte_rcu_qsbr_get_memsize(uint32_t max_threads) size_t sz; if (max_threads == 0) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid max_threads %u\n", - __func__, max_threads); + RCU_LOG(ERR, "Invalid max_threads %u", max_threads); rte_errno = EINVAL; return 1; @@ -52,8 +53,7 @@ rte_rcu_qsbr_init(struct rte_rcu_qsbr *v, uint32_t max_threads) size_t sz; if (v == NULL) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -85,8 +85,7 @@ rte_rcu_qsbr_thread_register(struct rte_rcu_qsbr *v, unsigned int thread_id) uint64_t old_bmap, new_bmap; if (v == NULL || thread_id >= v->max_threads) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -137,8 +136,7 @@ rte_rcu_qsbr_thread_unregister(struct rte_rcu_qsbr *v, unsigned int thread_id) uint64_t old_bmap, new_bmap; if (v == NULL || thread_id >= v->max_threads) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -211,8 +209,7 @@ rte_rcu_qsbr_dump(FILE *f, struct rte_rcu_qsbr *v) uint32_t i, t, id; if (v == NULL || f == NULL) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -282,8 +279,7 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params) params->v == NULL || params->name == NULL || params->size == 0 || params->esize == 0 || (params->esize % 4 != 0)) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return NULL; @@ -293,9 +289,10 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params) */ if ((params->trigger_reclaim_limit <= params->size) && (params->max_reclaim_size == 0)) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter, size = %u, trigger_reclaim_limit = %u, max_reclaim_size = %u\n", - __func__, params->size, params->trigger_reclaim_limit, + RCU_LOG(ERR, + "Invalid input parameter, size = %u, trigger_reclaim_limit = %u, " + "max_reclaim_size = %u", + params->size, params->trigger_reclaim_limit, params->max_reclaim_size); rte_errno = EINVAL; @@ -328,8 +325,7 @@ rte_rcu_qsbr_dq_create(const struct rte_rcu_qsbr_dq_parameters *params) __RTE_QSBR_TOKEN_SIZE + params->esize, qs_fifo_size, SOCKET_ID_ANY, flags); if (dq->r == NULL) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): defer queue create failed\n", __func__); + RCU_LOG(ERR, "defer queue create failed"); rte_free(dq); return NULL; } @@ -354,8 +350,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) uint32_t cur_size; if (dq == NULL || e == NULL) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -372,8 +367,7 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) */ cur_size = rte_ring_count(dq->r); if (cur_size > dq->trigger_reclaim_limit) { - rte_log(RTE_LOG_INFO, rte_rcu_log_type, - "%s(): Triggering reclamation\n", __func__); + RCU_LOG(INFO, "Triggering reclamation"); rte_rcu_qsbr_dq_reclaim(dq, dq->max_reclaim_size, NULL, NULL, NULL); } @@ -391,23 +385,18 @@ int rte_rcu_qsbr_dq_enqueue(struct rte_rcu_qsbr_dq *dq, void *e) * Enqueue uses the configured flags when the DQ was created. */ if (rte_ring_enqueue_elem(dq->r, data, dq->esize) != 0) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Enqueue failed\n", __func__); + RCU_LOG(ERR, "Enqueue failed"); /* Note that the token generated above is not used. * Other than wasting tokens, it should not cause any * other issues. */ - rte_log(RTE_LOG_INFO, rte_rcu_log_type, - "%s(): Skipped enqueuing token = %" PRIu64 "\n", - __func__, dq_elem->token); + RCU_LOG(INFO, "Skipped enqueuing token = %" PRIu64, dq_elem->token); rte_errno = ENOSPC; return 1; } - rte_log(RTE_LOG_INFO, rte_rcu_log_type, - "%s(): Enqueued token = %" PRIu64 "\n", - __func__, dq_elem->token); + RCU_LOG(INFO, "Enqueued token = %" PRIu64, dq_elem->token); return 0; } @@ -422,8 +411,7 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n, __rte_rcu_qsbr_dq_elem_t *dq_elem; if (dq == NULL || n == 0) { - rte_log(RTE_LOG_ERR, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(ERR, "Invalid input parameter"); rte_errno = EINVAL; return 1; @@ -445,17 +433,14 @@ rte_rcu_qsbr_dq_reclaim(struct rte_rcu_qsbr_dq *dq, unsigned int n, } rte_ring_dequeue_elem_finish(dq->r, 1); - rte_log(RTE_LOG_INFO, rte_rcu_log_type, - "%s(): Reclaimed token = %" PRIu64 "\n", - __func__, dq_elem->token); + RCU_LOG(INFO, "Reclaimed token = %" PRIu64, dq_elem->token); dq->free_fn(dq->p, dq_elem->elem, 1); cnt++; } - rte_log(RTE_LOG_INFO, rte_rcu_log_type, - "%s(): Reclaimed %u resources\n", __func__, cnt); + RCU_LOG(INFO, "Reclaimed %u resources", cnt); if (freed != NULL) *freed = cnt; @@ -472,8 +457,7 @@ rte_rcu_qsbr_dq_delete(struct rte_rcu_qsbr_dq *dq) unsigned int pending; if (dq == NULL) { - rte_log(RTE_LOG_DEBUG, rte_rcu_log_type, - "%s(): Invalid input parameter\n", __func__); + RCU_LOG(DEBUG, "Invalid input parameter"); return 0; } diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h index 6b908e7ee0..0dca8310c0 100644 --- a/lib/rcu/rte_rcu_qsbr.h +++ b/lib/rcu/rte_rcu_qsbr.h @@ -36,6 +36,7 @@ extern "C" { #include extern int rte_rcu_log_type; +#define RTE_LOGTYPE_RCU rte_rcu_log_type #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG #define __RTE_RCU_DP_LOG(level, fmt, args...) \