Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69123/?format=api
{ "id": 69123, "url": "https://patches.dpdk.org/api/patches/69123/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200422190349.3768487-4-jerinj@marvell.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": "<20200422190349.3768487-4-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200422190349.3768487-4-jerinj@marvell.com", "date": "2020-04-22T19:03:20", "name": "[v7,03/32] eal/trace: implement trace register API", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8383aa33dbd74fd9502398157ec8a77077e0cfb1", "submitter": { "id": 1188, "url": "https://patches.dpdk.org/api/people/1188/?format=api", "name": "Jerin Jacob Kollanukkaran", "email": "jerinj@marvell.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/20200422190349.3768487-4-jerinj@marvell.com/mbox/", "series": [ { "id": 9574, "url": "https://patches.dpdk.org/api/series/9574/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9574", "date": "2020-04-22T19:03:17", "name": "DPDK Trace support", "version": 7, "mbox": "https://patches.dpdk.org/series/9574/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/69123/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/69123/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 A1BEEA00C2;\n\tWed, 22 Apr 2020 21:04:25 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 45C521D419;\n\tWed, 22 Apr 2020 21:04:11 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 709151C1E9\n for <dev@dpdk.org>; Wed, 22 Apr 2020 21:04:07 +0200 (CEST)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 03MJ1PgG005814; Wed, 22 Apr 2020 12:04:06 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n by mx0b-0016f401.pphosted.com with ESMTP id 30jd013jc1-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 22 Apr 2020 12:04:06 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com\n (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Wed, 22 Apr 2020 12:04:04 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Wed, 22 Apr 2020 12:04:04 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n by maili.marvell.com (Postfix) with ESMTP id 362083F7057;\n Wed, 22 Apr 2020 12:04:00 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0818;\n bh=Rj8MVNpC+pOT8Z39Dw177Y+1rY64mbPobUvNW0jWnHE=;\n b=yfxD+ZJUsMLxTT2S4d4s/+X6xNI0nvrGu6HbCSUQ4Du5ZPh8i+g05SowdluzOEbvFeWU\n dfw/NGxQWkprmEWNql8dnhibOUsY6KVBC2JZ6Clz6Vk9NukiYdnf4uz4/pC+brpBXNbR\n dwLTJqcuK5/OY0/mS41BP0W7bDWF7sWOUIoRJrZt/cB0ye1YyYJuMHWuWMHgXHAmkv0g\n KZrOxHg9eH3PwZ5C8mNFpjqr0G3qeLcGnd52lH8VpjTWnENF5LUjORR+XkFRmsnQ2Lex\n zDgM/jSvXks53TraCxY17cG/m65zpdaT2MNtXBS5YTbFTV9gWnnGj0QFgcu9ODtsLlGM Kw==", "From": "<jerinj@marvell.com>", "To": "Thomas Monjalon <thomas@monjalon.net>, Jerin Jacob <jerinj@marvell.com>,\n Sunil Kumar Kori <skori@marvell.com>", "CC": "<dev@dpdk.org>, <bruce.richardson@intel.com>, <david.marchand@redhat.com>,\n <mattias.ronnblom@ericsson.com>", "Date": "Thu, 23 Apr 2020 00:33:20 +0530", "Message-ID": "<20200422190349.3768487-4-jerinj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200422190349.3768487-1-jerinj@marvell.com>", "References": "<20200419100133.3232316-1-jerinj@marvell.com>\n <20200422190349.3768487-1-jerinj@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676\n definitions=2020-04-22_06:2020-04-22,\n 2020-04-22 signatures=0", "Subject": "[dpdk-dev] [PATCH v7 03/32] eal/trace: implement trace register API", "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": "From: Jerin Jacob <jerinj@marvell.com>\n\nThe consumers of trace API defines the tracepoint and registers\nto eal. Internally these tracepoints will be stored in STAILQ\nfor future use. This patch implements the tracepoint\nregistration function.\n\nSigned-off-by: Jerin Jacob <jerinj@marvell.com>\n---\n MAINTAINERS | 1 +\n lib/librte_eal/common/eal_common_trace.c | 100 +++++++++++++++++-\n lib/librte_eal/common/eal_trace.h | 37 +++++++\n lib/librte_eal/include/meson.build | 2 +\n lib/librte_eal/include/rte_trace_point.h | 26 +++++\n .../include/rte_trace_point_provider.h | 21 ++++\n .../include/rte_trace_point_register.h | 20 ++++\n lib/librte_eal/rte_eal_version.map | 2 +\n 8 files changed, 207 insertions(+), 2 deletions(-)\n create mode 100644 lib/librte_eal/common/eal_trace.h\n create mode 100644 lib/librte_eal/include/rte_trace_point_provider.h\n create mode 100644 lib/librte_eal/include/rte_trace_point_register.h", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 52bbff623..56217c9da 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -199,6 +199,7 @@ M: Jerin Jacob <jerinj@marvell.com>\n M: Sunil Kumar Kori <skori@marvell.com>\n F: lib/librte_eal/include/rte_trace*.h\n F: lib/librte_eal/common/eal_common_trace*.c\n+F: lib/librte_eal/common/eal_trace.h\n \n Memory Allocation\n M: Anatoly Burakov <anatoly.burakov@intel.com>\ndiff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c\nindex 33a6e563a..5c5cbd2a1 100644\n--- a/lib/librte_eal/common/eal_common_trace.c\n+++ b/lib/librte_eal/common/eal_common_trace.c\n@@ -2,6 +2,102 @@\n * Copyright(C) 2020 Marvell International Ltd.\n */\n \n-#include <rte_trace.h>\n-#include <rte_trace_point.h>\n+#include <inttypes.h>\n+#include <sys/queue.h>\n \n+#include <rte_common.h>\n+#include <rte_errno.h>\n+#include <rte_lcore.h>\n+#include <rte_per_lcore.h>\n+#include <rte_string_fns.h>\n+\n+#include \"eal_trace.h\"\n+\n+RTE_DEFINE_PER_LCORE(volatile int, trace_point_sz);\n+static RTE_DEFINE_PER_LCORE(char, ctf_field[TRACE_CTF_FIELD_SIZE]);\n+static RTE_DEFINE_PER_LCORE(int, ctf_count);\n+\n+static struct trace_point_head tp_list = STAILQ_HEAD_INITIALIZER(tp_list);\n+static struct trace trace;\n+\n+int\n+__rte_trace_point_register(rte_trace_point_t *handle, const char *name,\n+\t\t\t void (*register_fn)(void))\n+{\n+\tchar *field = RTE_PER_LCORE(ctf_field);\n+\tstruct trace_point *tp;\n+\tuint16_t sz;\n+\n+\t/* Sanity checks of arguments */\n+\tif (name == NULL || register_fn == NULL || handle == NULL) {\n+\t\ttrace_err(\"invalid arguments\");\n+\t\trte_errno = EINVAL; goto fail;\n+\t}\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+\t\trte_errno = EBADF; goto fail;\n+\t}\n+\n+\t/* Is size overflowed */\n+\tif (RTE_PER_LCORE(trace_point_sz) > UINT16_MAX) {\n+\t\ttrace_err(\"trace point size overflowed\");\n+\t\trte_errno = ENOSPC; goto fail;\n+\t}\n+\n+\t/* Are we running out of space to store trace points? */\n+\tif (trace.nb_trace_points > UINT16_MAX) {\n+\t\ttrace_err(\"trace point exceeds the max count\");\n+\t\trte_errno = ENOSPC; goto fail;\n+\t}\n+\n+\t/* Get the size of the trace point */\n+\tsz = RTE_PER_LCORE(trace_point_sz);\n+\ttp = calloc(1, sizeof(struct trace_point));\n+\tif (tp == NULL) {\n+\t\ttrace_err(\"fail to allocate trace point memory\");\n+\t\trte_errno = ENOMEM; goto fail;\n+\t}\n+\n+\t/* Initialize the trace point */\n+\tif (rte_strscpy(tp->name, name, TRACE_POINT_NAME_SIZE) < 0) {\n+\t\ttrace_err(\"name is too long\");\n+\t\trte_errno = E2BIG;\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+\n+\t/* Form the trace handle */\n+\t*handle = sz;\n+\t*handle |= trace.nb_trace_points << __RTE_TRACE_FIELD_ID_SHIFT;\n+\n+\ttrace.nb_trace_points++;\n+\ttp->handle = handle;\n+\n+\t/* Add the trace point at tail */\n+\tSTAILQ_INSERT_TAIL(&tp_list, tp, next);\n+\t__atomic_thread_fence(__ATOMIC_RELEASE);\n+\n+\t/* All Good !!! */\n+\treturn 0;\n+free:\n+\tfree(tp);\n+fail:\n+\tif (trace.register_errno == 0)\n+\t\ttrace.register_errno = rte_errno;\n+\n+\treturn -rte_errno;\n+}\ndiff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h\nnew file mode 100644\nindex 000000000..4f1792768\n--- /dev/null\n+++ b/lib/librte_eal/common/eal_trace.h\n@@ -0,0 +1,37 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2020 Marvell International Ltd.\n+ */\n+\n+#ifndef __EAL_TRACE_H\n+#define __EAL_TRACE_H\n+\n+#include <rte_trace.h>\n+#include <rte_trace_point.h>\n+\n+#define trace_err(fmt, args...)\\\n+\tRTE_LOG(ERR, EAL, \"%s():%u \" fmt \"\\n\",\\\n+\t\t__func__, __LINE__, ## args)\n+\n+#define trace_crit(fmt, args...)\\\n+\tRTE_LOG(CRIT, EAL, \"%s():%u \" fmt \"\\n\",\\\n+\t\t__func__, __LINE__, ## args)\n+\n+#define TRACE_CTF_FIELD_SIZE 384\n+#define TRACE_POINT_NAME_SIZE 64\n+\n+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+};\n+\n+struct trace {\n+\tint register_errno;\n+\tuint32_t nb_trace_points;\n+};\n+\n+/* Trace point list functions */\n+STAILQ_HEAD(trace_point_head, trace_point);\n+\n+#endif /* __EAL_TRACE_H */\ndiff --git a/lib/librte_eal/include/meson.build b/lib/librte_eal/include/meson.build\nindex 126455d1c..ce360615f 100644\n--- a/lib/librte_eal/include/meson.build\n+++ b/lib/librte_eal/include/meson.build\n@@ -42,6 +42,8 @@ headers += files(\n \t'rte_time.h',\n \t'rte_trace.h',\n \t'rte_trace_point.h',\n+\t'rte_trace_point_provider.h',\n+\t'rte_trace_point_register.h',\n \t'rte_uuid.h',\n \t'rte_version.h',\n \t'rte_vfio.h',\ndiff --git a/lib/librte_eal/include/rte_trace_point.h b/lib/librte_eal/include/rte_trace_point.h\nindex 9d11830f6..f9924225a 100644\n--- a/lib/librte_eal/include/rte_trace_point.h\n+++ b/lib/librte_eal/include/rte_trace_point.h\n@@ -227,6 +227,32 @@ __rte_trace_point_fp_is_enabled(void)\n #endif\n }\n \n+/**\n+ * @internal\n+ *\n+ * Helper function to register a dynamic tracepoint.\n+ * Use RTE_TRACE_POINT_REGISTER macro for tracepoint registration.\n+ *\n+ * @param trace\n+ * The tracepoint object created using RTE_TRACE_POINT_DEFINE.\n+ * @param name\n+ * The name of the tracepoint object.\n+ * @param register_fn\n+ * Trace registration function.\n+ * @return\n+ * - 0: Successfully registered the tracepoint.\n+ * - <0: Failure to register the tracepoint.\n+ */\n+__rte_experimental\n+int __rte_trace_point_register(rte_trace_point_t *trace, const char *name,\n+\t\t\t void (*register_fn)(void));\n+\n+#ifdef RTE_TRACE_POINT_REGISTER_SELECT\n+#include <rte_trace_point_register.h>\n+#else\n+#include <rte_trace_point_provider.h>\n+#endif\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/librte_eal/include/rte_trace_point_provider.h b/lib/librte_eal/include/rte_trace_point_provider.h\nnew file mode 100644\nindex 000000000..45a113c0d\n--- /dev/null\n+++ b/lib/librte_eal/include/rte_trace_point_provider.h\n@@ -0,0 +1,21 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2020 Marvell International Ltd.\n+ */\n+\n+#ifndef _RTE_TRACE_POINT_H_\n+#error do not include this file directly, use <rte_trace_point.h> instead\n+#endif\n+\n+#ifndef _RTE_TRACE_POINT_PROVIDER_H_\n+#define _RTE_TRACE_POINT_PROVIDER_H_\n+\n+#define __RTE_TRACE_EVENT_HEADER_ID_SHIFT (48)\n+\n+#define __RTE_TRACE_FIELD_SIZE_SHIFT 0\n+#define __RTE_TRACE_FIELD_SIZE_MASK (0xffffULL << __RTE_TRACE_FIELD_SIZE_SHIFT)\n+#define __RTE_TRACE_FIELD_ID_SHIFT (16)\n+#define __RTE_TRACE_FIELD_ID_MASK (0xffffULL << __RTE_TRACE_FIELD_ID_SHIFT)\n+#define __RTE_TRACE_FIELD_ENABLE_MASK (1ULL << 63)\n+#define __RTE_TRACE_FIELD_ENABLE_DISCARD (1ULL << 62)\n+\n+#endif /* _RTE_TRACE_POINT_PROVIDER_H_ */\ndiff --git a/lib/librte_eal/include/rte_trace_point_register.h b/lib/librte_eal/include/rte_trace_point_register.h\nnew file mode 100644\nindex 000000000..b21302c3d\n--- /dev/null\n+++ b/lib/librte_eal/include/rte_trace_point_register.h\n@@ -0,0 +1,20 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2020 Marvell International Ltd.\n+ */\n+\n+#ifndef _RTE_TRACE_POINT_H_\n+#error do not include this file directly, use <rte_trace_point.h> instead\n+#endif\n+\n+#ifndef _RTE_TRACE_POINT_REGISTER_H_\n+#define _RTE_TRACE_POINT_REGISTER_H_\n+\n+#include <rte_per_lcore.h>\n+\n+RTE_DECLARE_PER_LCORE(volatile int, trace_point_sz);\n+\n+#define RTE_TRACE_POINT_REGISTER(trace, name)\\\n+\t__rte_trace_point_register(&__##trace, RTE_STR(name),\\\n+\t\t\t\t (void (*)(void)) trace)\n+\n+#endif /* _RTE_TRACE_POINT_REGISTER_H_ */\ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex 71098581f..02a595126 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -337,6 +337,8 @@ EXPERIMENTAL {\n \trte_thread_is_intr;\n \n \t# added in 20.05\n+\t__rte_trace_point_register;\n+\tper_lcore_trace_point_sz;\n \trte_log_can_log;\n \trte_thread_getname;\n };\n", "prefixes": [ "v7", "03/32" ] }