Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4395386pxf; Tue, 30 Mar 2021 06:59:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJ2t+Fm+JPPvdXusfcWbjP8sXx3orEhSybAhiPNvSQe5Yzq3E7U62IMRdSLznek2KQW1pt X-Received: by 2002:a17:906:9515:: with SMTP id u21mr34095996ejx.86.1617112740877; Tue, 30 Mar 2021 06:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617112740; cv=none; d=google.com; s=arc-20160816; b=UQZjnCjyK9XZXmzmYoh5GfXDkAWoljKXwPZuTfHZ9tmTkElyD8jx2NVYkicJjLMwaQ 84pRlLxSstabCKiqARK0B6wc9LHTAsTH6MLz8GF+QKi0yKFzfUUPpXz6phA8zXSDby9N q0VReeUlZAAY5XtTRDPZxzoB+GDSTJbnJmPvteuwcfysjU1kTaKo31ANHo5RZS30WTX9 vZL6g/nB4/we298le3GDut305AcrEmBvEdAG/r6wqaGHl1HI4S/7CoD40VJZhhTjGUNS ITBf3bulrVhDW3qnc66Qdd8rvg0lidFizshmbGJ8d5Bp6nazClPXbs3ay612nLgzto55 +isg== 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:cc:to:from; bh=0v2AkXuAV9lqa5oosm7RNeyQCETILqIWj8yokDFkmVE=; b=tF1IJCBFSTU6XEp3Sk22fMIHmw2xsWNdSbgKWubWep1RdWyV7a/Oyg0DlrI/g2UgYn O6zdohjgVc8kz2/0aZDyIegDc8C3kDkypcMxOmPzOHAkl/RYygzsPX95K9IAIvLPtRRK mkm62TRbnKDfDD0tjHt7K/ZgDtegbqx0uFlEo+Qn1BijaGWZAqimQzUHV5qSDBShi5DT /+cUNvjjLyVUGCNDt62LUY5Y655xH8AxNwm0kVNtwZcCIlH8cqNbQ5S8Dl40OPhwS3cD W447J3EoDxW+LN1814lKvlB7vR4Kw3OGCU2xQx/vFwrYuRbDVAZ6XBu3KKxuftj9tc/5 9Hpg== 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 kw15si14947120ejc.217.2021.03.30.06.58.38; Tue, 30 Mar 2021 06:59:00 -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 S229633AbhC3N5P (ORCPT + 99 others); Tue, 30 Mar 2021 09:57:15 -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