Re: [PATCH v2] riscv: Add kprobes KUnit test

[Thomas Huth <thuth@redhat.com>]

On 11/10/2025 00.03, Paul Walmsley wrote:
> On Mon, 29 Sep 2025, Nam Cao wrote:
> 
>> Nam Cao <namcao@linutronix.de> writes:
>>> Thomas Huth <thuth@redhat.com> writes:
>>>> Could you maybe change that into "__ASSEMBLER__" instead of "__ASSEMBLY__" ?
>>>> I'm currently trying to get rid of the latter in the kernel sources, see:
>>>> https://lore.kernel.org/all/20250606070952.498274-1-thuth@redhat.com/
>>>
>>> It's been applied, it's up to riscv's maintainers how we should do this.
>>>
>>> I can send v3, or a follow-up patch.
>>>
>>> Or riscv maintainers can also squash that change into this patch, or
>>> into your patch.
>>>
>>> I'm fine with any options.
>>
>> Riscv pull request is already created. A follow-up patch it is then.
> 
> I've queued the following for v6.18-rc.

Thanks a lot!

> Thomas: have you considered updating checkpatch to scan for instances of
> __ASSEMBLY__?  Might preempt these sorts of manual fixes going forward.

I hope to get in the final patches soon ... so once that's done, 
__ASSEMBLY__ won't get defined anymore, so using it by accident will then 
cause a build error in assembly code - I hope that's obvious enough that we 
don't need a (temporary) patch for checkpatch.pl.

  Thomas


> 
> From: Paul Walmsley <pjw@kernel.org>
> Date: Fri, 10 Oct 2025 15:50:24 -0600
> Subject: [PATCH] riscv: kprobes: convert one final __ASSEMBLY__ to
>   __ASSEMBLER__
> 
> Per the reasoning in commit f811f58597ac ("riscv: Replace __ASSEMBLY__
> with __ASSEMBLER__ in non-uapi headers"), convert one last remaining
> instance of __ASSEMBLY__ in the arch/riscv kprobes code.  This entered
> the tree from patches that were sent before Thomas' changes; and when
> I reviewed the kprobes patches before queuing them, I missed this
> instance.
> 
> Cc: Nam Cao <namcao@linutronix.dev>
> Cc: Thomas Huth <thuth@redhat.com>
> Link: https://lore.kernel.org/linux-riscv/16b74b63-f223-4f0b-b6e5-31cea5e620b4@redhat.com/
> Link: https://lore.kernel.org/linux-riscv/20250606070952.498274-1-thuth@redhat.com/
> Signed-off-by: Paul Walmsley <pjw@kernel.org>
> ---
>   arch/riscv/kernel/tests/kprobes/test-kprobes.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/riscv/kernel/tests/kprobes/test-kprobes.h b/arch/riscv/kernel/tests/kprobes/test-kprobes.h
> index 3886ab491ecb..537f44aa9d3f 100644
> --- a/arch/riscv/kernel/tests/kprobes/test-kprobes.h
> +++ b/arch/riscv/kernel/tests/kprobes/test-kprobes.h
> @@ -11,7 +11,7 @@
>   #define KPROBE_TEST_MAGIC_LOWER    0x0000babe
>   #define KPROBE_TEST_MAGIC_UPPER    0xcafe0000
>   
> -#ifndef __ASSEMBLY__
> +#ifndef __ASSEMBLER__
>   
>   /* array of addresses to install kprobes */
>   extern void *test_kprobes_addresses[];
> @@ -19,6 +19,6 @@ extern void *test_kprobes_addresses[];
>   /* array of functions that return KPROBE_TEST_MAGIC */
>   extern long (*test_kprobes_functions[])(void);
>   
> -#endif /* __ASSEMBLY__ */
> +#endif /* __ASSEMBLER__ */
>   
>   #endif /* TEST_KPROBES_H */


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv