[PATCH] parisc/kprobes: always include asm-generic/kprobes.h

[PATCH] parisc/kprobes: always include asm-generic/kprobes.h

[Max Kellermann]

The NOKPROBE_SYMBOL macro (and others) were moved to
asm-generic/kprobes.h in 2017 by commit 7d134b2ce639 ("kprobes: move
kprobe declarations to asm-generic/kprobes.h"), and this new header
was included by asm/kprobes.h unconditionally on all architectures.

When kprobe support was added to parisc in 2017 by commit
8858ac8e9e9b1 ("parisc: Implement kprobes"), that header was only
included when CONFIG_KPROBES was enabled.

This can lead to build failures when NOKPROBE_SYMBOL is used, but
CONFIG_KPROBES is disabled.  This mistake however was never actually
noticed because linux/kprobes.h also includes asm-generic/kprobes.h
(though I do not understand why that is, because it also includes
asm/kprobes.h).

To prevent eventual build failures, I suggest to always include
asm-generic/kprobes.h on parisc, just like all the other architectures
do.  This way, including asm/kprobes.h suffices, and nobody (outside
of arch/) ever needs to explicitly include asm-generic/kprobes.h.

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 arch/parisc/include/asm/kprobes.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/parisc/include/asm/kprobes.h b/arch/parisc/include/asm/kprobes.h
index 0a175ac87698..0f42f5c8e3b6 100644
--- a/arch/parisc/include/asm/kprobes.h
+++ b/arch/parisc/include/asm/kprobes.h
@@ -10,9 +10,10 @@
 #ifndef _PARISC_KPROBES_H
 #define _PARISC_KPROBES_H
 
+#include <asm-generic/kprobes.h>
+
 #ifdef CONFIG_KPROBES
 
-#include <asm-generic/kprobes.h>
 #include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/notifier.h>
-- 
2.39.2

Re: [PATCH] parisc/kprobes: always include asm-generic/kprobes.h

[Helge Deller]

On 2/12/24 00:09, Max Kellermann wrote:
> The NOKPROBE_SYMBOL macro (and others) were moved to
> asm-generic/kprobes.h in 2017 by commit 7d134b2ce639 ("kprobes: move
> kprobe declarations to asm-generic/kprobes.h"), and this new header
> was included by asm/kprobes.h unconditionally on all architectures.
>
> When kprobe support was added to parisc in 2017 by commit
> 8858ac8e9e9b1 ("parisc: Implement kprobes"), that header was only
> included when CONFIG_KPROBES was enabled.
>
> This can lead to build failures when NOKPROBE_SYMBOL is used, but
> CONFIG_KPROBES is disabled.  This mistake however was never actually
> noticed because linux/kprobes.h also includes asm-generic/kprobes.h
> (though I do not understand why that is, because it also includes
> asm/kprobes.h).
>
> To prevent eventual build failures, I suggest to always include
> asm-generic/kprobes.h on parisc, just like all the other architectures
> do.  This way, including asm/kprobes.h suffices, and nobody (outside
> of arch/) ever needs to explicitly include asm-generic/kprobes.h.
>
> Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

applied to parisc git tree.

Thanks!
Helge


> ---
>   arch/parisc/include/asm/kprobes.h | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/parisc/include/asm/kprobes.h b/arch/parisc/include/asm/kprobes.h
> index 0a175ac87698..0f42f5c8e3b6 100644
> --- a/arch/parisc/include/asm/kprobes.h
> +++ b/arch/parisc/include/asm/kprobes.h
> @@ -10,9 +10,10 @@
>   #ifndef _PARISC_KPROBES_H
>   #define _PARISC_KPROBES_H
>
> +#include <asm-generic/kprobes.h>
> +
>   #ifdef CONFIG_KPROBES
>
> -#include <asm-generic/kprobes.h>
>   #include <linux/types.h>
>   #include <linux/ptrace.h>
>   #include <linux/notifier.h>