Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4312845pxf; Tue, 30 Mar 2021 05:00:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCfnr7nkM81FjLdFSUx/QTIu/dv24d7xLpCp5g+nereSXOW0oFNaEmW9WEBqwa+IZobB56 X-Received: by 2002:a05:6402:31e9:: with SMTP id dy9mr33807719edb.186.1617105604822; Tue, 30 Mar 2021 05:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617105604; cv=none; d=google.com; s=arc-20160816; b=aErIgwbVNQsui5yG1mencD9/E8O7xWDW8kLIvzlYQwoeUqd1LPQJfvhYwBjxHWjYQN hMQe0h8mIBAf8Da6jtXdaqSqCeGQlID541JfCw4meXc/CJpSEpdWopeXwddcSr9rtK3w tbaTu5E8K2no3z554bCfkhKxYLbMoeb2xJauqlsbv1ToZkR3leLqfZv+XRFoajk0ZfcD SPovfn7KCqxHhjcG9VA6y4W8UVZZbUpKD2MGrhactgPAjFP21vHOm7EyCVF9/Tj6kTsV zFYy/L7xD4/3UkS0W2JyNUQEfA5tVgr/Vh7IUlUpeQTbFrOFkYL6jYl0tkm0z25IIVvb VY3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:to:from; bh=V5V5ImiqX7xrkf+WkiCWPwEIM7MhDHGWTv8h7745y58=; b=XwpQXDE6d+TmaB6FMgzUCxfWI8Fe27zU1jITiVjfDU59NJFnSlLMzUQAH+E1hrfHtq 3bdRj7mhY40cqeXtZe8XgttEvfluuRUXt/wS/sijStlTBWYKUoMb8dvHfxZzCAHxmVZU Q4A+sfaRzV+cHslaPMwP9/e3uLxEJ1be0rhvJNWtxziqySWIylyNJM35SrlSUYRHU6z9 qJ1WjIH+OgB7BOxKerZAmoACoobcBwLoxwFu66bzMafQdYwyCgRy6+AsnZSspD2yRpXe rapaeo0OdvjbXdXeHsXBm2d2cVU33oJ4dQrVV0fc9oB1EuMQ9J3f81YiiUn3qqt/qAtE YImQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q11si15101373edn.333.2021.03.30.04.59.40; Tue, 30 Mar 2021 05:00:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231848AbhC3L6n (ORCPT + 99 others); Tue, 30 Mar 2021 07:58:43 -0400 Received: from mail-m17635.qiye.163.com ([59.111.176.35]:10458 "EHLO mail-m17635.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230303AbhC3L6S (ORCPT ); Tue, 30 Mar 2021 07:58:18 -0400 Received: from ubuntu.localdomain (unknown [36.152.145.182]) by mail-m17635.qiye.163.com (Hmail) with ESMTPA id C10A840038F; Tue, 30 Mar 2021 19:58:11 +0800 (CST) From: zhouchuangao To: Catalin Marinas , Will Deacon , Masami Hiramatsu , Jean-Philippe Brucker , Andrew Morton , Qais Yousef , zhouchuangao , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64/kernel/probes: Use BUG_ON instead of if condition followed by BUG. Date: Tue, 30 Mar 2021 04:57:50 -0700 Message-Id: <1617105472-6081-1-git-send-email-zhouchuangao@vivo.com> X-Mailer: git-send-email 2.7.4 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZSUkfS04eH01JQ0NPVkpNSkxKS05PQklLQktVEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6Nxw6PRw6Nz8IMDcyHxE0DEw9 HxYKCTFVSlVKTUpMSktOT0JJSElPVTMWGhIXVQETFA4YEw4aFRwaFDsNEg0UVRgUFkVZV1kSC1lB WUhNVUpOSVVKT05VSkNJWVdZCAFZQUpCQ0M3Bg++ X-HM-Tid: 0a7882ff982ed991kuwsc10a840038f Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It can be optimized at compile time. Signed-off-by: zhouchuangao --- 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