From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 0C945A0562;
Sun, 29 Mar 2020 16:49:24 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 360091C1AE;
Sun, 29 Mar 2020 16:45:05 +0200 (CEST)
Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com
[67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 210A41C1AD
for <dev@dpdk.org>; Sun, 29 Mar 2020 16:45:02 +0200 (CEST)
Received: from pps.filterd (m0045849.ppops.net [127.0.0.1])
by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id
02TEiwkJ015457; Sun, 29 Mar 2020 07:45:02 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=pfpt0818;
bh=Wf1DeZVm5T5nkVugSGJfTVt8tVfwLNT2yjs9xo0nWHI=;
b=M3M0OyWc0uKz1mzGnS0lk4mI3ext7IUk1wiK7Vq/TOHTyJA9kJwtgoipsBKjExNY8p2e
E8C79r30aVzsvqd25c9egQ5cbFUabkkSvGtkj9HdVp3yHKzwuR35wxH0vkFwD1UM0xrg
g8HelqQn3sx0ox2fREjDr+k2Hm3j3poZ7tYaoaH/D46eSs2ry1jAeXiZX7d9m6Q7yYgy
Iug1TnQ3OUQjJ15KymjJosuqsCBSRaOzqAOB/BVIRjFUlcm40h6IIQU8m7iC5mFoJ0go
BlQq4c6tA7cEESoi4uKq4aCgIyK85bsAJqiAWc2SsndW+bi/2gO6pDQIdGInR6ceXFWX AA==
Received: from sc-exch04.marvell.com ([199.233.58.184])
by mx0a-0016f401.pphosted.com with ESMTP id 3023xnujh2-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);
Sun, 29 Mar 2020 07:45:02 -0700
Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com
(10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 29 Mar
2020 07:44:59 -0700
Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com
(10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend
Transport; Sun, 29 Mar 2020 07:44:59 -0700
Received: from jerin-lab.marvell.com (jerin-lab.marvell.com [10.28.34.14])
by maili.marvell.com (Postfix) with ESMTP id 544023F703F;
Sun, 29 Mar 2020 07:44:57 -0700 (PDT)
From: <jerinj@marvell.com>
To: John McNamara <john.mcnamara@intel.com>, Marko Kovacevic
<marko.kovacevic@intel.com>, Jerin Jacob <jerinj@marvell.com>, "Sunil Kumar
Kori" <skori@marvell.com>
CC: <dev@dpdk.org>, <thomas@monjalon.net>, <bruce.richardson@intel.com>,
<david.marchand@redhat.com>, <mattias.ronnblom@ericsson.com>
Date: Sun, 29 Mar 2020 20:13:32 +0530
Message-ID: <20200329144342.1543749-24-jerinj@marvell.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20200329144342.1543749-1-jerinj@marvell.com>
References: <20200325211603.240288-1-jerinj@marvell.com>
<20200329144342.1543749-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.645
definitions=2020-03-29_05:2020-03-27,
2020-03-29 signatures=0
Subject: [dpdk-dev] [PATCH v3 23/33] eal/trace: add trace level
configuration parameter
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Sunil Kumar Kori <skori@marvell.com>
Trace library exposes --trace-level EAL parameter to configure
global and trace point specific level.
Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
---
doc/guides/linux_gsg/eal_args.include.rst | 19 ++++
lib/librte_eal/common/eal_common_options.c | 19 +++-
lib/librte_eal/common/eal_common_trace.c | 10 ++
.../common/eal_common_trace_utils.c | 104 ++++++++++++++++++
lib/librte_eal/common/eal_options.h | 2 +
lib/librte_eal/common/eal_private.h | 3 +
lib/librte_eal/common/eal_trace.h | 11 +-
7 files changed, 166 insertions(+), 2 deletions(-)
diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst
index ed8b0e35b..94289d1e2 100644
--- a/doc/guides/linux_gsg/eal_args.include.rst
+++ b/doc/guides/linux_gsg/eal_args.include.rst
@@ -136,6 +136,25 @@ Debugging options
Can be specified multiple times.
+* ``--trace-level=<val> | <*type*:val> | <type, val>``
+
+ Specify trace level for global or specific component, based on pattern or
+ regular expression matching. For example:
+
+ Global trace level configuration::
+
+ --trace-level=8
+
+ Global trace level configuration for EAL only using pattern match::
+
+ --trace-level=*eal*:8
+
+ Global trace level configuration for EAL only using regexp match::
+
+ --trace-level=eal,8
+
+ Can be specified multiple times up to 32 times.
+
Other options
~~~~~~~~~~~~~
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 525e51e7d..0d6576a12 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -34,6 +34,7 @@
#include "eal_options.h"
#include "eal_filesystem.h"
#include "eal_private.h"
+#include "eal_trace.h"
#define BITS_PER_HEX 4
#define LCORE_OPT_LST 1
@@ -67,6 +68,7 @@ eal_long_options[] = {
{OPT_IOVA_MODE, 1, NULL, OPT_IOVA_MODE_NUM },
{OPT_LCORES, 1, NULL, OPT_LCORES_NUM },
{OPT_LOG_LEVEL, 1, NULL, OPT_LOG_LEVEL_NUM },
+ {OPT_TRACE_LEVEL, 1, NULL, OPT_TRACE_LEVEL_NUM },
{OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM },
{OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM},
{OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM },
@@ -976,7 +978,7 @@ eal_parse_syslog(const char *facility, struct internal_config *conf)
}
#endif
-static int
+int
eal_parse_log_priority(const char *level)
{
static const char * const levels[] = {
@@ -1418,6 +1420,16 @@ eal_parse_common_option(int opt, const char *optarg,
}
break;
}
+
+ case OPT_TRACE_LEVEL_NUM: {
+ if (eal_trace_level_args_save(optarg) < 0) {
+ RTE_LOG(ERR, EAL, "invalid parameters for --"
+ OPT_TRACE_LEVEL "\n");
+ return -1;
+ }
+ break;
+ }
+
case OPT_LCORES_NUM:
if (eal_parse_lcores(optarg) < 0) {
RTE_LOG(ERR, EAL, "invalid parameter for --"
@@ -1693,6 +1705,11 @@ eal_common_usage(void)
" --"OPT_LOG_LEVEL"=<int> Set global log level\n"
" --"OPT_LOG_LEVEL"=<type-match>:<int>\n"
" Set specific log level\n"
+ " --"OPT_TRACE_LEVEL"=<int> Set global trace level\n"
+ " --"OPT_TRACE_LEVEL"=<type-match>:<int>\n"
+ " Set trace level specific to component\n"
+ " Default, there is no trace level enabled\n"
+ " User must specify this option if required\n"
" -v Display version information on startup\n"
" -h, --help This help\n"
" --"OPT_IN_MEMORY" Operate entirely in memory. This will\n"
diff --git a/lib/librte_eal/common/eal_common_trace.c b/lib/librte_eal/common/eal_common_trace.c
index 840cab5a1..075d17528 100644
--- a/lib/librte_eal/common/eal_common_trace.c
+++ b/lib/librte_eal/common/eal_common_trace.c
@@ -38,6 +38,8 @@ trace_list_head_get(void)
int
eal_trace_init(void)
{
+ uint8_t i;
+
/* Trace memory should start with 8B aligned for natural alignment */
RTE_BUILD_BUG_ON((offsetof(struct __rte_trace_header, mem) % 8) != 0);
@@ -47,6 +49,9 @@ eal_trace_init(void)
goto fail;
}
+ if (trace.args.nb_args)
+ trace.global_status = true;
+
if (rte_trace_global_is_disabled())
return 0;
@@ -71,6 +76,10 @@ eal_trace_init(void)
if (trace_epoch_time_save() < 0)
goto fail;
+ /* Apply global configurations */
+ for (i = 0; i < trace.args.nb_args; i++)
+ trace_level_args_apply(trace.args.args[i]);
+
rte_trace_global_mode_set(trace.mode);
return 0;
@@ -89,6 +98,7 @@ eal_trace_fini(void)
return;
trace_mem_per_thread_free();
trace_metadata_destroy();
+ eal_trace_level_args_free();
}
bool
diff --git a/lib/librte_eal/common/eal_common_trace_utils.c b/lib/librte_eal/common/eal_common_trace_utils.c
index 64e7a7cfa..1f47faed4 100644
--- a/lib/librte_eal/common/eal_common_trace_utils.c
+++ b/lib/librte_eal/common/eal_common_trace_utils.c
@@ -118,6 +118,110 @@ trace_session_name_generate(char *trace_dir)
return -rte_errno;
}
+int
+eal_trace_level_args_save(const char *optarg)
+{
+ struct trace *trace = trace_obj_get();
+ char *trace_args;
+ uint8_t nb_args;
+
+ nb_args = trace->args.nb_args;
+
+ if (nb_args >= TRACE_LEVEL_MAX_ARGS) {
+ trace_err("ignoring trace level %s as limit exceeds", optarg);
+ return 0;
+ }
+
+ trace_args = calloc(1, (strlen(optarg) + 1));
+ if (trace_args == NULL) {
+ trace_err("fail to allocate memory for %s", optarg);
+ return -ENOMEM;
+ }
+
+ memcpy(trace_args, optarg, strlen(optarg));
+ trace->args.args[nb_args++] = trace_args;
+ trace->args.nb_args = nb_args;
+ return 0;
+}
+
+void
+eal_trace_level_args_free(void)
+{
+ struct trace *trace = trace_obj_get();
+ int i;
+
+ for (i = 0; i < trace->args.nb_args; i++) {
+ if (trace->args.args[i]) {
+ free((void *)trace->args.args[i]);
+ trace->args.args[i] = NULL;
+ }
+ }
+}
+
+int
+trace_level_args_apply(const char *arg)
+{
+ struct trace *trace = trace_obj_get();
+ const char *pattern = NULL;
+ const char *regex = NULL;
+ char *str, *level;
+ int level_idx;
+
+ str = strdup(arg);
+ if (str == NULL)
+ return -1;
+
+ level = strchr(str, ',');
+ if (level) {
+ regex = str;
+ *level++ = '\0';
+ goto found;
+ }
+
+ level = strchr(str, ':');
+ if (level) {
+ pattern = str;
+ *level++ = '\0';
+ goto found;
+ }
+
+ level = str;
+
+found:
+ level_idx = eal_parse_log_priority(level);
+ if (level_idx < 0) {
+ trace_err("invalid trace level: %s\n", level);
+ goto fail;
+ }
+
+ /* Update global level */
+ trace->level = level_idx;
+
+ if (regex) {
+ if (rte_trace_regexp(regex, true) < 0) {
+ trace_err("cannot set trace level %s:%d\n",
+ regex, level_idx);
+ goto fail;
+ }
+
+ } else if (pattern) {
+ if (rte_trace_pattern(pattern, true) < 0) {
+ trace_err("cannot set trace level %s:%d\n",
+ pattern, level_idx);
+ goto fail;
+ }
+ } else {
+ rte_trace_global_level_set(level_idx);
+ }
+
+ free(str);
+ return 0;
+
+fail:
+ free(str);
+ return -1;
+}
+
int
trace_epoch_time_save(void)
{
diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h
index 9855429e5..c274a30cc 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -33,6 +33,8 @@ enum {
OPT_LCORES_NUM,
#define OPT_LOG_LEVEL "log-level"
OPT_LOG_LEVEL_NUM,
+#define OPT_TRACE_LEVEL "trace-level"
+ OPT_TRACE_LEVEL_NUM,
#define OPT_MASTER_LCORE "master-lcore"
OPT_MASTER_LCORE_NUM,
#define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name"
diff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h
index f61f52eff..1876bc01e 100644
--- a/lib/librte_eal/common/eal_private.h
+++ b/lib/librte_eal/common/eal_private.h
@@ -446,6 +446,9 @@ eal_get_baseaddr(void);
const char *
eal_loglevel_to_string(uint32_t level);
+int
+eal_parse_log_priority(const char *level);
+
void *
eal_malloc_no_trace(const char *type, size_t size, unsigned int align);
diff --git a/lib/librte_eal/common/eal_trace.h b/lib/librte_eal/common/eal_trace.h
index 848d1dfc0..acdc8ecab 100644
--- a/lib/librte_eal/common/eal_trace.h
+++ b/lib/librte_eal/common/eal_trace.h
@@ -28,7 +28,7 @@
#define TRACE_CTF_FIELD_SIZE 384
#define TRACE_POINT_NAME_SIZE 64
#define TRACE_CTF_MAGIC 0xC1FC1FC1
-
+#define TRACE_LEVEL_MAX_ARGS 32
struct trace_point {
STAILQ_ENTRY(trace_point) next;
@@ -47,6 +47,11 @@ struct thread_mem_meta {
enum trace_area_e area;
};
+struct trace_args {
+ uint8_t nb_args;
+ char *args[TRACE_LEVEL_MAX_ARGS];
+};
+
struct trace {
char dir[PATH_MAX];
int dir_offset;
@@ -56,6 +61,7 @@ struct trace {
rte_uuid_t uuid;
uint32_t buff_len;
uint32_t level;
+ struct trace_args args;
uint32_t nb_trace_points;
uint32_t nb_trace_mem_list;
struct thread_mem_meta *lcore_meta;
@@ -94,6 +100,7 @@ struct trace_point_head *trace_list_head_get(void);
/* Util functions */
const char *trace_mode_to_string(enum rte_trace_mode mode);
const char *trace_area_to_string(enum trace_area_e area);
+int trace_level_args_apply(const char *arg);
bool trace_has_duplicate_entry(void);
void trace_uuid_generate(void);
int trace_metadata_create(void);
@@ -105,5 +112,7 @@ void trace_mem_per_thread_free(void);
/* EAL interface */
int eal_trace_init(void);
void eal_trace_fini(void);
+int eal_trace_level_args_save(const char *optarg);
+void eal_trace_level_args_free(void);
#endif /* __EAL_TRACE_H */
--
2.25.1