[PATCH] arm64/kernel/probes: Use BUG_ON instead of if condition followed by BUG.

Masami Hiramatsu mhiramat at kernel.org
Thu Apr 1 22:21:49 BST 2021


On Tue, 30 Mar 2021 04:57:50 -0700
zhouchuangao <zhouchuangao at vivo.com> wrote:

> It can be optimized at compile time.
> 

Anyway, this seems to make the code simpler.

Reviewed-by: Masami Hiramatsu <mhiramat at kernel.org>

Thanks!

> Signed-off-by: zhouchuangao <zhouchuangao at vivo.com>
> ---
>  arch/arm64/kernel/probes/kprobes.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
> index 66aac28..ecf0f61 100644
> --- a/arch/arm64/kernel/probes/kprobes.c
> +++ b/arch/arm64/kernel/probes/kprobes.c
> @@ -264,8 +264,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr)
>  		 * normal page fault.
>  		 */
>  		instruction_pointer_set(regs, (unsigned long) cur->addr);
> -		if (!instruction_pointer(regs))
> -			BUG();
> +		BUG_ON(!instruction_pointer(regs));
>  
>  		if (kcb->kprobe_status == KPROBE_REENTER)
>  			restore_previous_kprobe(kcb);
> -- 
> 2.7.4
> 


-- 
Masami Hiramatsu <mhiramat at kernel.org>



More information about the linux-arm-kernel mailing list