From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25D18C433E0 for ; Tue, 30 Mar 2021 13:57:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E2B17619C8 for ; Tue, 30 Mar 2021 13:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231434AbhC3N5Q (ORCPT ); Tue, 30 Mar 2021 09:57:16 -0400 Received: from mail-m17635.qiye.163.com ([59.111.176.35]:47938 "EHLO mail-m17635.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231701AbhC3N4u (ORCPT ); Tue, 30 Mar 2021 09:56:50 -0400 Received: from ubuntu.localdomain (unknown [36.152.145.182]) by mail-m17635.qiye.163.com (Hmail) with ESMTPA id CF2F4400267; Tue, 30 Mar 2021 21:56:47 +0800 (CST) From: zhouchuangao To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Anup Patel , Mike Rapoport , Andrew Morton , Kefeng Wang , Zong Li , Nick Kossifidis , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: zhouchuangao Subject: [PATCH] riscv/mm: Use BUG_ON instead of if condition followed by BUG. Date: Tue, 30 Mar 2021 06:56:26 -0700 Message-Id: <1617112588-7750-1-git-send-email-zhouchuangao@vivo.com> X-Mailer: git-send-email 2.7.4 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZGUxMThpKH0xCGU5IVkpNSkxKSklNS0NJT05VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MiI6Ehw5Vj8cQzcqKxpRAio9 OR4aCT1VSlVKTUpMSkpJTUtDTkhIVTMWGhIXVQETFA4YEw4aFRwaFDsNEg0UVRgUFkVZV1kSC1lB WUhNVUpOSVVKT05VSkNJWVdZCAFZQUlKSU43Bg++ X-HM-Tid: 0a78836c2db0d991kuwscf2f4400267 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org BUG_ON() uses unlikely in if(), which can be optimized at compile time. Signed-off-by: zhouchuangao --- arch/riscv/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 067583a..a7fa5e2 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -213,8 +213,8 @@ static phys_addr_t alloc_pte_late(uintptr_t va) unsigned long vaddr; vaddr = __get_free_page(GFP_KERNEL); - if (!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr))) - BUG(); + BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr))); + return __pa(vaddr); } -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08A07C433DB for ; Tue, 30 Mar 2021 13:59:17 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A45B36044F for ; Tue, 30 Mar 2021 13:59:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A45B36044F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=vivo.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=FVk4neTMtkEUt1D6WzG2SCpDAbUK5G/1k9uKqyWTtow=; b=mqp7gf9GCEf9pHXk003FNXUIN+ FkJhxqRzXsKu65O1tt1QQ7Ot9qszVaK0BdweMUqc5wfxaSabNpiKHk/yDm+qUWA0U2KMv425OZRoH /JRg/Ao742WUDMazJZ/gy3ET//qbhMVROO6iC7cHrfPfuKD85NKP90yXew3/Nqn6aBhAHE/1DqcRE wUJKpLkPaTEfavhS4OfzgYnQNahD+Lw0vedzKRtxh9ltNe9fc9la/dHsEWpdy+FHTDmkX0ny71WqW Upf5+6kiLlDl+mno+hoanYI3RgUavwcWTlbti9lTUrpGa1vlV/8WR11ZcuKIfQ3jgHHX1eUG4isNm BI1lGvkg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lREtc-003tvI-Hi; Tue, 30 Mar 2021 13:59:04 +0000 Received: from mail-m17635.qiye.163.com ([59.111.176.35]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRErZ-003tJ6-3T for linux-riscv@lists.infradead.org; Tue, 30 Mar 2021 13:59:00 +0000 Received: from ubuntu.localdomain (unknown [36.152.145.182]) by mail-m17635.qiye.163.com (Hmail) with ESMTPA id CF2F4400267; Tue, 30 Mar 2021 21:56:47 +0800 (CST) From: zhouchuangao To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Atish Patra , Anup Patel , Mike Rapoport , Andrew Morton , Kefeng Wang , Zong Li , Nick Kossifidis , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: zhouchuangao Subject: [PATCH] riscv/mm: Use BUG_ON instead of if condition followed by BUG. Date: Tue, 30 Mar 2021 06:56:26 -0700 Message-Id: <1617112588-7750-1-git-send-email-zhouchuangao@vivo.com> X-Mailer: git-send-email 2.7.4 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZS1VLWVdZKFlBSE83V1ktWUFJV1kPCR oVCBIfWUFZGUxMThpKH0xCGU5IVkpNSkxKSklNS0NJT05VEwETFhoSFyQUDg9ZV1kWGg8SFR0UWU FZT0tIVUpKS0hKTFVLWQY+ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MiI6Ehw5Vj8cQzcqKxpRAio9 OR4aCT1VSlVKTUpMSkpJTUtDTkhIVTMWGhIXVQETFA4YEw4aFRwaFDsNEg0UVRgUFkVZV1kSC1lB WUhNVUpOSVVKT05VSkNJWVdZCAFZQUlKSU43Bg++ X-HM-Tid: 0a78836c2db0d991kuwscf2f4400267 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_145858_093310_85724904 X-CRM114-Status: UNSURE ( 7.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org BUG_ON() uses unlikely in if(), which can be optimized at compile time. Signed-off-by: zhouchuangao --- arch/riscv/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 067583a..a7fa5e2 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -213,8 +213,8 @@ static phys_addr_t alloc_pte_late(uintptr_t va) unsigned long vaddr; vaddr = __get_free_page(GFP_KERNEL); - if (!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr))) - BUG(); + BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page(vaddr))); + return __pa(vaddr); } -- 2.7.4 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv