From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AD1E6A04DD; Wed, 28 Oct 2020 10:12:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 33A7CC7EC; Wed, 28 Oct 2020 10:06:40 +0100 (CET) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by dpdk.org (Postfix) with ESMTP id 681F0C7E8 for ; Wed, 28 Oct 2020 10:06:38 +0100 (CET) Received: by mail-io1-f65.google.com with SMTP id z5so4578331iob.1 for ; Wed, 28 Oct 2020 02:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fW0GZB47RFZhXk3uPDAur9dMp0Mq3wpJetRX+XuUWY8=; b=gaOuXuhmFEWDpK+/m4YO6wBt0bdJYDSWz6tpGHJN7RGrBMesCax2JNtah2p6W/e+nf TAR0StgEChKcqYH4alGVTcKFfAWrEJ1IUmfepFerMaXw5xaHuB93oI0g/BilpYfSdgpq LW0SR4Cfj71wPXKaqE1mfUlQzCtO8/oQmwbYDeT+5wgi2o+XGVX8DK1yWFjEBRUPFE4B oHgvJHNQcOuzQR98F0XI16CU1706KnxCfNgrpZHIViCip7Bc3p8SW5rPetJv+i9D52pe 2z8zyIRvqgz4o86WyItlUTyNDE5no0DnQP/3Vqp399GtBudVOh8FbDLbCafoBXotj4lh MOKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fW0GZB47RFZhXk3uPDAur9dMp0Mq3wpJetRX+XuUWY8=; b=CHNNzGdAxFJ3S4mJ9RhBzd2EMVFZgeSiYQ/q4pZYzB/NQTiHqX6zA03HBCfJRYT7t8 YFRIwIoePgxvFmHcPyTfCnGX1Wf9refF8+41b/JYmuHTWQfGLtxxQ3zubZRUx+wn2cCv cNa96CyIGf4kZ27plwwdkfAlGoGCXU5K67GjnDkbpQM5Z03UQq8Q+C9qYFMcY0nZqTZ6 gtr8Xr7lAR1KbO9FWz+Z6P9wJd7hGKe6RWFaMAmNt49uNDKyx6xtZMnVLPkrGClFQIP9 4VPOskjqTniStrCl2mw07rUU9HL6k2akihZKmCBAzRi6Ow6nBWDjyL3lutiIK6oqpoLd Hrhg== X-Gm-Message-State: AOAM531NJq6HpjQr0jGE8tjipvw94WpaPp18hOQbiOMNexMbU3OOqmlR PjgvLwouWi2QVZTE+TUiwQQyIBtD6BvpjFni/wY= X-Google-Smtp-Source: ABdhPJx8wuaCtxjZl11GtCZ4qodEQYpZA22szMAR31dD1YoUs8NboCHNNQAeJSKqQf91Q1fLqwAyUpslO93HFs2J8Wo= X-Received: by 2002:a6b:5019:: with SMTP id e25mr5451672iob.123.1603875996640; Wed, 28 Oct 2020 02:06:36 -0700 (PDT) MIME-Version: 1.0 References: <20201023080058.13335-1-david.marchand@redhat.com> <20201023080058.13335-3-david.marchand@redhat.com> In-Reply-To: <20201023080058.13335-3-david.marchand@redhat.com> From: Jerin Jacob Date: Wed, 28 Oct 2020 14:36:20 +0530 Message-ID: To: David Marchand Cc: dpdk-dev , Jerin Jacob , Sunil Kumar Kori Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH 2/3] 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" On Fri, Oct 23, 2020 at 1:32 PM David Marchand wrote: > > Rework registration so that it uses dynamic allocations and has no size > limit. > > Signed-off-by: David Marchand Reviewed-by: Jerin Jacob > --- > 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 bc86432902..884dd0fa4b 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 { > -- > 2.23.0 >