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=-15.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 DB5B6C4338F for ; Wed, 28 Jul 2021 07:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB76760F41 for ; Wed, 28 Jul 2021 07:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234844AbhG1HTa (ORCPT ); Wed, 28 Jul 2021 03:19:30 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:39579 "EHLO relay2-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234949AbhG1HT2 (ORCPT ); Wed, 28 Jul 2021 03:19:28 -0400 Received: (Authenticated sender: alex@ghiti.fr) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 4CA9D4000A; Wed, 28 Jul 2021 07:19:17 +0000 (UTC) Subject: Re: [PATCH] riscv: fix the global name pfn_base confliction error To: Kenneth Lee , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra , Kenneth Lee , Kefeng Wang , Vitaly Wool , Guo Ren , Jisheng Zhang , Mike Rapoport , Nick Kossifidis , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: guohanjun@huawei.com, wangzhou1@hisilicon.com References: <20210728064318.375747-1-nek.in.cn@gmail.com> From: Alex Ghiti Message-ID: <0e81c8d2-468a-9afd-bce3-0e8211baa065@ghiti.fr> Date: Wed, 28 Jul 2021 09:19:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210728064318.375747-1-nek.in.cn@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Kenneth, Le 28/07/2021 à 08:43, Kenneth Lee a écrit : > From: Kenneth Lee > > RISCV use a global variable pfn_base for page/pfn translation. But this > is a common name and will be used elsewhere. In those case, > the page-pfn macro which refer this name will refer to the local/input > variable of those function (such as in vfio_pin_pages_remote). This make > everything wrong. > > This patch change the name from pfn_base to riscv_global_pfn_base to fix > this problem What about removing this variable entirely and using PFN_DOWN(kernel_map.phys_addr) directly in ARCH_PFN_OFFSET definition? That would remove code from mm/init.c, which is nice :) Thanks, Alex > > Signed-off-by: Kenneth Lee > --- > arch/riscv/include/asm/page.h | 4 ++-- > arch/riscv/mm/init.c | 6 +++--- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h > index cca8764aed83..8711e415f37c 100644 > --- a/arch/riscv/include/asm/page.h > +++ b/arch/riscv/include/asm/page.h > @@ -79,8 +79,8 @@ typedef struct page *pgtable_t; > #endif > > #ifdef CONFIG_MMU > -extern unsigned long pfn_base; > -#define ARCH_PFN_OFFSET (pfn_base) > +extern unsigned long riscv_global_pfn_base; > +#define ARCH_PFN_OFFSET (riscv_global_pfn_base) > #else > #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT) > #endif /* CONFIG_MMU */ > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c > index a14bf3910eec..2ce4e9a46ca0 100644 > --- a/arch/riscv/mm/init.c > +++ b/arch/riscv/mm/init.c > @@ -228,8 +228,8 @@ static struct pt_alloc_ops _pt_ops __initdata; > #define pt_ops _pt_ops > #endif > > -unsigned long pfn_base __ro_after_init; > -EXPORT_SYMBOL(pfn_base); > +unsigned long riscv_global_pfn_base __ro_after_init; > +EXPORT_SYMBOL(riscv_global_pfn_base); > > pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > pgd_t trampoline_pg_dir[PTRS_PER_PGD] __page_aligned_bss; > @@ -572,7 +572,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa) > kernel_map.va_kernel_pa_offset = kernel_map.virt_addr - kernel_map.phys_addr; > #endif > > - pfn_base = PFN_DOWN(kernel_map.phys_addr); > + riscv_global_pfn_base = PFN_DOWN(kernel_map.phys_addr); > > /* > * Enforce boot alignment requirements of RV32 and >