x86/unwind_user: Guard unwind_user_word_size() by UNWIND_USER

The unwind user framework in general requires an architecture-specific
implementation of unwind_user_word_size() to be present for any unwind
method, whether that is fp or a future other method, such as potentially
sframe.

Guard unwind_user_word_size() by the availability of the UNWIND_USER
framework instead of the specific HAVE_UNWIND_USER_FP method.

This facilitates to selectively disable HAVE_UNWIND_USER_FP on x86
(e.g. for test purposes) once a new unwind method is added to unwind
user.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20251208160352.1363040-4-jremus@linux.ibm.com

diff --git a/arch/x86/include/asm/unwind_user.h b/arch/x86/include/asm/unwind_user.h
index 971ffe937d5079a13fd4a43ac804538b156643c5..7f1229b33d06ca7150b4470b0bb552881270ac95 100644 (file)
--- a/arch/x86/include/asm/unwind_user.h
+++ b/arch/x86/include/asm/unwind_user.h
@@ -2,23 +2,11 @@
 #ifndef _ASM_X86_UNWIND_USER_H
 #define _ASM_X86_UNWIND_USER_H
 
-#ifdef CONFIG_HAVE_UNWIND_USER_FP
+#ifdef CONFIG_UNWIND_USER
 
 #include <asm/ptrace.h>
 #include <asm/uprobes.h>
 
-#define ARCH_INIT_USER_FP_FRAME(ws)                    \
-       .cfa_off        =  2*(ws),                      \
-       .ra_off         = -1*(ws),                      \
-       .fp_off         = -2*(ws),                      \
-       .use_fp         = true,
-
-#define ARCH_INIT_USER_FP_ENTRY_FRAME(ws)              \
-       .cfa_off        =  1*(ws),                      \
-       .ra_off         = -1*(ws),                      \
-       .fp_off         = 0,                            \
-       .use_fp         = false,
-
 static inline int unwind_user_word_size(struct pt_regs *regs)
 {
        /* We can't unwind VM86 stacks */
@@ -31,6 +19,22 @@ static inline int unwind_user_word_size(struct pt_regs *regs)
        return sizeof(long);
 }
 
+#endif /* CONFIG_UNWIND_USER */
+
+#ifdef CONFIG_HAVE_UNWIND_USER_FP
+
+#define ARCH_INIT_USER_FP_FRAME(ws)                    \
+       .cfa_off        =  2*(ws),                      \
+       .ra_off         = -1*(ws),                      \
+       .fp_off         = -2*(ws),                      \
+       .use_fp         = true,
+
+#define ARCH_INIT_USER_FP_ENTRY_FRAME(ws)              \
+       .cfa_off        =  1*(ws),                      \
+       .ra_off         = -1*(ws),                      \
+       .fp_off         = 0,                            \
+       .use_fp         = false,
+
 static inline bool unwind_user_at_function_start(struct pt_regs *regs)
 {
        return is_uprobe_at_func_entry(regs);