perf dwarf-regs: Remove PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
authorIan Rogers <irogers@google.com>
Fri, 8 Nov 2024 23:45:47 +0000 (15:45 -0800)
committerNamhyung Kim <namhyung@kernel.org>
Sat, 9 Nov 2024 16:39:12 +0000 (08:39 -0800)
PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET was used for BPF prologue
support which was removed in Commit 3d6dfae88917 ("perf parse-events:
Remove BPF event support"). The code is no longer used so remove.

Remove the offset from various dwarf-regs.c tables and the dependence
on ptrace.h. Rename structs starting pt_ as the ptrace derived offset is
now removed.

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-3-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
14 files changed:
tools/perf/Makefile.config
tools/perf/arch/arm64/Makefile
tools/perf/arch/arm64/util/dwarf-regs.c
tools/perf/arch/loongarch/Makefile
tools/perf/arch/loongarch/util/dwarf-regs.c
tools/perf/arch/powerpc/Makefile
tools/perf/arch/powerpc/util/dwarf-regs.c
tools/perf/arch/riscv/Makefile
tools/perf/arch/riscv/util/dwarf-regs.c
tools/perf/arch/s390/Makefile
tools/perf/arch/s390/util/dwarf-regs.c
tools/perf/arch/x86/Makefile
tools/perf/arch/x86/util/dwarf-regs.c
tools/perf/util/include/dwarf-regs.h

index 80bf06e828f0ebc8e10e7328af21059d010c162b..52a216df9e2afa5c8f84a448e96a5ed322de0e48 100644 (file)
@@ -211,10 +211,6 @@ FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arc
 # include ARCH specific config
 -include $(src-perf)/arch/$(SRCARCH)/Makefile
 
-ifdef PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
-  CFLAGS += -DHAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
-endif
-
 include $(srctree)/tools/scripts/utilities.mak
 
 ifeq ($(call get-executable,$(FLEX)),)
index 8a5ffbfe809fe44d115b583768ecc1dde3165b23..ca2e3596128705bf30bc82710b50cea9e4c63981 100644 (file)
@@ -3,7 +3,6 @@ ifndef NO_LIBDW
 PERF_HAVE_DWARF_REGS := 1
 endif
 PERF_HAVE_JITDUMP := 1
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 HAVE_KVM_STAT_SUPPORT := 1
 
 #
index 917b97d7c5d36573fd74839eec300b80d7eceae4..343a62fa4199d9ba1d15aba81a00968138e0e7d5 100644 (file)
@@ -9,10 +9,9 @@
 #include <stddef.h>
 #include <string.h>
 #include <dwarf-regs.h>
-#include <linux/ptrace.h> /* for struct user_pt_regs */
 #include <linux/stringify.h>
 
-struct pt_regs_dwarfnum {
+struct regs_dwarfnum {
        const char *name;
        unsigned int dwarfnum;
 };
@@ -21,14 +20,12 @@ struct pt_regs_dwarfnum {
 #define GPR_DWARFNUM_NAME(num) \
        {.name = __stringify(%x##num), .dwarfnum = num}
 #define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}
-#define DWARFNUM2OFFSET(index) \
-       (index * sizeof((struct user_pt_regs *)0)->regs[0])
 
 /*
  * Reference:
  * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0057b/IHI0057B_aadwarf64.pdf
  */
-static const struct pt_regs_dwarfnum regdwarfnum_table[] = {
+static const struct regs_dwarfnum regdwarfnum_table[] = {
        GPR_DWARFNUM_NAME(0),
        GPR_DWARFNUM_NAME(1),
        GPR_DWARFNUM_NAME(2),
@@ -74,19 +71,10 @@ static const struct pt_regs_dwarfnum regdwarfnum_table[] = {
  */
 const char *get_arch_regstr(unsigned int n)
 {
-       const struct pt_regs_dwarfnum *roff;
+       const struct regs_dwarfnum *roff;
+
        for (roff = regdwarfnum_table; roff->name != NULL; roff++)
                if (roff->dwarfnum == n)
                        return roff->name;
        return NULL;
 }
-
-int regs_query_register_offset(const char *name)
-{
-       const struct pt_regs_dwarfnum *roff;
-
-       for (roff = regdwarfnum_table; roff->name != NULL; roff++)
-               if (!strcmp(roff->name, name))
-                       return DWARFNUM2OFFSET(roff->dwarfnum);
-       return -EINVAL;
-}
index 1cc5eb01f32b2f1a87da26a07b5fbc75482b21f8..79b432744296e6402c6a3e7f9d2cb96a79351e05 100644 (file)
@@ -2,7 +2,6 @@
 ifndef NO_LIBDW
 PERF_HAVE_DWARF_REGS := 1
 endif
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 PERF_HAVE_JITDUMP := 1
 HAVE_KVM_STAT_SUPPORT := 1
 
index 0f6ebc38746311ff524c38fd38498bb4f438fd9b..bee08fdcf2fd8cc28609c09299c42aac088d4594 100644 (file)
@@ -32,13 +32,3 @@ const char *get_arch_regstr(unsigned int n)
        n %= 32;
        return loongarch_gpr_table[n].name;
 }
-
-int regs_query_register_offset(const char *name)
-{
-       const struct pt_regs_dwarfnum *roff;
-
-       for (roff = loongarch_gpr_table; roff->name != NULL; roff++)
-               if (!strcmp(roff->name, name))
-                       return roff->dwarfnum;
-       return -EINVAL;
-}
index 7672d555f6cdbeabf832a3c735f48f4e05d7d29c..ae05727835d859c3675069893870e29f8377a242 100644 (file)
@@ -4,7 +4,6 @@ PERF_HAVE_DWARF_REGS := 1
 endif
 
 HAVE_KVM_STAT_SUPPORT := 1
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 PERF_HAVE_JITDUMP := 1
 
 #
index 104c7ae5c433df06f965c8e15d093e5e69e32bbf..23846c59a5222d07917edabd7fe87337285b9918 100644 (file)
@@ -9,29 +9,25 @@
 #include <errno.h>
 #include <string.h>
 #include <dwarf-regs.h>
-#include <linux/ptrace.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
 
-struct pt_regs_dwarfnum {
+struct regs_dwarfnum {
        const char *name;
        unsigned int dwarfnum;
-       unsigned int ptregs_offset;
 };
 
 #define REG_DWARFNUM_NAME(r, num)                                      \
-               {.name = __stringify(%)__stringify(r), .dwarfnum = num,                 \
-               .ptregs_offset = offsetof(struct pt_regs, r)}
+       {.name = __stringify(%)__stringify(r), .dwarfnum = num}
 #define GPR_DWARFNUM_NAME(num)                                         \
-               {.name = __stringify(%gpr##num), .dwarfnum = num,               \
-               .ptregs_offset = offsetof(struct pt_regs, gpr[num])}
-#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0, .ptregs_offset = 0}
+       {.name = __stringify(%gpr##num), .dwarfnum = num}
+#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}
 
 /*
  * Reference:
  * http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html
  */
-static const struct pt_regs_dwarfnum regdwarfnum_table[] = {
+static const struct regs_dwarfnum regdwarfnum_table[] = {
        GPR_DWARFNUM_NAME(0),
        GPR_DWARFNUM_NAME(1),
        GPR_DWARFNUM_NAME(2),
@@ -83,22 +79,14 @@ static const struct pt_regs_dwarfnum regdwarfnum_table[] = {
  */
 const char *get_arch_regstr(unsigned int n)
 {
-       const struct pt_regs_dwarfnum *roff;
+       const struct regs_dwarfnum *roff;
+
        for (roff = regdwarfnum_table; roff->name != NULL; roff++)
                if (roff->dwarfnum == n)
                        return roff->name;
        return NULL;
 }
 
-int regs_query_register_offset(const char *name)
-{
-       const struct pt_regs_dwarfnum *roff;
-       for (roff = regdwarfnum_table; roff->name != NULL; roff++)
-               if (!strcmp(roff->name, name))
-                       return roff->ptregs_offset;
-       return -EINVAL;
-}
-
 #define PPC_OP(op)     (((op) >> 26) & 0x3F)
 #define PPC_RA(a)      (((a) >> 16) & 0x1f)
 #define PPC_RT(t)      (((t) >> 21) & 0x1f)
index 00573af87a681c8d851b341f3fd16d763d39e942..d83e0f32f3a83d91b929068fe69daff42ccac560 100644 (file)
@@ -1,7 +1,6 @@
 ifndef NO_LIBDW
 PERF_HAVE_DWARF_REGS := 1
 endif
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 PERF_HAVE_JITDUMP := 1
 HAVE_KVM_STAT_SUPPORT := 1
 
index cd0504c02e2e0210616ada46e3b078a044eb67bc..a9c4402ae57ec4f3f7f095620caf75b4a34f9225 100644 (file)
@@ -9,7 +9,7 @@
 #include <string.h> /* for strcmp */
 #include <dwarf-regs.h>
 
-struct pt_regs_dwarfnum {
+struct regs_dwarfnum {
        const char *name;
        unsigned int dwarfnum;
 };
@@ -17,7 +17,7 @@ struct pt_regs_dwarfnum {
 #define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}
 #define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}
 
-struct pt_regs_dwarfnum riscv_dwarf_regs_table[] = {
+struct regs_dwarfnum riscv_dwarf_regs_table[] = {
        REG_DWARFNUM_NAME("%zero", 0),
        REG_DWARFNUM_NAME("%ra", 1),
        REG_DWARFNUM_NAME("%sp", 2),
@@ -60,13 +60,3 @@ const char *get_arch_regstr(unsigned int n)
 {
        return (n < RISCV_MAX_REGS) ? riscv_dwarf_regs_table[n].name : NULL;
 }
-
-int regs_query_register_offset(const char *name)
-{
-       const struct pt_regs_dwarfnum *roff;
-
-       for (roff = riscv_dwarf_regs_table; roff->name; roff++)
-               if (!strcmp(roff->name, name))
-                       return roff->dwarfnum;
-       return -EINVAL;
-}
index 3f66e2ede3f7e1ef790c2ce663740e847afb5d32..58e79f5b67a449cce5b6cef9d61d1a58ce54fc05 100644 (file)
@@ -3,7 +3,6 @@ ifndef NO_LIBDW
 PERF_HAVE_DWARF_REGS := 1
 endif
 HAVE_KVM_STAT_SUPPORT := 1
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 PERF_HAVE_JITDUMP := 1
 
 #
index dfddb3099bfa561e7648b8162613da34029da0e5..5bcf3192623a5875d2f7470c9d9c87a44d224149 100644 (file)
@@ -7,37 +7,10 @@
  *
  */
 
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <linux/kernel.h>
-#include <asm/ptrace.h>
-#include <string.h>
-#include <dwarf-regs.h>
 #include "dwarf-regs-table.h"
 
 const char *get_arch_regstr(unsigned int n)
 {
        return (n >= ARRAY_SIZE(s390_dwarf_regs)) ? NULL : s390_dwarf_regs[n];
 }
-
-/*
- * Convert the register name into an offset to struct pt_regs (kernel).
- * This is required by the BPF prologue generator.  The BPF
- * program is called in the BPF overflow handler in the perf
- * core.
- */
-int regs_query_register_offset(const char *name)
-{
-       unsigned long gpr;
-
-       if (!name || strncmp(name, "%r", 2))
-               return -EINVAL;
-
-       errno = 0;
-       gpr = strtoul(name + 2, NULL, 10);
-       if (errno || gpr >= 16)
-               return -EINVAL;
-
-       return offsetof(user_pt_regs, gprs) + 8 * gpr;
-}
index 9aa58acb55641cca5035dc026aaa0987c0518628..51cf267f4d850a82254db0ae65603ebac19082b7 100644 (file)
@@ -3,7 +3,6 @@ ifndef NO_LIBDW
 PERF_HAVE_DWARF_REGS := 1
 endif
 HAVE_KVM_STAT_SUPPORT := 1
-PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
 PERF_HAVE_JITDUMP := 1
 
 ###
index 399c4a0a29d8c1ac4f21e2ee1030e0beec27aa34..530905118cd4fadda608eeee9dc5d64c61a3afde 100644 (file)
  * Written by Masami Hiramatsu <mhiramat@redhat.com>
  */
 
-#include <stddef.h>
 #include <errno.h> /* for EINVAL */
 #include <string.h> /* for strcmp */
-#include <linux/ptrace.h> /* for struct pt_regs */
-#include <linux/kernel.h> /* for offsetof */
+#include <linux/kernel.h> /* for ARRAY_SIZE */
 #include <dwarf-regs.h>
 
-/*
- * See arch/x86/kernel/ptrace.c.
- * Different from it:
- *
- *  - Since struct pt_regs is defined differently for user and kernel,
- *    but we want to use 'ax, bx' instead of 'rax, rbx' (which is struct
- *    field name of user's pt_regs), we make REG_OFFSET_NAME to accept
- *    both string name and reg field name.
- *
- *  - Since accessing x86_32's pt_regs from x86_64 building is difficult
- *    and vise versa, we simply fill offset with -1, so
- *    get_arch_regstr() still works but regs_query_register_offset()
- *    returns error.
- *    The only inconvenience caused by it now is that we are not allowed
- *    to generate BPF prologue for a x86_64 kernel if perf is built for
- *    x86_32. This is really a rare usecase.
- *
- *  - Order is different from kernel's ptrace.c for get_arch_regstr(). Use
- *    the order defined by dwarf.
- */
+#define DEFINE_DWARF_REGSTR_TABLE 1
+#include "dwarf-regs-table.h"
 
-struct pt_regs_offset {
-       const char *name;
-       int offset;
-};
-
-#define REG_OFFSET_END {.name = NULL, .offset = 0}
-
-#ifdef __x86_64__
-# define REG_OFFSET_NAME_64(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
-# define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = -1}
+/* 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
-# define REG_OFFSET_NAME_64(n, r) {.name = n, .offset = -1}
-# define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
+       size_t len = ARRAY_SIZE(x86_64_regstr_tbl);
 #endif
 
-/* TODO: switching by dwarf address size */
-#ifndef __x86_64__
-static const struct pt_regs_offset x86_32_regoffset_table[] = {
-       REG_OFFSET_NAME_32("%ax",       eax),
-       REG_OFFSET_NAME_32("%cx",       ecx),
-       REG_OFFSET_NAME_32("%dx",       edx),
-       REG_OFFSET_NAME_32("%bx",       ebx),
-       REG_OFFSET_NAME_32("$stack",    esp),   /* Stack address instead of %sp */
-       REG_OFFSET_NAME_32("%bp",       ebp),
-       REG_OFFSET_NAME_32("%si",       esi),
-       REG_OFFSET_NAME_32("%di",       edi),
-       REG_OFFSET_END,
-};
+       if (n >= len)
+               return NULL;
 
-#define regoffset_table x86_32_regoffset_table
+#if defined(__i386__)
+       return x86_32_regstr_tbl[n];
 #else
-static const struct pt_regs_offset x86_64_regoffset_table[] = {
-       REG_OFFSET_NAME_64("%ax",       rax),
-       REG_OFFSET_NAME_64("%dx",       rdx),
-       REG_OFFSET_NAME_64("%cx",       rcx),
-       REG_OFFSET_NAME_64("%bx",       rbx),
-       REG_OFFSET_NAME_64("%si",       rsi),
-       REG_OFFSET_NAME_64("%di",       rdi),
-       REG_OFFSET_NAME_64("%bp",       rbp),
-       REG_OFFSET_NAME_64("%sp",       rsp),
-       REG_OFFSET_NAME_64("%r8",       r8),
-       REG_OFFSET_NAME_64("%r9",       r9),
-       REG_OFFSET_NAME_64("%r10",      r10),
-       REG_OFFSET_NAME_64("%r11",      r11),
-       REG_OFFSET_NAME_64("%r12",      r12),
-       REG_OFFSET_NAME_64("%r13",      r13),
-       REG_OFFSET_NAME_64("%r14",      r14),
-       REG_OFFSET_NAME_64("%r15",      r15),
-       REG_OFFSET_END,
-};
-
-#define regoffset_table x86_64_regoffset_table
+       return x86_64_regstr_tbl[n];
 #endif
-
-/* Minus 1 for the ending REG_OFFSET_END */
-#define ARCH_MAX_REGS ((sizeof(regoffset_table) / sizeof(regoffset_table[0])) - 1)
-
-/* Return architecture dependent register string (for kprobe-tracer) */
-const char *get_arch_regstr(unsigned int n)
-{
-       return (n < ARCH_MAX_REGS) ? regoffset_table[n].name : NULL;
-}
-
-/* Reuse code from arch/x86/kernel/ptrace.c */
-/**
- * regs_query_register_offset() - query register offset from its name
- * @name:      the name of a register
- *
- * regs_query_register_offset() returns the offset of a register in struct
- * pt_regs from its name. If the name is invalid, this returns -EINVAL;
- */
-int regs_query_register_offset(const char *name)
-{
-       const struct pt_regs_offset *roff;
-       for (roff = regoffset_table; roff->name != NULL; roff++)
-               if (!strcmp(roff->name, name))
-                       return roff->offset;
-       return -EINVAL;
 }
 
 struct dwarf_regs_idx {
index 29a7d0546b823627df070f289cbeec038317a1f3..fbdd7307e0c2dafc638fa1dad1533002b6212a2a 100644 (file)
@@ -42,12 +42,4 @@ static inline void get_powerpc_regs(u32 raw_insn __maybe_unused, int is_source _
 void get_powerpc_regs(u32 raw_insn, int is_source, struct annotated_op_loc *op_loc);
 #endif
 
-#ifdef HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET
-/*
- * Arch should support fetching the offset of a register in pt_regs
- * by its name. See kernel's regs_query_register_offset in
- * arch/xxx/kernel/ptrace.c.
- */
-int regs_query_register_offset(const char *name);
-#endif
 #endif