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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 A478CC433E2 for ; Mon, 14 Sep 2020 05:34:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 3A47B2192A for ; Mon, 14 Sep 2020 05:34:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uLHWKOWj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A47B2192A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RGrYiVNLqL+zW2FGQjiaOwb/VkUU3Ylp7n4ZlPbAETQ=; b=uLHWKOWjKOpFoItl7rVGRY5a4 y5dx5r1qDAYD35TfO5UI3JlioYcVsqmt0aLH8nbSn2Xkz/NkjxRinHUkURfDXswvb5FSAIIyySg29 vNP60psGU4WuPGNyhMDoqmb4pbfOC1HsDeHEoxUbXc3eFpY9o88w5BV1PCwm1j81E7h1/jpWbvfDD 4/L9gRn4rnTP9es1pxQzoVlZMFwWg0mg8iplBNWOq7oPSyES7RsjnTaQbVlqq1GMcqhWCygDfQwTa s9lteXn6HEZLfwwlYPi7/my5DoS2ZFyPhLNpXbFJaQdhy8rY12ZFRhI3Se8W056AjKMURTr2EFSA/ bwAFtaH9w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHh6R-0007Y0-Cr; Mon, 14 Sep 2020 05:32:35 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kHh6O-0007XS-3H for linux-arm-kernel@lists.infradead.org; Mon, 14 Sep 2020 05:32:33 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 29D3AD6E; Sun, 13 Sep 2020 22:32:29 -0700 (PDT) Received: from [10.163.73.47] (unknown [10.163.73.47]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A895B3F73B; Sun, 13 Sep 2020 22:32:26 -0700 (PDT) Subject: Re: [PATCH v2] arm64/mm: Refactor {pgd, pud, pmd, pte}_ERROR() To: Gavin Shan , linux-arm-kernel@lists.infradead.org References: <20200913234730.23145-1-gshan@redhat.com> From: Anshuman Khandual Message-ID: Date: Mon, 14 Sep 2020 11:01:48 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200913234730.23145-1-gshan@redhat.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200914_013232_272514_4CD51AD4 X-CRM114-Status: GOOD ( 24.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, catalin.marinas@arm.com, will@kernel.org, linux-kernel@vger.kernel.org, shan.gavin@gmail.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 09/14/2020 05:17 AM, Gavin Shan wrote: > The function __{pgd, pud, pmd, pte}_error() are introduced so that > they can be called by {pgd, pud, pmd, pte}_ERROR(). However, some > of the functions could never be called when the corresponding page > table level isn't enabled. For example, __{pud, pmd}_error() are > unused when PUD and PMD are folded to PGD. Right, it makes sense not to have these helpers generally available. Given pxx_ERROR() is enabled only when required page table level is available, with a CONFIG_PGTABLE_LEVEL check. > > This removes __{pgd, pud, pmd, pte}_error() and call pr_err() from > {pgd, pud, pmd, pte}_ERROR() directly, similar to what x86/powerpc > are doing. With this, the code looks a bit simplified either. Do we need p4d_ERROR() here as well ! > > Signed-off-by: Gavin Shan > --- > v2: Fix build warning caused by wrong printk format > --- > arch/arm64/include/asm/pgtable.h | 17 ++++++++--------- > arch/arm64/kernel/traps.c | 20 -------------------- > 2 files changed, 8 insertions(+), 29 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index d5d3fbe73953..e0ab81923c30 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -35,11 +35,6 @@ > > extern struct page *vmemmap; > > -extern void __pte_error(const char *file, int line, unsigned long val); > -extern void __pmd_error(const char *file, int line, unsigned long val); > -extern void __pud_error(const char *file, int line, unsigned long val); > -extern void __pgd_error(const char *file, int line, unsigned long val); > - > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE > > @@ -57,7 +52,8 @@ extern void __pgd_error(const char *file, int line, unsigned long val); > extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; > #define ZERO_PAGE(vaddr) phys_to_page(__pa_symbol(empty_zero_page)) > > -#define pte_ERROR(pte) __pte_error(__FILE__, __LINE__, pte_val(pte)) > +#define pte_ERROR(e) \ > + pr_err("%s:%d: bad pte %016llx.\n", __FILE__, __LINE__, pte_val(e)) > > /* > * Macros to convert between a physical address and its placement in a > @@ -541,7 +537,8 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) > > #if CONFIG_PGTABLE_LEVELS > 2 > > -#define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd_val(pmd)) > +#define pmd_ERROR(e) \ > + pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e)) > > #define pud_none(pud) (!pud_val(pud)) > #define pud_bad(pud) (!(pud_val(pud) & PUD_TABLE_BIT)) > @@ -608,7 +605,8 @@ static inline unsigned long pud_page_vaddr(pud_t pud) > > #if CONFIG_PGTABLE_LEVELS > 3 > > -#define pud_ERROR(pud) __pud_error(__FILE__, __LINE__, pud_val(pud)) > +#define pud_ERROR(e) \ > + pr_err("%s:%d: bad pud %016llx.\n", __FILE__, __LINE__, pud_val(e)) > > #define p4d_none(p4d) (!p4d_val(p4d)) > #define p4d_bad(p4d) (!(p4d_val(p4d) & 2)) > @@ -667,7 +665,8 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d) > > #endif /* CONFIG_PGTABLE_LEVELS > 3 */ > > -#define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd)) > +#define pgd_ERROR(e) \ > + pr_err("%s:%d: bad pgd %016llx.\n", __FILE__, __LINE__, pgd_val(e)) A line break in these macros might not be required any more, as checkpatch.pl now accepts bit longer lines. > > #define pgd_set_fixmap(addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr)) > #define pgd_clear_fixmap() clear_fixmap(FIX_PGD) > diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c > index 13ebd5ca2070..12fba7136dbd 100644 > --- a/arch/arm64/kernel/traps.c > +++ b/arch/arm64/kernel/traps.c > @@ -935,26 +935,6 @@ asmlinkage void enter_from_user_mode(void) > } > NOKPROBE_SYMBOL(enter_from_user_mode); > > -void __pte_error(const char *file, int line, unsigned long val) > -{ > - pr_err("%s:%d: bad pte %016lx.\n", file, line, val); > -} > - > -void __pmd_error(const char *file, int line, unsigned long val) > -{ > - pr_err("%s:%d: bad pmd %016lx.\n", file, line, val); > -} > - > -void __pud_error(const char *file, int line, unsigned long val) > -{ > - pr_err("%s:%d: bad pud %016lx.\n", file, line, val); > -} > - > -void __pgd_error(const char *file, int line, unsigned long val) > -{ > - pr_err("%s:%d: bad pgd %016lx.\n", file, line, val); > -} While moving %016lx now becomes %016llx. I guess this should be okay. Looks much cleaner to have removed these helpers from trap.c > - > /* GENERIC_BUG traps */ > > int is_valid_bugaddr(unsigned long addr) > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel