Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e15bf88a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  - Do not change the key of an object in a rbtree, this time it was
    the one for DSOs lookup by its long_name, and the noticed symptom was
    with 'perf buildid-list --with-hits' (Adrian Hunter)

  - 'perf inject' is a pipe, events it doesn't touch should be passed
    on, PERF_RECORD_LOST wasn't, fix it (Adrian Hunter)

  - Make 'perf buildid-list' request event ordering, as it needs to
    first get the mmap events to be able to mark wich DSOs had hits
    (Adrian Hunter)

  - Fix memory leaks on failure in 'perf probe' (Masami Hiramatsu, Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2a49f02a 092b1f0b

tools/perf/builtin-inject.c

+1 −0
Original line number Diff line number Diff line
@@ -675,6 +675,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
			.fork		= perf_event__repipe,

			.exit		= perf_event__repipe,

			.lost		= perf_event__repipe,

			.lost_samples	= perf_event__repipe,

			.aux		= perf_event__repipe,

			.itrace_start	= perf_event__repipe,

			.context_switch	= perf_event__repipe,

tools/perf/util/build-id.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct perf_tool build_id__mark_dso_hit_ops = { 
	.exit	= perf_event__exit_del_thread,

	.attr		 = perf_event__process_attr,

	.build_id	 = perf_event__process_build_id,

	.ordered_events	 = true,

};



int build_id__sprintf(const u8 *build_id, int len, char *bf)

tools/perf/util/dso.c

+17 −0
Original line number Diff line number Diff line
@@ -933,6 +933,7 @@ static struct dso *__dso__findlink_by_longname(struct rb_root *root, 
		/* Add new node and rebalance tree */

		rb_link_node(&dso->rb_node, parent, p);

		rb_insert_color(&dso->rb_node, root);

		dso->root = root;

	}

	return NULL;

}
@@ -945,15 +946,30 @@ static inline struct dso *__dso__find_by_longname(struct rb_root *root, 


void dso__set_long_name(struct dso *dso, const char *name, bool name_allocated)

{

	struct rb_root *root = dso->root;



	if (name == NULL)

		return;



	if (dso->long_name_allocated)

		free((char *)dso->long_name);



	if (root) {

		rb_erase(&dso->rb_node, root);

		/*

		 * __dso__findlink_by_longname() isn't guaranteed to add it

		 * back, so a clean removal is required here.

		 */

		RB_CLEAR_NODE(&dso->rb_node);

		dso->root = NULL;

	}



	dso->long_name		 = name;

	dso->long_name_len	 = strlen(name);

	dso->long_name_allocated = name_allocated;



	if (root)

		__dso__findlink_by_longname(root, dso, NULL);

}



void dso__set_short_name(struct dso *dso, const char *name, bool name_allocated)
@@ -1046,6 +1062,7 @@ struct dso *dso__new(const char *name) 
		dso->kernel = DSO_TYPE_USER;

		dso->needs_swap = DSO_SWAP__UNSET;

		RB_CLEAR_NODE(&dso->rb_node);

		dso->root = NULL;

		INIT_LIST_HEAD(&dso->node);

		INIT_LIST_HEAD(&dso->data.open_entry);

		pthread_mutex_init(&dso->lock, NULL);

tools/perf/util/dso.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct dso { 
	pthread_mutex_t	 lock;

	struct list_head node;

	struct rb_node	 rb_node;	/* rbtree node sorted by long name */

	struct rb_root	 *root;		/* root of rbtree that rb_node is in */

	struct rb_root	 symbols[MAP__NR_TYPES];

	struct rb_root	 symbol_names[MAP__NR_TYPES];

	struct {

tools/perf/util/machine.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static void dsos__purge(struct dsos *dsos) 


	list_for_each_entry_safe(pos, n, &dsos->head, node) {

		RB_CLEAR_NODE(&pos->rb_node);

		pos->root = NULL;

		list_del_init(&pos->node);

		dso__put(pos);

	}