Commit 75858007 authored Dec 06, 2023 by Ian Rogers Committed by Arnaldo Carvalho de Melo Dec 20, 2023

perf maps: Add find next entry to give entry after the given map

Use to remove map_rb_node use from machine.c.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Li Dong <lidong@vivo.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20231207011722.1220634-21-irogers@google.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e77b0236

tools/perf/util/machine.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1762,12 +1762,11 @@ int machine__create_kernel_maps(struct machine *machine)

		if (end == ~0ULL) {
		/* update end address of the kernel map using adjacent module address */
		struct map_rb_node *rb_node = maps__find_node(machine__kernel_maps(machine),
		struct map *next = maps__find_next_entry(machine__kernel_maps(machine),
		machine__kernel_map(machine));
		struct map_rb_node *next = map_rb_node__next(rb_node);

		if (next)
		machine__set_kernel_mmap(machine, start, map__start(next->map));
		machine__set_kernel_mmap(machine, start, map__start(next));
		}

		out_put:

tools/perf/util/maps.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,17 @@ struct map maps__find_by_name(struct maps maps, const char *name)
		return map;
		}

		struct map maps__find_next_entry(struct maps maps, struct map *map)
		{
		struct map_rb_node *rb_node = maps__find_node(maps, map);
		struct map_rb_node *next = map_rb_node__next(rb_node);

		if (next)
		return next->map;

		return NULL;
		}

		void maps__fixup_end(struct maps *maps)
		{
		struct map_rb_node prev = NULL, curr;

tools/perf/util/maps.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,8 @@ int maps__fixup_overlap_and_insert(struct maps maps, struct map new);

		struct map maps__find_by_name(struct maps maps, const char *name);

		struct map maps__find_next_entry(struct maps maps, struct map *map);

		int maps__merge_in(struct maps kmaps, struct map new_map);

		void __maps__sort_by_name(struct maps *maps);