perf dwarf-regs: Move x86 dwarf-regs out of arch

Move arch/x86/util/dwarf-regs.c to util/dwarf-regs-x86.c and compile
in unconditionally. To avoid get_arch_regnum being duplicated, rename
to get_x86_regnum and add to get_dwarf_regnum switch.

For get_arch_regstr, this was unused on x86 unless the machine type
was EM_NONE. Map that case to EM_HOST and remove get_arch_regstr from
dwarf-regs-x86.c.

Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Anup Patel <anup@brainfault.org>
Cc: Yang Jihong <yangjihong@bytedance.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Shenlin Liang <liangshenlin@eswincomputing.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Alexander Lobakin <aleksander.lobakin@intel.com>
Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Chen Pei <cp0613@linux.alibaba.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Oliver Upton <oliver.upton@linux.dev>
Cc: Aditya Gupta <adityag@linux.ibm.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-riscv@lists.infradead.org
Cc: Bibo Mao <maobibo@loongson.cn>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Atish Patra <atishp@rivosinc.com>
Cc: Dima Kogan <dima@secretsauce.net>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: linux-csky@vger.kernel.org
Link: https://lore.kernel.org/r/20241108234606.429459-8-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
index bc56a8e70f347e0384453ba62a24b44df5506ea3..848327378694d906ad7a6020b34ec8537b102272 100644 (file)
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -11,9 +11,6 @@ perf-util-y += mem-events.o
 perf-util-y += evsel.o
 perf-util-y += iostat.o
 
-perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
-perf-util-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
-
 perf-util-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
 perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
 

diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c
deleted file mode 100644 (file)
index 5309051..0000000
--- a/tools/perf/arch/x86/util/dwarf-regs.c
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * dwarf-regs.c : Mapping of DWARF debug register numbers into register names.
- * Extracted from probe-finder.c
- *
- * Written by Masami Hiramatsu <mhiramat@redhat.com>
- */
-
-#include <errno.h> /* for EINVAL */
-#include <string.h> /* for strcmp */
-#include <linux/kernel.h> /* for ARRAY_SIZE */
-#include <dwarf-regs.h>
-
-#define DEFINE_DWARF_REGSTR_TABLE 1
-#include "dwarf-regs-table.h"
-
-/* Return architecture dependent register string (for kprobe-tracer) */
-const char *get_arch_regstr(unsigned int n)
-{
-#if defined(__i386__)
-       size_t len = ARRAY_SIZE(x86_32_regstr_tbl);
-#else
-       size_t len = ARRAY_SIZE(x86_64_regstr_tbl);
-#endif
-
-       if (n >= len)
-               return NULL;
-
-#if defined(__i386__)
-       return x86_32_regstr_tbl[n];
-#else
-       return x86_64_regstr_tbl[n];
-#endif
-}
-
-struct dwarf_regs_idx {
-       const char *name;
-       int idx;
-};
-
-static const struct dwarf_regs_idx x86_regidx_table[] = {
-       { "rax", 0 }, { "eax", 0 }, { "ax", 0 }, { "al", 0 },
-       { "rdx", 1 }, { "edx", 1 }, { "dx", 1 }, { "dl", 1 },
-       { "rcx", 2 }, { "ecx", 2 }, { "cx", 2 }, { "cl", 2 },
-       { "rbx", 3 }, { "edx", 3 }, { "bx", 3 }, { "bl", 3 },
-       { "rsi", 4 }, { "esi", 4 }, { "si", 4 }, { "sil", 4 },
-       { "rdi", 5 }, { "edi", 5 }, { "di", 5 }, { "dil", 5 },
-       { "rbp", 6 }, { "ebp", 6 }, { "bp", 6 }, { "bpl", 6 },
-       { "rsp", 7 }, { "esp", 7 }, { "sp", 7 }, { "spl", 7 },
-       { "r8", 8 }, { "r8d", 8 }, { "r8w", 8 }, { "r8b", 8 },
-       { "r9", 9 }, { "r9d", 9 }, { "r9w", 9 }, { "r9b", 9 },
-       { "r10", 10 }, { "r10d", 10 }, { "r10w", 10 }, { "r10b", 10 },
-       { "r11", 11 }, { "r11d", 11 }, { "r11w", 11 }, { "r11b", 11 },
-       { "r12", 12 }, { "r12d", 12 }, { "r12w", 12 }, { "r12b", 12 },
-       { "r13", 13 }, { "r13d", 13 }, { "r13w", 13 }, { "r13b", 13 },
-       { "r14", 14 }, { "r14d", 14 }, { "r14w", 14 }, { "r14b", 14 },
-       { "r15", 15 }, { "r15d", 15 }, { "r15w", 15 }, { "r15b", 15 },
-       { "rip", DWARF_REG_PC },
-};
-
-int get_arch_regnum(const char *name)
-{
-       unsigned int i;
-
-       if (*name != '%')
-               return -EINVAL;
-
-       for (i = 0; i < ARRAY_SIZE(x86_regidx_table); i++)
-               if (!strcmp(x86_regidx_table[i].name, name + 1))
-                       return x86_regidx_table[i].idx;
-       return -ENOENT;
-}

diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 78b990c04f719598dc3a7d8c42370ca7003b4852..ec0994b6b0114a42f427b6879534a131bb03c430 100644 (file)
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -204,6 +204,7 @@ endif
 perf-util-$(CONFIG_LIBDW) += probe-finder.o
 perf-util-$(CONFIG_LIBDW) += dwarf-aux.o
 perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
+perf-util-$(CONFIG_LIBDW) += dwarf-regs-x86.o
 perf-util-$(CONFIG_LIBDW) += debuginfo.o
 perf-util-$(CONFIG_LIBDW) += annotate-data.o
 

diff --git a/tools/perf/util/dwarf-regs-x86.c b/tools/perf/util/dwarf-regs-x86.c
new file mode 100644 (file)
index 0000000..7a55c65
--- /dev/null
+++ b/tools/perf/util/dwarf-regs-x86.c
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * dwarf-regs.c : Mapping of DWARF debug register numbers into register names.
+ * Extracted from probe-finder.c
+ *
+ * Written by Masami Hiramatsu <mhiramat@redhat.com>
+ */
+
+#include <errno.h> /* for EINVAL */
+#include <string.h> /* for strcmp */
+#include <linux/kernel.h> /* for ARRAY_SIZE */
+#include <dwarf-regs.h>
+
+struct dwarf_regs_idx {
+       const char *name;
+       int idx;
+};
+
+static const struct dwarf_regs_idx x86_regidx_table[] = {
+       { "rax", 0 }, { "eax", 0 }, { "ax", 0 }, { "al", 0 },
+       { "rdx", 1 }, { "edx", 1 }, { "dx", 1 }, { "dl", 1 },
+       { "rcx", 2 }, { "ecx", 2 }, { "cx", 2 }, { "cl", 2 },
+       { "rbx", 3 }, { "edx", 3 }, { "bx", 3 }, { "bl", 3 },
+       { "rsi", 4 }, { "esi", 4 }, { "si", 4 }, { "sil", 4 },
+       { "rdi", 5 }, { "edi", 5 }, { "di", 5 }, { "dil", 5 },
+       { "rbp", 6 }, { "ebp", 6 }, { "bp", 6 }, { "bpl", 6 },
+       { "rsp", 7 }, { "esp", 7 }, { "sp", 7 }, { "spl", 7 },
+       { "r8", 8 }, { "r8d", 8 }, { "r8w", 8 }, { "r8b", 8 },
+       { "r9", 9 }, { "r9d", 9 }, { "r9w", 9 }, { "r9b", 9 },
+       { "r10", 10 }, { "r10d", 10 }, { "r10w", 10 }, { "r10b", 10 },
+       { "r11", 11 }, { "r11d", 11 }, { "r11w", 11 }, { "r11b", 11 },
+       { "r12", 12 }, { "r12d", 12 }, { "r12w", 12 }, { "r12b", 12 },
+       { "r13", 13 }, { "r13d", 13 }, { "r13w", 13 }, { "r13b", 13 },
+       { "r14", 14 }, { "r14d", 14 }, { "r14w", 14 }, { "r14b", 14 },
+       { "r15", 15 }, { "r15d", 15 }, { "r15w", 15 }, { "r15b", 15 },
+       { "rip", DWARF_REG_PC },
+};
+
+int get_x86_regnum(const char *name)
+{
+       unsigned int i;
+
+       if (*name != '%')
+               return -EINVAL;
+
+       for (i = 0; i < ARRAY_SIZE(x86_regidx_table); i++)
+               if (!strcmp(x86_regidx_table[i].name, name + 1))
+                       return x86_regidx_table[i].idx;
+       return -ENOENT;
+}

diff --git a/tools/perf/util/dwarf-regs.c b/tools/perf/util/dwarf-regs.c
index 86b3ef638fbb3a869c860c4f2cad0e472290f059..eac99a2467372e016d66888ea779582b31696884 100644 (file)
--- a/tools/perf/util/dwarf-regs.c
+++ b/tools/perf/util/dwarf-regs.c
@@ -32,9 +32,17 @@
 const char *get_dwarf_regstr(unsigned int n, unsigned int machine,
                             unsigned int flags __maybe_unused)
 {
+#if EM_HOST == EM_X86_64 || EM_HOST == EM_386
+       if (machine == EM_NONE) {
+               /* Generic arch - use host arch */
+               machine = EM_HOST;
+       }
+#endif
        switch (machine) {
+#if EM_HOST != EM_X86_64 && EM_HOST != EM_386
        case EM_NONE:   /* Generic arch - use host arch */
                return get_arch_regstr(n);
+#endif
        case EM_386:
                return __get_dwarf_regstr(x86_32_regstr_tbl, n);
        case EM_X86_64:
@@ -65,10 +73,12 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine,
        return NULL;
 }
 
+#if EM_HOST != EM_X86_64 && EM_HOST != EM_386
 __weak int get_arch_regnum(const char *name __maybe_unused)
 {
        return -ENOTSUP;
 }
+#endif
 
 /* Return DWARF register number from architecture register name */
 int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags __maybe_unused)
@@ -90,9 +100,16 @@ int get_dwarf_regnum(const char *name, unsigned int machine, unsigned int flags
                machine = EM_HOST;
        }
        switch (machine) {
+#if EM_HOST != EM_X86_64 && EM_HOST != EM_386
        case EM_HOST:
                reg = get_arch_regnum(regname);
                break;
+#endif
+       case EM_X86_64:
+               fallthrough;
+       case EM_386:
+               reg = get_x86_regnum(regname);
+               break;
        default:
                pr_err("ELF MACHINE %x is not supported.\n", machine);
        }

diff --git a/tools/perf/util/include/dwarf-regs.h b/tools/perf/util/include/dwarf-regs.h
index 0ef428d07bccdf0006ba476a3e579ee7aceea33d..6aa66c375942269c6a31186ea41001031a00d2a6 100644 (file)
--- a/tools/perf/util/include/dwarf-regs.h
+++ b/tools/perf/util/include/dwarf-regs.h
@@ -89,7 +89,10 @@
 #define DWARF_REG_FB  0xd3affb /* random number */
 
 #ifdef HAVE_LIBDW_SUPPORT
+#if !defined(__x86_64__) && !defined(__i386__)
 const char *get_arch_regstr(unsigned int n);
+#endif
+
 /**
  * get_dwarf_regstr() - Returns ftrace register string from DWARF regnum.
  * @n: DWARF register number.
@@ -98,7 +101,12 @@ const char *get_arch_regstr(unsigned int n);
  */
 const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int flags);
 
+int get_x86_regnum(const char *name);
+
+#if !defined(__x86_64__) && !defined(__i386__)
 int get_arch_regnum(const char *name);
+#endif
+
 /*
  * get_dwarf_regnum - Returns DWARF regnum from register name
  * name: architecture register name