From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2830BA0560; Tue, 18 Oct 2022 15:28:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C59E42B6D; Tue, 18 Oct 2022 15:27:40 +0200 (CEST) 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 68CD24282F for ; Tue, 18 Oct 2022 15:27:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666099657; 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=pHG1F4tApwHwoNoWmHSx8adeLcq4BMh6DkIW7dJ/E2Q=; b=a+VS4SWrgFnDjK/MexPTCyybYJ2MBA62rBCJUSipVS1CocwKsk5CfANjd2rmZ7pA4bsyGT 1YGWWMt08SNo7Cc9t4+OsDTxFbgkh+5IHqG4eZTadDjCxHf3fzBAoujgprxVdMTCGOQcx6 vEoxujilLgimmpZVGfZQafYS0KhplAE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-waqZaFcbOGWiOL_2ZdFZ7g-1; Tue, 18 Oct 2022 09:27:36 -0400 X-MC-Unique: waqZaFcbOGWiOL_2ZdFZ7g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 838A5882823; Tue, 18 Oct 2022 13:27:36 +0000 (UTC) Received: from localhost.localdomain (ovpn-192-244.brq.redhat.com [10.40.192.244]) by smtp.corp.redhat.com (Postfix) with ESMTP id B79CE4081B61; Tue, 18 Oct 2022 13:27:35 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: jerinj@marvell.com, skori@marvell.com Subject: [PATCH v4 08/11] trace: remove limitation on trace point name Date: Tue, 18 Oct 2022 15:26:51 +0200 Message-Id: <20221018132654.3760561-9-david.marchand@redhat.com> In-Reply-To: <20221018132654.3760561-1-david.marchand@redhat.com> References: <20220921120359.2201131-1-david.marchand@redhat.com> <20221018132654.3760561-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The name of a trace point is provided as a constant string via the RTE_TRACE_POINT_REGISTER macro. We can rely on an explicit constant string in the binary and simply point at it. There is then no need for a (fixed size) copy. Signed-off-by: David Marchand --- Changes since v2: - stored trace point name in a static variable to make sure the string is put in .data, --- lib/eal/common/eal_common_trace.c | 10 +++------- lib/eal/common/eal_common_trace_utils.c | 2 +- lib/eal/common/eal_trace.h | 3 +-- lib/eal/include/rte_trace_point_register.h | 3 ++- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c index ec168e37b3..5caaac8e59 100644 --- a/lib/eal/common/eal_common_trace.c +++ b/lib/eal/common/eal_common_trace.c @@ -235,7 +235,7 @@ rte_trace_point_lookup(const char *name) return NULL; STAILQ_FOREACH(tp, &tp_list, next) - if (strncmp(tp->name, name, TRACE_POINT_NAME_SIZE) == 0) + if (strcmp(tp->name, name) == 0) return tp->handle; return NULL; @@ -492,10 +492,7 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name, } /* Initialize the trace point */ - if (rte_strscpy(tp->name, name, TRACE_POINT_NAME_SIZE) < 0) { - trace_err("name is too long"); - goto free; - } + tp->name = name; /* Copy the accumulated fields description and clear it for the next * trace point. @@ -517,8 +514,7 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name, /* All Good !!! */ return 0; -free: - free(tp); + fail: if (trace.register_errno == 0) trace.register_errno = rte_errno; diff --git a/lib/eal/common/eal_common_trace_utils.c b/lib/eal/common/eal_common_trace_utils.c index 7bf1c05e12..72108d36a6 100644 --- a/lib/eal/common/eal_common_trace_utils.c +++ b/lib/eal/common/eal_common_trace_utils.c @@ -42,7 +42,7 @@ trace_entry_compare(const char *name) int count = 0; STAILQ_FOREACH(tp, tp_list, next) { - if (strncmp(tp->name, name, TRACE_POINT_NAME_SIZE) == 0) + if (strcmp(tp->name, name) == 0) count++; if (count > 1) { trace_err("found duplicate entry %s", name); diff --git a/lib/eal/common/eal_trace.h b/lib/eal/common/eal_trace.h index 72a5a461ae..26a18a2c48 100644 --- a/lib/eal/common/eal_trace.h +++ b/lib/eal/common/eal_trace.h @@ -24,14 +24,13 @@ #define TRACE_PREFIX_LEN 12 #define TRACE_DIR_STR_LEN (sizeof("YYYY-mm-dd-AM-HH-MM-SS") + TRACE_PREFIX_LEN) -#define TRACE_POINT_NAME_SIZE 64 #define TRACE_CTF_MAGIC 0xC1FC1FC1 #define TRACE_MAX_ARGS 32 struct trace_point { STAILQ_ENTRY(trace_point) next; rte_trace_point_t *handle; - char name[TRACE_POINT_NAME_SIZE]; + const char *name; char *ctf_field; }; diff --git a/lib/eal/include/rte_trace_point_register.h b/lib/eal/include/rte_trace_point_register.h index 2e61439940..a32f4d731b 100644 --- a/lib/eal/include/rte_trace_point_register.h +++ b/lib/eal/include/rte_trace_point_register.h @@ -20,9 +20,10 @@ RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz); #define RTE_TRACE_POINT_REGISTER(trace, name) \ rte_trace_point_t __attribute__((section("__rte_trace_point"))) __##trace; \ +static const char __##trace##_name[] = RTE_STR(name); \ RTE_INIT(trace##_init) \ { \ - __rte_trace_point_register(&__##trace, RTE_STR(name), \ + __rte_trace_point_register(&__##trace, __##trace##_name, \ (void (*)(void)) trace); \ } -- 2.37.3