linux-stable.git/tools/perf/util/maps.c, branch linux-6.8.y

perf maps: Fix up overlaps during fixup_end

2023-12-20T18:02:36+00:00

Maps are sometimes made overlapping, in particular kernel maps. If the
end of a map overlaps the start of the next, shorten the overlapping
map. This should remove potential non-determinism in maps__find, ie
finding maps by address.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-23-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Reduce scope of map_rb_node and maps internals

2023-12-20T18:02:17+00:00

Avoid exposing the implementation of maps so that the internals can be
refactored.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-22-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

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

2023-12-20T18:02:02+00:00

Use to remove map_rb_node use from machine.c.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-21-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Add maps__load_first()

2023-12-20T17:56:10+00:00

Avoid bpf_lock_contention_read touching the internal maps data structure
by adding a helper function. As access is done directly on the map in
maps, hold the read lock to stop it being removed.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-20-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Rename clone to copy from

2023-12-20T17:55:30+00:00

Rename maps__clone() to maps__copy_from() to be more intention revealing
of its behavior. Pass the underlying maps rather than the thread.

Signed-off-by: Ian Rogers 
Acked-by: Namhyung Kim 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-19-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Do simple merge if given map doesn't overlap

2023-12-20T17:55:00+00:00

Simplify merge in for the simple case of a non-overlapping map.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-18-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Refactor maps__fixup_overlappings()

2023-12-20T17:53:41+00:00

Rename to maps__fixup_overlap_and_insert() as the given mapping is
always inserted. Factor out first_ending_after() as a utility
function. Minor variable name changes. Switch to using debug_file()
rather than passing a debug FILE*.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-17-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Add remove maps function to remove a map based on callback

2023-12-20T17:51:44+00:00

Removing maps wasn't being done under the write lock. Similar to
maps__for_each_map(), iterate the entries but in this case remove the
entry based on the result of the callback. If an entry was removed
then maps_by_name() also needs updating, so add missed flush.

In dso__load_kcore(), the test of map to save would always be false with
REFCNT_CHECKING because of a missing RC_CHK_ACCESS/RC_CHK_EQUAL.

Signed-off-by: Ian Rogers 
Acked-by: Namhyung Kim 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-15-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Reduce scope of maps__for_each_entry()

2023-12-20T17:51:15+00:00

Reduce scope of maps__for_each_entry() as maps__for_each_map() is a safer
alternative holding the maps lock during iteration.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-14-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo

perf maps: Add maps__for_each_map to iterate maps holding the lock

2023-12-19T00:34:54+00:00

The macro maps__for_each_entry is error prone as it doesn't require
holding the maps lock.

Add a new function that iterates the maps holding the read lock.

Convert maps__find_symbol_by_name() and maps__fprintf() to use callbacks,
the latter being an example of where the read lock wasn't being held.

Signed-off-by: Ian Rogers 
Cc: Adrian Hunter 
Cc: Alexander Shishkin 
Cc: Andi Kleen 
Cc: Athira Rajeev 
Cc: Changbin Du 
Cc: Colin Ian King 
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez 
Cc: Guilherme Amadio 
Cc: Huacai Chen 
Cc: Ingo Molnar 
Cc: James Clark 
Cc: Jiri Olsa 
Cc: K Prateek Nayak 
Cc: Kajol Jain 
Cc: Kan Liang 
Cc: Leo Yan 
Cc: Li Dong 
Cc: Liam Howlett 
Cc: Mark Rutland 
Cc: Masami Hiramatsu 
Cc: Miguel Ojeda 
Cc: Ming Wang 
Cc: Namhyung Kim 
Cc: Nick Terrell 
Cc: Paolo Bonzini 
Cc: Peter Zijlstra 
Cc: Ravi Bangoria 
Cc: Sandipan Das 
Cc: Sean Christopherson 
Cc: Steinar H. Gunderson 
Cc: Vincent Whitchurch 
Cc: Wenyu Liu 
Cc: Yang Jihong 
Link: https://lore.kernel.org/r/20231207011722.1220634-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo