Re: [PATCH] sh: kprobes: remove unused variables in kprobe_exceptions_notify()

Hi Mike,

On Sat, 2025-05-17 at 12:30 +0300, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <[email protected]>
> 
> kbuild reports the following warning:
> 
>    arch/sh/kernel/kprobes.c: In function 'kprobe_exceptions_notify':
> > > arch/sh/kernel/kprobes.c:412:24: warning: variable 'p' set but not used [-Wunused-but-set-variable]
>      412 |         struct kprobe *p = NULL;
>          |                        ^
> 
> The variable 'p' is indeed unused since the commit fa5a24b16f94
> ("sh/kprobes: Don't call the ->break_handler() in SH kprobes code")
> 
> Remove that variable along with 'kprobe_opcode_t *addr' which also
> becomes unused after 'p' is removed.
> 
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Fixes: fa5a24b16f94 ("sh/kprobes: Don't call the ->break_handler() in SH kprobes code")
> Signed-off-by: Mike Rapoport (Microsoft) <[email protected]>
> ---
> 
> I don't know why the warning poped up only now, the code there didn't
> change for some time :/
> 
>  arch/sh/kernel/kprobes.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/sh/kernel/kprobes.c b/arch/sh/kernel/kprobes.c
> index 49c4ffd782d6..a250fb1b9420 100644
> --- a/arch/sh/kernel/kprobes.c
> +++ b/arch/sh/kernel/kprobes.c
> @@ -404,13 +404,10 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
>  int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
>  				       unsigned long val, void *data)
>  {
> -	struct kprobe *p = NULL;
>  	struct die_args *args = (struct die_args *)data;
>  	int ret = NOTIFY_DONE;
> -	kprobe_opcode_t *addr = NULL;
>  	struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
>  
> -	addr = (kprobe_opcode_t *) (args->regs->pc);
>  	if (val == DIE_TRAP &&
>  	    args->trapnr == (BREAKPOINT_INSTRUCTION & 0xff)) {
>  		if (!kprobe_running()) {
> @@ -421,7 +418,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
>  				ret = NOTIFY_DONE;
>  			}
>  		} else {
> -			p = get_kprobe(addr);
>  			if ((kcb->kprobe_status == KPROBE_HIT_SS) ||
>  			    (kcb->kprobe_status == KPROBE_REENTER)) {
>  				if (post_kprobe_handler(args->regs))

Thanks for catching this! Looks good to me!

Reviewed-by: John Paul Adrian Glaubitz <[email protected]>

Adrian

-- 
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913