Patch "perf machine: Don't ignore _etext when not a text symbol" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf machine: Don't ignore _etext when not a text symbol

to the 6.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-machine-don-t-ignore-_etext-when-not-a-text-sym.patch
and it can be found in the queue-6.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 386c84bc8e410cb885b56dd98ad52260cd82a707
Author: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
Date:   Wed Jan 8 10:15:24 2025 +0100

    perf machine: Don't ignore _etext when not a text symbol
    
    [ Upstream commit 7a93786c306296f15e728b1dbd949a319e4e3d19 ]
    
    Depending on how vmlinux.lds is written, _etext might be the very first
    data symbol instead of the very last text symbol.
    
    Don't require it to be a text symbol, accept any symbol type.
    
    Comitter notes:
    
    See the first Link for further discussion, but it all boils down to
    this:
    
     ---
      # grep -e _stext -e _etext -e _edata /proc/kallsyms
      c0000000 T _stext
      c08b8000 D _etext
    
      So there is no _edata and _etext is not text
    
      $ ppc-linux-objdump -x vmlinux | grep -e _stext -e _etext -e _edata
      c0000000 g       .head.text   00000000 _stext
      c08b8000 g       .rodata      00000000 _etext
      c1378000 g       .sbss        00000000 _edata
     ---
    
    Fixes: ed9adb2035b5be58 ("perf machine: Read also the end of the kernel")
    Signed-off-by: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
    Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
    Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
    Cc: Ian Rogers <irogers@xxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxxxxx>
    Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
    Cc: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
    Cc: linuxppc-dev@xxxxxxxxxxxxxxxx
    Cc: Mark Rutland <mark.rutland@xxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Song Liu <songliubraving@xxxxxx>
    Link: https://lore.kernel.org/r/b3ee1994d95257cb7f2de037c5030ba7d1bed404.1736327613.git.christophe.leroy@xxxxxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 27d5345d2b307..9be2f4479f525 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1003,7 +1003,7 @@ static int machine__get_running_kernel_start(struct machine *machine,
 
 	err = kallsyms__get_symbol_start(filename, "_edata", &addr);
 	if (err)
-		err = kallsyms__get_function_start(filename, "_etext", &addr);
+		err = kallsyms__get_symbol_start(filename, "_etext", &addr);
 	if (!err)
 		*end = addr;