Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82681/?format=api
{ "id": 82681, "url": "https://patches.dpdk.org/api/patches/82681/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201028210249.9021-3-david.marchand@redhat.com/", "project": { "id": 1, "url": "https://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": "<20201028210249.9021-3-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201028210249.9021-3-david.marchand@redhat.com", "date": "2020-10-28T21:02:47", "name": "[v2,2/4] trace: remove size limit on CTF event description", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a6fa16696ae3c6699161a192d105b0f71edeb4a4", "submitter": { "id": 1173, "url": "https://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 24651, "url": "https://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201028210249.9021-3-david.marchand@redhat.com/mbox/", "series": [ { "id": 13435, "url": "https://patches.dpdk.org/api/series/13435/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=13435", "date": "2020-10-28T21:02:45", "name": "Rework CTF event description storage", "version": 2, "mbox": "https://patches.dpdk.org/series/13435/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/82681/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/82681/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 3B81BA04B5;\n\tWed, 28 Oct 2020 22:03:40 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id DB0D55AB3;\n\tWed, 28 Oct 2020 22:03:12 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [63.128.21.124])\n by dpdk.org (Postfix) with ESMTP id 57C25594B\n for <dev@dpdk.org>; Wed, 28 Oct 2020 22:03:06 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-418-GlbHcUf5OZG4lJNQfJ8Gqw-1; Wed, 28 Oct 2020 17:03:03 -0400", "from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com\n [10.5.11.15])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E04E01882FAA;\n Wed, 28 Oct 2020 21:03:01 +0000 (UTC)", "from dmarchan.remote.csb (unknown [10.40.192.40])\n by smtp.corp.redhat.com (Postfix) with ESMTP id D850855766;\n Wed, 28 Oct 2020 21:03:00 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1603918984;\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=iEA170tC74h4ZGaYI3K6/+EuxEXF1B+HZo4Oa7Z3uNc=;\n b=M8Z4/YyciuahMIyJMI+VZJ7TXSa0ehktgHhAQ+ML1S2WdElbzSrfFaiJCnTW0YHq1mNWyl\n 0qtfGuXulmnsQoZw2Rkec277uzFGrCnwtX6Fdz5LoRVBS0lXg9W1RGeoi0ZvU37aAOWGqM\n jLh1ARPusaJWw7PX3z+YKg8cAG1hOHY=", "X-MC-Unique": "GlbHcUf5OZG4lJNQfJ8Gqw-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "jerinj@marvell.com,\n\tskori@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>\n <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;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v2 2/4] trace: remove size limit on CTF event\n\tdescription", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Rework registration so that it uses dynamic allocations and has no size\nlimit.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\nReviewed-by: Jerin Jacob <jerinj@marvell.com>\n---\n lib/librte_eal/common/eal_common_trace.c | 39 +++++++++-----------\n lib/librte_eal/common/eal_common_trace_ctf.c | 3 +-\n lib/librte_eal/common/eal_trace.h | 3 +-\n 3 files changed, 20 insertions(+), 25 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c\nindex 80b458edb6..bc031ca719 100644\n--- a/lib/librte_eal/common/eal_common_trace.c\n+++ b/lib/librte_eal/common/eal_common_trace.c\n@@ -17,8 +17,7 @@\n \n RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz);\n RTE_DEFINE_PER_LCORE(void *, trace_mem);\n-static RTE_DEFINE_PER_LCORE(char, ctf_field[TRACE_CTF_FIELD_SIZE]);\n-static RTE_DEFINE_PER_LCORE(int, ctf_count);\n+static RTE_DEFINE_PER_LCORE(char *, ctf_field);\n \n static struct trace_point_head tp_list = STAILQ_HEAD_INITIALIZER(tp_list);\n static struct trace trace = { .args = STAILQ_HEAD_INITIALIZER(trace.args), };\n@@ -429,32 +428,33 @@ trace_mem_free(void)\n void\n __rte_trace_point_emit_field(size_t sz, const char *in, const char *datatype)\n {\n-\tchar *field = RTE_PER_LCORE(ctf_field);\n-\tint count = RTE_PER_LCORE(ctf_count);\n-\tsize_t size;\n+\tchar *field;\n \tchar *fixup;\n \tint rc;\n \n-\tsize = RTE_MAX(0, TRACE_CTF_FIELD_SIZE - 1 - count);\n-\tRTE_PER_LCORE(trace_point_sz) += sz;\n \tfixup = trace_metadata_fixup_field(in);\n \tif (fixup != NULL)\n \t\tin = fixup;\n-\trc = snprintf(RTE_PTR_ADD(field, count), size, \"%s %s;\", datatype, in);\n+\trc = asprintf(&field, \"%s%s %s;\",\n+\t\tRTE_PER_LCORE(ctf_field) != NULL ?\n+\t\t\tRTE_PER_LCORE(ctf_field) : \"\",\n+\t\tdatatype, in);\n+\tfree(RTE_PER_LCORE(ctf_field));\n \tfree(fixup);\n-\tif (rc <= 0 || (size_t)rc >= size) {\n+\tif (rc == -1) {\n \t\tRTE_PER_LCORE(trace_point_sz) = 0;\n-\t\ttrace_crit(\"CTF field is too long\");\n+\t\tRTE_PER_LCORE(ctf_field) = NULL;\n+\t\ttrace_crit(\"could not allocate CTF field\");\n \t\treturn;\n \t}\n-\tRTE_PER_LCORE(ctf_count) += rc;\n+\tRTE_PER_LCORE(trace_point_sz) += sz;\n+\tRTE_PER_LCORE(ctf_field) = field;\n }\n \n int\n __rte_trace_point_register(rte_trace_point_t *handle, const char *name,\n \t\tvoid (*register_fn)(void))\n {\n-\tchar *field = RTE_PER_LCORE(ctf_field);\n \tstruct trace_point *tp;\n \tuint16_t sz;\n \n@@ -467,7 +467,6 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name,\n \n \t/* Check the size of the trace point object */\n \tRTE_PER_LCORE(trace_point_sz) = 0;\n-\tRTE_PER_LCORE(ctf_count) = 0;\n \tregister_fn();\n \tif (RTE_PER_LCORE(trace_point_sz) == 0) {\n \t\ttrace_err(\"missing rte_trace_emit_header() in register fn\");\n@@ -505,15 +504,11 @@ __rte_trace_point_register(rte_trace_point_t *handle, const char *name,\n \t\tgoto free;\n \t}\n \n-\t/* Copy the field data for future use */\n-\tif (rte_strscpy(tp->ctf_field, field, TRACE_CTF_FIELD_SIZE) < 0) {\n-\t\ttrace_err(\"CTF field size is too long\");\n-\t\trte_errno = E2BIG;\n-\t\tgoto free;\n-\t}\n-\n-\t/* Clear field memory for the next event */\n-\tmemset(field, 0, TRACE_CTF_FIELD_SIZE);\n+\t/* Copy the accumulated fields description and clear it for the next\n+\t * trace point.\n+\t */\n+\ttp->ctf_field = RTE_PER_LCORE(ctf_field);\n+\tRTE_PER_LCORE(ctf_field) = NULL;\n \n \t/* Form the trace handle */\n \t*handle = sz;\ndiff --git a/lib/librte_eal/common/eal_common_trace_ctf.c b/lib/librte_eal/common/eal_common_trace_ctf.c\nindex 174cdac1b0..ac1f64d04b 100644\n--- a/lib/librte_eal/common/eal_common_trace_ctf.c\n+++ b/lib/librte_eal/common/eal_common_trace_ctf.c\n@@ -233,7 +233,8 @@ meta_event_emit(char **meta, int *offset, struct trace_point *tp)\n \t\t\" fields := struct {\\n\"\n \t\t\" %s\\n\"\n \t\t\" };\\n\"\n-\t\t\"};\\n\\n\", trace_id_get(tp->handle), tp->name, tp->ctf_field);\n+\t\t\"};\\n\\n\", trace_id_get(tp->handle), tp->name,\n+\t\ttp->ctf_field != NULL ? tp->ctf_field : \"\");\n \treturn meta_copy(meta, offset, str, rc);\n }\n \ndiff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h\nindex 8a3f6c5359..06751eb23a 100644\n--- a/lib/librte_eal/common/eal_trace.h\n+++ b/lib/librte_eal/common/eal_trace.h\n@@ -24,7 +24,6 @@\n \n #define TRACE_PREFIX_LEN 12\n #define TRACE_DIR_STR_LEN (sizeof(\"YYYY-mm-dd-AM-HH-MM-SS\") + TRACE_PREFIX_LEN)\n-#define TRACE_CTF_FIELD_SIZE 448\n #define TRACE_POINT_NAME_SIZE 64\n #define TRACE_CTF_MAGIC 0xC1FC1FC1\n #define TRACE_MAX_ARGS\t32\n@@ -33,7 +32,7 @@ struct trace_point {\n \tSTAILQ_ENTRY(trace_point) next;\n \trte_trace_point_t *handle;\n \tchar name[TRACE_POINT_NAME_SIZE];\n-\tchar ctf_field[TRACE_CTF_FIELD_SIZE];\n+\tchar *ctf_field;\n };\n \n enum trace_area_e {\n", "prefixes": [ "v2", "2/4" ] }