Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69142/?format=api
{ "id": 69142, "url": "https://patches.dpdk.org/api/patches/69142/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200422190349.3768487-23-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-23-jerinj@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200422190349.3768487-23-jerinj@marvell.com", "date": "2020-04-22T19:03:39", "name": "[v7,22/32] eal/trace: add trace configuration parameter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7addf3e2a1d525cff5a8e5f6cb2174b5c6879a97", "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-23-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/69142/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/69142/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 2B83AA00C2;\n\tWed, 22 Apr 2020 21:07:48 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C06B31D687;\n\tWed, 22 Apr 2020 21:05:36 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 9CDE11D5CA\n for <dev@dpdk.org>; Wed, 22 Apr 2020 21:05:19 +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 03MIxcZb013127; Wed, 22 Apr 2020 12:05:18 -0700", "from sc-exch02.marvell.com ([199.233.58.182])\n by mx0a-0016f401.pphosted.com with ESMTP id 30fxwpk02f-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Wed, 22 Apr 2020 12:05:18 -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:05:16 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Wed, 22 Apr 2020 12:05:16 -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:05:16 -0700", "from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])\n by maili.marvell.com (Postfix) with ESMTP id B65C63F704C;\n Wed, 22 Apr 2020 12:05:12 -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=7M0WbrxJGTDLyvepveTtq5PHaLCALSFvlm1HKBJ8wLY=;\n b=kcti32jixnZ1kBLW2opdz7YmWEkYJ9h8n8M5/bTusfrvF3RK9I0uuQDPwbDjSVYpm7dn\n 5Qi40ck4FVjo82VIFWdvuZuGymhuYrjjAaaxVfiWUgJjeq70Etd6pAAoqtkPWMbkhlZF\n DbPXTozeT6yPQ+sx5CQ789UleTRBzGD10IT0tPoIFHrBRLnd4SNedUdFTtLLvo8WSs/w\n LIKxjSIexFmWDDF7D/4Ghp1EYNxDPr3AZ6vTSv2gV1F0hmkdaPncaX4YZvfLbiTciodx\n x9qN8+AFAqg8KKWdqmn/SoOI4SmO+8NORLrUjFZdJvYgoGx0EiX9Z+xyYpUIif4b+KOr fA==", "From": "<jerinj@marvell.com>", "To": "John McNamara <john.mcnamara@intel.com>, Marko Kovacevic\n <marko.kovacevic@intel.com>, Jerin Jacob <jerinj@marvell.com>, \"Sunil Kumar\n Kori\" <skori@marvell.com>", "CC": "<dev@dpdk.org>, <thomas@monjalon.net>, <bruce.richardson@intel.com>,\n <david.marchand@redhat.com>, <mattias.ronnblom@ericsson.com>", "Date": "Thu, 23 Apr 2020 00:33:39 +0530", "Message-ID": "<20200422190349.3768487-23-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 22/32] eal/trace: add trace configuration\n\tparameter", "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: Sunil Kumar Kori <skori@marvell.com>\n\nTrace library exposes --trace EAL parameter to enable trace points.\n\nSigned-off-by: Sunil Kumar Kori <skori@marvell.com>\n---\n doc/guides/linux_gsg/eal_args.include.rst | 16 +++++\n lib/librte_eal/common/eal_common_options.c | 16 +++++\n lib/librte_eal/common/eal_common_trace.c | 12 +++-\n .../common/eal_common_trace_utils.c | 59 +++++++++++++++++++\n lib/librte_eal/common/eal_options.h | 2 +\n lib/librte_eal/common/eal_trace.h | 11 +++-\n 6 files changed, 114 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst\nindex ed8b0e35b..d9e6a1d95 100644\n--- a/doc/guides/linux_gsg/eal_args.include.rst\n+++ b/doc/guides/linux_gsg/eal_args.include.rst\n@@ -136,6 +136,22 @@ Debugging options\n \n Can be specified multiple times.\n \n+* ``--trace=<regex-match>``\n+\n+ Enable trace based on regular expression trace name. By default, the trace is\n+ disabled. User must specify this option to enable trace.\n+ For example:\n+\n+ Global trace configuration for EAL only::\n+\n+ --trace=eal\n+\n+ Global trace configuration for ALL the components::\n+\n+ --trace=.*\n+\n+ Can be specified multiple times up to 32 times.\n+\n Other options\n ~~~~~~~~~~~~~\n \ndiff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex eaba611fa..bb6c13177 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -34,6 +34,7 @@\n #include \"eal_options.h\"\n #include \"eal_filesystem.h\"\n #include \"eal_private.h\"\n+#include \"eal_trace.h\"\n \n #define BITS_PER_HEX 4\n #define LCORE_OPT_LST 1\n@@ -67,6 +68,7 @@ eal_long_options[] = {\n \t{OPT_IOVA_MODE,\t 1, NULL, OPT_IOVA_MODE_NUM },\n \t{OPT_LCORES, 1, NULL, OPT_LCORES_NUM },\n \t{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM },\n+\t{OPT_TRACE, 1, NULL, OPT_TRACE_NUM },\n \t{OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },\n \t{OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM},\n \t{OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },\n@@ -1418,6 +1420,16 @@ eal_parse_common_option(int opt, const char *optarg,\n \t\t}\n \t\tbreak;\n \t}\n+\n+\tcase OPT_TRACE_NUM: {\n+\t\tif (eal_trace_args_save(optarg) < 0) {\n+\t\t\tRTE_LOG(ERR, EAL, \"invalid parameters for --\"\n+\t\t\t\tOPT_TRACE \"\\n\");\n+\t\t\treturn -1;\n+\t\t}\n+\t\tbreak;\n+\t}\n+\n \tcase OPT_LCORES_NUM:\n \t\tif (eal_parse_lcores(optarg) < 0) {\n \t\t\tRTE_LOG(ERR, EAL, \"invalid parameter for --\"\n@@ -1693,6 +1705,10 @@ eal_common_usage(void)\n \t \" --\"OPT_LOG_LEVEL\"=<int> Set global log level\\n\"\n \t \" --\"OPT_LOG_LEVEL\"=<type-match>:<int>\\n\"\n \t \" Set specific log level\\n\"\n+\t \" --\"OPT_TRACE\"=<regex-match>\\n\"\n+\t \" Enable trace based on regular expression trace name.\\n\"\n+\t \" By default, the trace is disabled.\\n\"\n+\t \"\t\t User must specify this option to enable trace.\\n\"\n \t \" -v Display version information on startup\\n\"\n \t \" -h, --help This help\\n\"\n \t \" --\"OPT_IN_MEMORY\" Operate entirely in memory. This will\\n\"\ndiff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c\nindex b66272f1c..c80b351cc 100644\n--- a/lib/librte_eal/common/eal_common_trace.c\n+++ b/lib/librte_eal/common/eal_common_trace.c\n@@ -38,6 +38,8 @@ trace_list_head_get(void)\n int\n eal_trace_init(void)\n {\n+\tuint8_t i;\n+\n \t/* Trace memory should start with 8B aligned for natural alignment */\n \tRTE_BUILD_BUG_ON((offsetof(struct __rte_trace_header, mem) % 8) != 0);\n \n@@ -47,7 +49,10 @@ eal_trace_init(void)\n \t\tgoto fail;\n \t}\n \n-\tif (rte_trace_is_enabled() == false)\n+\tif (trace.args.nb_args)\n+\t\ttrace.status = true;\n+\n+\tif (!rte_trace_is_enabled())\n \t\treturn 0;\n \n \trte_spinlock_init(&trace.lock);\n@@ -71,6 +76,10 @@ eal_trace_init(void)\n \tif (trace_epoch_time_save() < 0)\n \t\tgoto fail;\n \n+\t/* Apply global configurations */\n+\tfor (i = 0; i < trace.args.nb_args; i++)\n+\t\ttrace_args_apply(trace.args.args[i]);\n+\n \trte_trace_mode_set(trace.mode);\n \n \treturn 0;\n@@ -89,6 +98,7 @@ eal_trace_fini(void)\n \t\treturn;\n \ttrace_mem_per_thread_free();\n \ttrace_metadata_destroy();\n+\teal_trace_args_free();\n }\n \n bool\ndiff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/librte_eal/common/eal_common_trace_utils.c\nindex bbe099473..7f4726d62 100644\n--- a/lib/librte_eal/common/eal_common_trace_utils.c\n+++ b/lib/librte_eal/common/eal_common_trace_utils.c\n@@ -118,6 +118,65 @@ trace_session_name_generate(char *trace_dir)\n \treturn -rte_errno;\n }\n \n+int\n+eal_trace_args_save(const char *optarg)\n+{\n+\tstruct trace *trace = trace_obj_get();\n+\tchar *trace_args;\n+\tuint8_t nb_args;\n+\n+\tnb_args = trace->args.nb_args;\n+\n+\tif (nb_args >= TRACE_MAX_ARGS) {\n+\t\ttrace_err(\"ignoring trace %s as limit exceeds\", optarg);\n+\t\treturn 0;\n+\t}\n+\n+\ttrace_args = calloc(1, (strlen(optarg) + 1));\n+\tif (trace_args == NULL) {\n+\t\ttrace_err(\"fail to allocate memory for %s\", optarg);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tmemcpy(trace_args, optarg, strlen(optarg));\n+\ttrace->args.args[nb_args++] = trace_args;\n+\ttrace->args.nb_args = nb_args;\n+\treturn 0;\n+}\n+\n+void\n+eal_trace_args_free(void)\n+{\n+\tstruct trace *trace = trace_obj_get();\n+\tint i;\n+\n+\tfor (i = 0; i < trace->args.nb_args; i++) {\n+\t\tif (trace->args.args[i]) {\n+\t\t\tfree((void *)trace->args.args[i]);\n+\t\t\ttrace->args.args[i] = NULL;\n+\t\t}\n+\t}\n+}\n+\n+int\n+trace_args_apply(const char *arg)\n+{\n+\tchar *str;\n+\n+\tstr = strdup(arg);\n+\tif (str == NULL)\n+\t\treturn -1;\n+\n+\tif (rte_trace_regexp(str, true) < 0) {\n+\t\ttrace_err(\"cannot enable trace for %s\", str);\n+\t\tfree(str);\n+\t\treturn -1;\n+\t}\n+\n+\tfree(str);\n+\treturn 0;\n+}\n+\n int\n trace_epoch_time_save(void)\n {\ndiff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h\nindex 9855429e5..4700410fd 100644\n--- a/lib/librte_eal/common/eal_options.h\n+++ b/lib/librte_eal/common/eal_options.h\n@@ -33,6 +33,8 @@ enum {\n \tOPT_LCORES_NUM,\n #define OPT_LOG_LEVEL \"log-level\"\n \tOPT_LOG_LEVEL_NUM,\n+#define OPT_TRACE \"trace\"\n+\tOPT_TRACE_NUM,\n #define OPT_MASTER_LCORE \"master-lcore\"\n \tOPT_MASTER_LCORE_NUM,\n #define OPT_MBUF_POOL_OPS_NAME \"mbuf-pool-ops-name\"\ndiff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h\nindex e2538d24a..df4dd8efd 100644\n--- a/lib/librte_eal/common/eal_trace.h\n+++ b/lib/librte_eal/common/eal_trace.h\n@@ -29,7 +29,7 @@\n #define TRACE_CTF_FIELD_SIZE 384\n #define TRACE_POINT_NAME_SIZE 64\n #define TRACE_CTF_MAGIC 0xC1FC1FC1\n-\n+#define TRACE_MAX_ARGS\t32\n \n struct trace_point {\n \tSTAILQ_ENTRY(trace_point) next;\n@@ -48,6 +48,11 @@ struct thread_mem_meta {\n \tenum trace_area_e area;\n };\n \n+struct trace_args {\n+\tuint8_t nb_args;\n+\tchar *args[TRACE_MAX_ARGS];\n+};\n+\n struct trace {\n \tchar dir[PATH_MAX];\n \tint dir_offset;\n@@ -56,6 +61,7 @@ struct trace {\n \tenum rte_trace_mode mode;\n \trte_uuid_t uuid;\n \tuint32_t buff_len;\n+\tstruct trace_args args;\n \tuint32_t nb_trace_points;\n \tuint32_t nb_trace_mem_list;\n \tstruct thread_mem_meta *lcore_meta;\n@@ -94,6 +100,7 @@ struct trace_point_head *trace_list_head_get(void);\n /* Util functions */\n const char *trace_mode_to_string(enum rte_trace_mode mode);\n const char *trace_area_to_string(enum trace_area_e area);\n+int trace_args_apply(const char *arg);\n bool trace_has_duplicate_entry(void);\n void trace_uuid_generate(void);\n int trace_metadata_create(void);\n@@ -105,5 +112,7 @@ void trace_mem_per_thread_free(void);\n /* EAL interface */\n int eal_trace_init(void);\n void eal_trace_fini(void);\n+int eal_trace_args_save(const char *optarg);\n+void eal_trace_args_free(void);\n \n #endif /* __EAL_TRACE_H */\n", "prefixes": [ "v7", "22/32" ] }