Commit d262271d authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing/dynevent: Delegate parsing to create function 

Delegate command parsing to each create function so that the
command syntax can be customized.

This requires changes to the kprobe/uprobe/synthetic event handling,
which are also included here.

Link: https://lkml.kernel.org/r/e488726f49cbdbc01568618f8680584306c4c79f.1612208610.git.zanussi@kernel.org



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
[ zanussi@kernel.org: added synthetic event modifications ]
Signed-off-by: default avatarTom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 33b1d146

kernel/trace/trace.c

+2 −21
Original line number Diff line number Diff line
@@ -9412,30 +9412,11 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) 
}

EXPORT_SYMBOL_GPL(ftrace_dump);



int trace_run_command(const char *buf, int (*createfn)(int, char **))

{

	char **argv;

	int argc, ret;



	argc = 0;

	ret = 0;

	argv = argv_split(GFP_KERNEL, buf, &argc);

	if (!argv)

		return -ENOMEM;



	if (argc)

		ret = createfn(argc, argv);



	argv_free(argv);



	return ret;

}



#define WRITE_BUFSIZE  4096



ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,

				size_t count, loff_t *ppos,

				int (*createfn)(int, char **))

				int (*createfn)(const char *))

{

	char *kbuf, *buf, *tmp;

	int ret = 0;
@@ -9483,7 +9464,7 @@ ssize_t trace_parse_run_command(struct file *file, const char __user *buffer, 
			if (tmp)

				*tmp = '\0';



			ret = trace_run_command(buf, createfn);

			ret = createfn(buf);

			if (ret)

				goto out;

			buf += size;

kernel/trace/trace.h

+1 −2
Original line number Diff line number Diff line
@@ -1807,10 +1807,9 @@ extern int tracing_set_cpumask(struct trace_array *tr, 


#define MAX_EVENT_NAME_LEN	64



extern int trace_run_command(const char *buf, int (*createfn)(int, char**));

extern ssize_t trace_parse_run_command(struct file *file,

		const char __user *buffer, size_t count, loff_t *ppos,

		int (*createfn)(int, char**));

		int (*createfn)(const char *));



extern unsigned int err_pos(char *cmd, const char *str);

extern void tracing_log_err(struct trace_array *tr,

kernel/trace/trace_dynevent.c

+22 −13
Original line number Diff line number Diff line
@@ -31,23 +31,31 @@ int dyn_event_register(struct dyn_event_operations *ops) 
	return 0;

}



int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type)

int dyn_event_release(const char *raw_command, struct dyn_event_operations *type)

{

	struct dyn_event *pos, *n;

	char *system = NULL, *event, *p;

	int ret = -ENOENT;

	int argc, ret = -ENOENT;

	char **argv;



	argv = argv_split(GFP_KERNEL, raw_command, &argc);

	if (!argv)

		return -ENOMEM;



	if (argv[0][0] == '-') {

		if (argv[0][1] != ':')

			return -EINVAL;

		if (argv[0][1] != ':') {

			ret = -EINVAL;

			goto out;

		}

		event = &argv[0][2];

	} else {

		event = strchr(argv[0], ':');

		if (!event)

			return -EINVAL;

		if (!event) {

			ret = -EINVAL;

			goto out;

		}

		event++;

	}

	argc--; argv++;



	p = strchr(event, '/');

	if (p) {
@@ -63,7 +71,7 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) 
		if (type && type != pos->ops)

			continue;

		if (!pos->ops->match(system, event,

				argc, (const char **)argv, pos))

				argc - 1, (const char **)argv + 1, pos))

			continue;



		ret = pos->ops->free(pos);
@@ -71,21 +79,22 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) 
			break;

	}

	mutex_unlock(&event_mutex);



out:

	argv_free(argv);

	return ret;

}



static int create_dyn_event(int argc, char **argv)

static int create_dyn_event(const char *raw_command)

{

	struct dyn_event_operations *ops;

	int ret = -ENODEV;



	if (argv[0][0] == '-' || argv[0][0] == '!')

		return dyn_event_release(argc, argv, NULL);

	if (raw_command[0] == '-' || raw_command[0] == '!')

		return dyn_event_release(raw_command, NULL);



	mutex_lock(&dyn_event_ops_mutex);

	list_for_each_entry(ops, &dyn_event_ops_list, list) {

		ret = ops->create(argc, (const char **)argv);

		ret = ops->create(raw_command);

		if (!ret || ret != -ECANCELED)

			break;

	}

kernel/trace/trace_dynevent.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct dyn_event; 
 */

struct dyn_event_operations {

	struct list_head	list;

	int (*create)(int argc, const char *argv[]);

	int (*create)(const char *raw_command);

	int (*show)(struct seq_file *m, struct dyn_event *ev);

	bool (*is_busy)(struct dyn_event *ev);

	int (*free)(struct dyn_event *ev);
@@ -97,7 +97,7 @@ void *dyn_event_seq_start(struct seq_file *m, loff_t *pos); 
void *dyn_event_seq_next(struct seq_file *m, void *v, loff_t *pos);

void dyn_event_seq_stop(struct seq_file *m, void *v);

int dyn_events_release_all(struct dyn_event_operations *type);

int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type);

int dyn_event_release(const char *raw_command, struct dyn_event_operations *type);



/*

 * for_each_dyn_event	-	iterate over the dyn_event list

kernel/trace/trace_events_synth.c

+46 −14
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void synth_err(u8 err_type, u8 err_pos) 
			err_type, err_pos);

}



static int create_synth_event(int argc, const char **argv);

static int create_synth_event(const char *raw_command);

static int synth_event_show(struct seq_file *m, struct dyn_event *ev);

static int synth_event_release(struct dyn_event *ev);

static bool synth_event_is_busy(struct dyn_event *ev);
@@ -1383,18 +1383,30 @@ int synth_event_delete(const char *event_name) 
}

EXPORT_SYMBOL_GPL(synth_event_delete);



static int create_or_delete_synth_event(int argc, char **argv)

static int create_or_delete_synth_event(const char *raw_command)

{

	const char *name = argv[0];

	int ret;

	char **argv, *name = NULL;

	int argc = 0, ret = 0;



	argv = argv_split(GFP_KERNEL, raw_command, &argc);

	if (!argv)

		return -ENOMEM;



	if (!argc)

		goto free;



	name = argv[0];



	/* trace_run_command() ensures argc != 0 */

	if (name[0] == '!') {

		ret = synth_event_delete(name + 1);

		return ret;

		goto free;

	}



	ret = __create_synth_event(argc - 1, name, (const char **)argv + 1);

free:

	argv_free(argv);



	return ret == -ECANCELED ? -EINVAL : ret;

}
@@ -1403,7 +1415,7 @@ static int synth_event_run_command(struct dynevent_cmd *cmd) 
	struct synth_event *se;

	int ret;



	ret = trace_run_command(cmd->seq.buffer, create_or_delete_synth_event);

	ret = create_or_delete_synth_event(cmd->seq.buffer);

	if (ret)

		return ret;
@@ -1939,23 +1951,43 @@ int synth_event_trace_end(struct synth_event_trace_state *trace_state) 
}

EXPORT_SYMBOL_GPL(synth_event_trace_end);



static int create_synth_event(int argc, const char **argv)

static int create_synth_event(const char *raw_command)

{

	const char *name = argv[0];

	int len;

	char **argv, *name;

	int len, argc = 0, ret = 0;



	argv = argv_split(GFP_KERNEL, raw_command, &argc);

	if (!argv) {

		ret = -ENOMEM;

		return ret;

	}



	if (name[0] != 's' || name[1] != ':')

		return -ECANCELED;

	if (!argc)

		goto free;



	name = argv[0];



	if (name[0] != 's' || name[1] != ':') {

		ret = -ECANCELED;

		goto free;

	}

	name += 2;



	/* This interface accepts group name prefix */

	if (strchr(name, '/')) {

		len = str_has_prefix(name, SYNTH_SYSTEM "/");

		if (len == 0)

			return -EINVAL;

		if (len == 0) {

			ret = -EINVAL;

			goto free;

		}

		name += len;

	}

	return __create_synth_event(argc - 1, name, argv + 1);



	ret = __create_synth_event(argc - 1, name, (const char **)argv + 1);

free:

	argv_free(argv);



	return ret;

}



static int synth_event_release(struct dyn_event *ev)