Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/67765/?format=api
{ "id": 67765, "url": "https://patches.dpdk.org/api/patches/67765/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200403153709.3703448-7-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": "<20200403153709.3703448-7-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200403153709.3703448-7-jerinj@marvell.com", "date": "2020-04-03T15:36:42", "name": "[v4,06/33] eal/trace: add internal trace init and fini interface", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "8d1715772bb10140bbb31193c9b2da8e7e87f899", "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/20200403153709.3703448-7-jerinj@marvell.com/mbox/", "series": [ { "id": 9192, "url": "https://patches.dpdk.org/api/series/9192/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9192", "date": "2020-04-03T15:36:36", "name": "DPDK Trace support", "version": 4, "mbox": "https://patches.dpdk.org/series/9192/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/67765/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/67765/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 3EC39A0562;\n\tFri, 3 Apr 2020 17:38:24 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BDD341C19A;\n\tFri, 3 Apr 2020 17:37:24 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 37DC71C1A4\n for <dev@dpdk.org>; Fri, 3 Apr 2020 17:37:23 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 033FaGHe029204; Fri, 3 Apr 2020 08:37:22 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0a-0016f401.pphosted.com with ESMTP id 304855y7da-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Fri, 03 Apr 2020 08:37:22 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Fri, 3 Apr 2020 08:37:20 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Fri, 3 Apr 2020 08:37:21 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n by maili.marvell.com (Postfix) with ESMTP id D19FC3F7040;\n Fri, 3 Apr 2020 08:37:18 -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=LTrkrMa42tczVEl4yP6usgsuOtH4qx5iilL8mmA4ORU=;\n b=pL8r4Ppn0gO7FVXUiOa+fe8gvzfPW49VlPdwanaevNXjeg0BujNOy1FBh9SlEciu1MnO\n voy4SNF3BNDOoIBCMYx1xkZH3SVuJ+j+ZQ2pdEPUoFlC5+x1LZ/1G07j0jfExQTgKcyA\n cwdqyAuBDRmERd9g6/DqsQODW31+zPltloMgIUACa6ov+KLb9rCG7rK0/GSuSHU/ZqHG\n pjxz1lI67OU5cpuXOLmNcpT5+ZgpIGjabC1QD+ioA4UFo/4RZVxM0vVqL9HlO9MF/yfU\n KtYv6TYk3Yg86S/thxmjyoIQRX+HDeOAAdorWJBybKU1MuM6tC9/E2hnijycNpBXCPoG hA==", "From": "<jerinj@marvell.com>", "To": "Jerin Jacob <jerinj@marvell.com>, Sunil Kumar Kori <skori@marvell.com>,\n Bruce Richardson <bruce.richardson@intel.com>", "CC": "<dev@dpdk.org>, <thomas@monjalon.net>, <david.marchand@redhat.com>,\n <mattias.ronnblom@ericsson.com>", "Date": "Fri, 3 Apr 2020 21:06:42 +0530", "Message-ID": "<20200403153709.3703448-7-jerinj@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200403153709.3703448-1-jerinj@marvell.com>", "References": "<20200329144342.1543749-1-jerinj@marvell.com>\n <20200403153709.3703448-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-03_11:2020-04-03,\n 2020-04-03 signatures=0", "Subject": "[dpdk-dev] [PATCH v4 06/33] eal/trace: add internal trace init and\n\tfini interface", "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\nDefine eal_trace_init() and eal_trace_fini() EAL interface\nfunctions that rte_eal_init() and rte_eal_cleanup() function can be\nuse to initialize and finalize the trace subsystem.\neal_trace_init() function will add the following\nfunctionality if trace is enabled through EAL command line param.\n\n- Test for trace registration failure.\n- Test for duplicate trace name registration\n- Generate UUID ver 4.\n- Create a trace directory\n\nSigned-off-by: Jerin Jacob <jerinj@marvell.com>\nSigned-off-by: Sunil Kumar Kori <skori@marvell.com>\n---\n lib/librte_eal/common/eal_common_trace.c | 54 ++++++\n .../common/eal_common_trace_utils.c | 173 ++++++++++++++++++\n lib/librte_eal/common/eal_trace.h | 21 +++\n lib/librte_eal/common/meson.build | 1 +\n lib/librte_eal/freebsd/Makefile | 1 +\n lib/librte_eal/linux/Makefile | 1 +\n 6 files changed, 251 insertions(+)\n create mode 100644 lib/librte_eal/common/eal_common_trace_utils.c", "diff": "diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c\nindex b5d6c842f..50890fb5b 100644\n--- a/lib/librte_eal/common/eal_common_trace.c\n+++ b/lib/librte_eal/common/eal_common_trace.c\n@@ -22,6 +22,60 @@ RTE_DEFINE_PER_LCORE(int, ctf_count);\n static struct trace_point_head tp_list = STAILQ_HEAD_INITIALIZER(tp_list);\n static struct trace trace;\n \n+struct trace*\n+trace_obj_get(void)\n+{\n+\treturn &trace;\n+}\n+\n+struct trace_point_head *\n+trace_list_head_get(void)\n+{\n+\treturn &tp_list;\n+}\n+\n+int\n+eal_trace_init(void)\n+{\n+\t/* One of the Trace registration failed */\n+\tif (trace.register_errno) {\n+\t\trte_errno = trace.register_errno;\n+\t\tgoto fail;\n+\t}\n+\n+\tif (rte_trace_global_is_disabled())\n+\t\treturn 0;\n+\n+\trte_spinlock_init(&trace.lock);\n+\n+\t/* Is duplicate trace name registered */\n+\tif (trace_has_duplicate_entry())\n+\t\tgoto fail;\n+\n+\t/* Generate UUID ver 4 with total size of events and number of events */\n+\ttrace_uuid_generate();\n+\n+\t/* Create trace directory */\n+\tif (trace_mkdir())\n+\t\tgoto fail;\n+\n+\n+\trte_trace_global_mode_set(trace.mode);\n+\n+\treturn 0;\n+\n+fail:\n+\ttrace_err(\"failed to initialize trace [%s]\", rte_strerror(rte_errno));\n+\treturn -rte_errno;\n+}\n+\n+void\n+eal_trace_fini(void)\n+{\n+\tif (rte_trace_global_is_disabled())\n+\t\treturn;\n+}\n+\n bool\n rte_trace_global_is_enabled(void)\n {\ndiff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/librte_eal/common/eal_common_trace_utils.c\nnew file mode 100644\nindex 000000000..8df7b5c33\n--- /dev/null\n+++ b/lib/librte_eal/common/eal_common_trace_utils.c\n@@ -0,0 +1,173 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(C) 2020 Marvell International Ltd.\n+ */\n+\n+#include <fnmatch.h>\n+#include <pwd.h>\n+#include <sys/stat.h>\n+#include <time.h>\n+\n+#include <rte_common.h>\n+#include <rte_errno.h>\n+#include <rte_string_fns.h>\n+\n+#include \"eal_filesystem.h\"\n+#include \"eal_trace.h\"\n+\n+static bool\n+trace_entry_compare(const char *name)\n+{\n+\tstruct trace_point_head *tp_list = trace_list_head_get();\n+\tstruct trace_point *tp;\n+\tint count = 0;\n+\n+\tSTAILQ_FOREACH(tp, tp_list, next) {\n+\t\tif (strncmp(tp->name, name, TRACE_POINT_NAME_SIZE) == 0)\n+\t\t\tcount++;\n+\t\tif (count > 1) {\n+\t\t\ttrace_err(\"found duplicate entry %s\", name);\n+\t\t\trte_errno = EEXIST;\n+\t\t\treturn true;\n+\t\t}\n+\t}\n+\treturn false;\n+}\n+\n+bool\n+trace_has_duplicate_entry(void)\n+{\n+\tstruct trace_point_head *tp_list = trace_list_head_get();\n+\tstruct trace_point *tp;\n+\n+\t/* Is duplicate trace name registered */\n+\tSTAILQ_FOREACH(tp, tp_list, next)\n+\t\tif (trace_entry_compare(tp->name))\n+\t\t\treturn true;\n+\n+\treturn false;\n+}\n+\n+void\n+trace_uuid_generate(void)\n+{\n+\tstruct trace_point_head *tp_list = trace_list_head_get();\n+\tstruct trace *trace = trace_obj_get();\n+\tstruct trace_point *tp;\n+\tuint64_t sz_total = 0;\n+\n+\t/* Go over the registered trace points to get total size of events */\n+\tSTAILQ_FOREACH(tp, tp_list, next) {\n+\t\tconst uint16_t sz = *tp->handle & __RTE_TRACE_FIELD_SIZE_MASK;\n+\t\tsz_total += sz;\n+\t}\n+\n+\trte_uuid_t uuid = RTE_UUID_INIT(sz_total, trace->nb_trace_points,\n+\t\t0x4370, 0x8f50, 0x222ddd514176ULL);\n+\trte_uuid_copy(trace->uuid, uuid);\n+}\n+\n+static int\n+trace_session_name_generate(char *trace_dir)\n+{\n+\tstruct tm *tm_result;\n+\ttime_t tm;\n+\tint rc;\n+\n+\ttm = time(NULL);\n+\tif ((int)tm == -1)\n+\t\tgoto fail;\n+\n+\ttm_result = localtime(&tm);\n+\tif (tm_result == NULL)\n+\t\tgoto fail;\n+\n+\trc = rte_strscpy(trace_dir,\n+\t\t\t eal_get_hugefile_prefix(), TRACE_PREFIX_LEN);\n+\tif (rc == -E2BIG)\n+\t\trc = TRACE_PREFIX_LEN;\n+\ttrace_dir[rc++] = '-';\n+\n+\trc = strftime(trace_dir + rc, TRACE_DIR_STR_LEN - rc,\n+\t\t\t\"%Y-%m-%d-%p-%I-%M-%S\", tm_result);\n+\tif (rc == 0)\n+\t\tgoto fail;\n+\n+\treturn rc;\n+fail:\n+\trte_errno = errno;\n+\treturn -rte_errno;\n+}\n+\n+static int\n+trace_dir_default_path_get(char *dir_path)\n+{\n+\tstruct trace *trace = trace_obj_get();\n+\tuint32_t size = sizeof(trace->dir);\n+\tstruct passwd *pwd;\n+\tchar *home_dir;\n+\n+\t/* First check for shell environment variable */\n+\thome_dir = getenv(\"HOME\");\n+\tif (home_dir == NULL) {\n+\t\t/* Fallback to password file entry */\n+\t\tpwd = getpwuid(getuid());\n+\t\tif (pwd == NULL)\n+\t\t\treturn -EINVAL;\n+\n+\t\thome_dir = pwd->pw_dir;\n+\t}\n+\n+\t/* Append dpdk-traces to directory */\n+\tif (snprintf(dir_path, size, \"%s/dpdk-traces/\", home_dir) < 0)\n+\t\treturn -ENAMETOOLONG;\n+\n+\treturn 0;\n+}\n+\n+int\n+trace_mkdir(void)\n+{\n+\tstruct trace *trace = trace_obj_get();\n+\tchar session[TRACE_DIR_STR_LEN];\n+\tchar *dir_path;\n+\tint rc;\n+\n+\tif (!trace->dir_offset) {\n+\t\tdir_path = calloc(1, sizeof(trace->dir));\n+\t\tif (dir_path == NULL) {\n+\t\t\ttrace_err(\"fail to allocate memory\\n\");\n+\t\t\treturn -ENOMEM;\n+\t\t}\n+\n+\t\trc = trace_dir_default_path_get(dir_path);\n+\t\tif (rc < 0) {\n+\t\t\ttrace_err(\"fail to get default path\\n\");\n+\t\t\tfree(dir_path);\n+\t\t\treturn rc;\n+\t\t}\n+\n+\t}\n+\n+\t/* Create the path if it t exist, no \"mkdir -p\" available here */\n+\trc = mkdir(trace->dir, 0700);\n+\tif (rc < 0 && errno != EEXIST) {\n+\t\ttrace_err(\"mkdir %s failed [%s]\", trace->dir, strerror(errno));\n+\t\trte_errno = errno;\n+\t\treturn -rte_errno;\n+\t}\n+\n+\trc = trace_session_name_generate(session);\n+\tif (rc < 0)\n+\t\treturn rc;\n+\n+\trc = mkdir(trace->dir, 0700);\n+\tif (rc < 0) {\n+\t\ttrace_err(\"mkdir %s failed [%s]\", trace->dir, strerror(errno));\n+\t\trte_errno = errno;\n+\t\treturn -rte_errno;\n+\t}\n+\n+\tRTE_LOG(INFO, EAL, \"Trace dir: %s\\n\", trace->dir);\n+\treturn 0;\n+}\n+\ndiff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h\nindex e32e0821f..9354f2456 100644\n--- a/lib/librte_eal/common/eal_trace.h\n+++ b/lib/librte_eal/common/eal_trace.h\n@@ -5,7 +5,9 @@\n #ifndef __EAL_TRACE_H\n #define __EAL_TRACE_H\n \n+#include <rte_spinlock.h>\n #include <rte_trace.h>\n+#include <rte_uuid.h>\n \n #define trace_err(fmt, args...)\\\n \tRTE_LOG(ERR, EAL, \"%s():%u \" fmt \"\\n\",\\\n@@ -15,6 +17,8 @@\n \tRTE_LOG(CRIT, EAL, \"%s():%u \" fmt \"\\n\",\\\n \t\t__func__, __LINE__, ## args)\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 384\n #define TRACE_POINT_NAME_SIZE 64\n \n@@ -26,11 +30,15 @@ struct trace_point {\n };\n \n struct trace {\n+\tchar dir[PATH_MAX];\n+\tint dir_offset;\n \tint register_errno;\n \tbool global_status;\n \tenum rte_trace_mode mode;\n+\trte_uuid_t uuid;\n \tuint32_t level;\n \tuint32_t nb_trace_points;\n+\trte_spinlock_t lock;\n };\n \n /* Helper functions */\n@@ -41,7 +49,20 @@ trace_id_get(rte_trace_t *trace)\n \t\t__RTE_TRACE_FIELD_ID_SHIFT;\n }\n \n+/* Trace object functions */\n+struct trace *trace_obj_get(void);\n+\n /* Trace point list functions */\n STAILQ_HEAD(trace_point_head, trace_point);\n+struct trace_point_head *trace_list_head_get(void);\n+\n+/* Util functions */\n+bool trace_has_duplicate_entry(void);\n+void trace_uuid_generate(void);\n+int trace_mkdir(void);\n+\n+/* EAL interface */\n+int eal_trace_init(void);\n+void eal_trace_fini(void);\n \n #endif /* __EAL_TRACE_H */\ndiff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build\nindex 429e89f99..3dc320327 100644\n--- a/lib/librte_eal/common/meson.build\n+++ b/lib/librte_eal/common/meson.build\n@@ -43,6 +43,7 @@ sources += files(\n \t'eal_common_thread.c',\n \t'eal_common_timer.c',\n \t'eal_common_trace.c',\n+\t'eal_common_trace_utils.c',\n \t'eal_common_uuid.c',\n \t'hotplug_mp.c',\n \t'malloc_elem.c',\ndiff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile\nindex 500afc578..ae59c8c19 100644\n--- a/lib/librte_eal/freebsd/Makefile\n+++ b/lib/librte_eal/freebsd/Makefile\n@@ -60,6 +60,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c\n+SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c\ndiff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile\nindex 2ced2085b..7992500a9 100644\n--- a/lib/librte_eal/linux/Makefile\n+++ b/lib/librte_eal/linux/Makefile\n@@ -67,6 +67,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c\n+SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c\n SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c\n", "prefixes": [ "v4", "06/33" ] }