From patchwork Wed Oct 28 21:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 82681 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3B81BA04B5; Wed, 28 Oct 2020 22:03:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB0D55AB3; Wed, 28 Oct 2020 22:03:12 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 57C25594B for ; Wed, 28 Oct 2020 22:03:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603918984; 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=iEA170tC74h4ZGaYI3K6/+EuxEXF1B+HZo4Oa7Z3uNc=; b=M8Z4/YyciuahMIyJMI+VZJ7TXSa0ehktgHhAQ+ML1S2WdElbzSrfFaiJCnTW0YHq1mNWyl 0qtfGuXulmnsQoZw2Rkec277uzFGrCnwtX6Fdz5LoRVBS0lXg9W1RGeoi0ZvU37aAOWGqM jLh1ARPusaJWw7PX3z+YKg8cAG1hOHY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-418-GlbHcUf5OZG4lJNQfJ8Gqw-1; Wed, 28 Oct 2020 17:03:03 -0400 X-MC-Unique: GlbHcUf5OZG4lJNQfJ8Gqw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E04E01882FAA; Wed, 28 Oct 2020 21:03:01 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id D850855766; Wed, 28 Oct 2020 21:03:00 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: jerinj@marvell.com, skori@marvell.com Date: Wed, 28 Oct 2020 22:02:47 +0100 Message-Id: <20201028210249.9021-3-david.marchand@redhat.com> In-Reply-To: <20201028210249.9021-1-david.marchand@redhat.com> References: <20201023080058.13335-1-david.marchand@redhat.com> <20201028210249.9021-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v2 2/4] trace: remove size limit on CTF event description X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Rework registration so that it uses dynamic allocations and has no size limit. Signed-off-by: David Marchand Reviewed-by: Jerin Jacob Acked-by: Sunil Kumar Kori --- lib/librte_eal/common/eal_common_trace.c | 39 +++++++++----------- lib/librte_eal/common/eal_common_trace_ctf.c | 3 +- lib/librte_eal/common/eal_trace.h | 3 +- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c index 80b458edb6..bc031ca719 100644 --- a/lib/librte_eal/common/eal_common_trace.c +++ b/lib/librte_eal/common/eal_common_trace.c @@ -17,8 +17,7 @@ RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz); RTE_DEFINE_PER_LCORE(void *, trace_mem); -static RTE_DEFINE_PER_LCORE(char, ctf_field[TRACE_CTF_FIELD_SIZE]); -static RTE_DEFINE_PER_LCORE(int, ctf_count); +static RTE_DEFINE_PER_LCORE(char *, ctf_field); static struct trace_point_head tp_list = STAILQ_HEAD_INITIALIZER(tp_list); static struct trace trace = { .args = STAILQ_HEAD_INITIALIZER(trace.args), }; @@ -429,32 +428,33 @@ trace_mem_free(void) void __rte_trace_point_emit_field(size_t sz, const char *in, const char *datatype) { - char *field = RTE_PER_LCORE(ctf_field); - int count = RTE_PER_LCORE(ctf_count); - size_t size; + char *field; char *fixup; int rc; - size = RTE_MAX(0, TRACE_CTF_FIELD_SIZE - 1 - count); - RTE_PER_LCORE(trace_point_sz) += sz; fixup = trace_metadata_fixup_field(in); if (fixup != NULL) in = fixup; - rc = snprintf(RTE_PTR_ADD(field, count), size, "%s %s;", datatype, in); + rc = asprintf(&field, "%s%s %s;", + RTE_PER_LCORE(ctf_field) != NULL ? + RTE_PER_LCORE(ctf_field) : "", + datatype, in); + free(RTE_PER_LCORE(ctf_field)); free(fixup); - if (rc <= 0 || (size_t)rc >= size) { + if (rc == -1) { RTE_PER_LCORE(trace_point_sz) = 0; - trace_crit("CTF field is too long"); + RTE_PER_LCORE(ctf_field) = NULL; + trace_crit("could not allocate CTF field"); return; } - RTE_PER_LCORE(ctf_count) += rc; + RTE_PER_LCORE(trace_point_sz) += sz; + RTE_PER_LCORE(ctf_field) = field; } int __rte_trace_point_register(rte_trace_point_t *handle, const char *name, void (*register_fn)(void)) { - char *field = RTE_PER_LCORE(ctf_field); struct trace_point *tp; uint16_t sz; @@ -467,7 +467,6 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name, /* Check the size of the trace point object */ RTE_PER_LCORE(trace_point_sz) = 0; - RTE_PER_LCORE(ctf_count) = 0; register_fn(); if (RTE_PER_LCORE(trace_point_sz) == 0) { trace_err("missing rte_trace_emit_header() in register fn"); @@ -505,15 +504,11 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name, goto free; } - /* Copy the field data for future use */ - if (rte_strscpy(tp->ctf_field, field, TRACE_CTF_FIELD_SIZE) < 0) { - trace_err("CTF field size is too long"); - rte_errno = E2BIG; - goto free; - } - - /* Clear field memory for the next event */ - memset(field, 0, TRACE_CTF_FIELD_SIZE); + /* Copy the accumulated fields description and clear it for the next + * trace point. + */ + tp->ctf_field = RTE_PER_LCORE(ctf_field); + RTE_PER_LCORE(ctf_field) = NULL; /* Form the trace handle */ *handle = sz; diff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/librte_eal/common/eal_common_trace_ctf.c index 174cdac1b0..ac1f64d04b 100644 --- a/lib/librte_eal/common/eal_common_trace_ctf.c +++ b/lib/librte_eal/common/eal_common_trace_ctf.c @@ -233,7 +233,8 @@ meta_event_emit(char **meta, int *offset, struct trace_point *tp) " fields := struct {\n" " %s\n" " };\n" - "};\n\n", trace_id_get(tp->handle), tp->name, tp->ctf_field); + "};\n\n", trace_id_get(tp->handle), tp->name, + tp->ctf_field != NULL ? tp->ctf_field : ""); return meta_copy(meta, offset, str, rc); } diff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h index 8a3f6c5359..06751eb23a 100644 --- a/lib/librte_eal/common/eal_trace.h +++ b/lib/librte_eal/common/eal_trace.h @@ -24,7 +24,6 @@ #define TRACE_PREFIX_LEN 12 #define TRACE_DIR_STR_LEN (sizeof("YYYY-mm-dd-AM-HH-MM-SS") + TRACE_PREFIX_LEN) -#define TRACE_CTF_FIELD_SIZE 448 #define TRACE_POINT_NAME_SIZE 64 #define TRACE_CTF_MAGIC 0xC1FC1FC1 #define TRACE_MAX_ARGS 32 @@ -33,7 +32,7 @@ struct trace_point { STAILQ_ENTRY(trace_point) next; rte_trace_point_t *handle; char name[TRACE_POINT_NAME_SIZE]; - char ctf_field[TRACE_CTF_FIELD_SIZE]; + char *ctf_field; }; enum trace_area_e {