2022-09-24 07:56:12

by Chen Zhongjin

Subject: [PATCH -next] x86: kprobes: Remove unused macro stack_addr

An unused macro reported by [-Wunused-macros].

This macro is used to access the sp in pt_regs because at that time
x86_32 can only get sp by kernel_stack_pointer(regs).

'3c88c692c287 ("x86/stackframe/32: Provide consistent pt_regs")'
This commit have unified the pt_regs and from them we can get sp from
pt_regs with regs->sp easily. Nowhere is using this macro anymore.

Refrencing pt_regs directly is more clear. Remove this macro for
code cleaning.

Signed-off-by: Chen Zhongjin <[email protected]>
---
arch/x86/kernel/kprobes/core.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 4c3c27b6aea3..eb8bc82846b9 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -59,8 +59,6 @@
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);

-#define stack_addr(regs) ((unsigned long *)regs->sp)
-
#define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\
(((b0##UL << 0x0)|(b1##UL << 0x1)|(b2##UL << 0x2)|(b3##UL << 0x3) | \
(b4##UL << 0x4)|(b5##UL << 0x5)|(b6##UL << 0x6)|(b7##UL << 0x7) | \
--
2.17.1

2022-09-25 01:55:00

by Masami Hiramatsu

Subject: Re: [PATCH -next] x86: kprobes: Remove unused macro stack_addr

On Sat, 24 Sep 2022 15:26:29 +0800
Chen Zhongjin <[email protected]> wrote:

> An unused macro reported by [-Wunused-macros].
>
> This macro is used to access the sp in pt_regs because at that time
> x86_32 can only get sp by kernel_stack_pointer(regs).
>
> '3c88c692c287 ("x86/stackframe/32: Provide consistent pt_regs")'
> This commit have unified the pt_regs and from them we can get sp from
> pt_regs with regs->sp easily. Nowhere is using this macro anymore.
>
> Refrencing pt_regs directly is more clear. Remove this macro for
> code cleaning.

Thanks for the clean up!

Acked-by: Masami Hiramatsu (Google) <[email protected]>

Thank you,

>
> Signed-off-by: Chen Zhongjin <[email protected]>
> ---
> arch/x86/kernel/kprobes/core.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
> index 4c3c27b6aea3..eb8bc82846b9 100644
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -59,8 +59,6 @@
> DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
> DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
>
> -#define stack_addr(regs) ((unsigned long *)regs->sp)
> -
> #define W(row, b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, ba, bb, bc, bd, be, bf)\
> (((b0##UL << 0x0)|(b1##UL << 0x1)|(b2##UL << 0x2)|(b3##UL << 0x3) | \
> (b4##UL << 0x4)|(b5##UL << 0x5)|(b6##UL << 0x6)|(b7##UL << 0x7) | \
> --
> 2.17.1
>


--
Masami Hiramatsu (Google) <[email protected]>