nettrace: add support to print call stack

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

src/nettrace.c

@@ -127,6 +127,11 @@ static void do_parse_args(int argc, char *argv[])
 				"packet is not NATed to get better "
 				"performance",
 		},
+		{
+			.lname = "trace-stack", .dest = &trace_args->traces_stack,
+			.type = OPTION_STRING,
+			.desc = "print call stack for traces or group",
+		},
 		{ .type = OPTION_BLANK },
 		{
 			.sname = 'v', .dest = &show_log,

src/trace.c

@@ -140,41 +140,69 @@ trace_t *search_trace_enabled(char *name)
 	return NULL;
 }
 
-int trace_enable(char *name)
+int trace_enable(char *name, int target)
 {
 	bool found = false;
+	int err = 0;
 	trace_t *t;
 
 	trace_for_each(t) {
 		if (strcmp(t->name, name))
 			continue;
-		trace_set_enable(t);
+		switch (target) {
+		case 1:
+			trace_set_enable(t);
+			break;
+		case 2:
+			err = trace_set_stack(t);
+			break;
+		}
+		if (err)
+			return err;
 		found = true;
 	}
+	if (!found)
+		pr_err("trace not found: %s\n", name);
 	return !found;
 }
 
-static void _trace_group_enable(trace_group_t *group)
+static int __trace_group_enable(trace_group_t *group, int target)
 {
 	trace_group_t *pos;
 	trace_list_t *t;
+	int err = 0;
 
-	list_for_each_entry(pos, &group->children, list)
-		_trace_group_enable(pos);
+	list_for_each_entry(pos, &group->children, list) {
+		err = __trace_group_enable(pos, target);
+		if (err)
+			return err;
+	}
 
-	list_for_each_entry(t, &group->traces, list)
-		trace_set_enable(t->trace);
+	list_for_each_entry(t, &group->traces, list) {
+		switch (target) {
+		case 1:
+			trace_set_enable(t->trace);
+			break;
+		case 2:
+			err = trace_set_stack(t->trace);
+			break;
+		}
+		if (err)
+			return err;
+	}
+
+	return 0;
 }
 
 /* enable all traces in the group of 'name' */
-int trace_group_enable(char *name)
+int trace_group_enable(char *name, int target)
 {
 	trace_group_t *g = search_trace_group(name);
 
 	if (!g)
-		return -1;
-	_trace_group_enable(g);
-	return 0;
+		return trace_enable(name, target);
+
+	return __trace_group_enable(g, target);
 }
 
 bool trace_analyzer_enabled(analyzer_t *analyzer)
@@ -231,6 +259,7 @@ static int trace_prepare_args()
 	trace_t *drop_trace = search_trace_enabled("kfree_skb");
 	bpf_args_t *bpf_args = &trace_ctx.bpf_args;
 	trace_args_t *args = &trace_ctx.args;
+	char *traces_stack = args->traces_stack;
 	char *traces = args->traces;
 	trace_t *trace;
 	char *tmp, *cur;
@@ -263,6 +292,20 @@ static int trace_prepare_args()
 		goto skip_trace;
 	}
 
+	if (traces_stack) {
+		tmp = calloc(strlen(traces_stack) + 1, 1);
+		strcpy(tmp, traces_stack);
+		cur = strtok(tmp, ",");
+		while (cur) {
+			if (trace_group_enable(cur, 2)) {
+				free(tmp);
+				goto err;
+			}
+			cur = strtok(NULL, ",");
+		}
+		free(tmp);
+	}
+
 	if (!traces) {
 		trace_for_each(trace)
 			if (trace->def)
@@ -279,8 +322,7 @@ static int trace_prepare_args()
 	strcpy(tmp, traces);
 	cur = strtok(tmp, ",");
 	while (cur) {
-		if (trace_group_enable(cur) && trace_enable(cur)) {
-			pr_err("trace not found: %s\n", cur);
+		if (trace_group_enable(cur, 1)) {
 			free(tmp);
 			goto err;
 		}
@@ -312,7 +354,7 @@ static int trace_prepare_args()
 				trace_set_ret(trace);
 		/* enable skb free/drop trace */
 		if (!trace_has_end())
-			trace_group_enable("life");
+			trace_group_enable("life", 1);
 		break;
 	case TRACE_MODE_DROP:
 		if (!trace_ctx.drop_reason)

src/trace.h

@@ -105,6 +105,7 @@ typedef struct trace_args {
 	bool force;
 	u32  min_latency;
 	char *traces;
+	char *traces_stack;
 } trace_args_t;
 
 typedef struct {
@@ -266,8 +267,6 @@ static inline bool trace_mode_intel()
 void trace_show(trace_group_t *group);
 void init_trace_group();
 trace_group_t *search_trace_group(char *name);
-int trace_enable(char *name);
-int trace_group_enable(char *name);
 int trace_prepare();
 int trace_bpf_load_and_attach();
 int trace_poll();