Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp5003301pxv; Wed, 28 Jul 2021 00:14:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtruZt9M8LoCJPPug9y2eipNu4FEIjmqgFZk4+xFNgwabU9JjD4ADJYfqJdTf+7XWv2906 X-Received: by 2002:a02:90d0:: with SMTP id c16mr24879524jag.106.1627456455175; Wed, 28 Jul 2021 00:14:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627456455; cv=none; d=google.com; s=arc-20160816; b=lUdkfsT7lhAcZU4uxb2MgyCyXRnjlTSD36X/XTfqabPCYubp2GF6SbwNYw7Hi3SZxM 98guBwY5WXHxKyVkD5BRWqua+FGZTeiFLftiibgB2qZLd+Zimyy7khfCPO0HIFjNiBph LE1tX/a5y4sNVkxFG0UdAIxLrf8Ri6g/PbW88N+MRyXR3YD6xrRFhz6UGe5MmLqaF3f+ 6lXH/bIkI0aFk3I04c6MycjcqhgcQAxfv7E7Lqn2eqtYkRrczIeWEgBjyu4gTWgnuCca QelB1IZC9rEebXZQkGyQi12009YYr8W/Gwd5fMeb4rhzISkVXb1r5+NcV2MkTCcxObuN IQCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=k5a3+miAHopwaZ3W1ZDv47uMhOb6N6oQ5XO7k0fF9lA=; b=UDCRLre1aKSCeRTEy1ruWCKk8N4Drb8vzAWk+4ky/SH8yFOCeQ3XbqglHvyON8jvHD CJzKP6x4Jgn8DiU2uNsH/TV0lrk9ZZeSrKoUWNyD/cTsawA1aZzfDosO6sqcTpbJrk8X q1q5aRJARHGpgB3SM+L0P6ZK3jF8ToZ/eNt3Xd7XGo+0bEzrAWyBg8QlIZjRHIfoJIVF 5HH08HePETO4fADqkt09GdN86EzEg17vLybGhbrKtukoiGfiwDJO3TyifypudU8G4JW4 rX8qu14OcmTd1/nasBS7IuC+ynuehme3jacpGoN9Sla2h9kJm/Fn8axB7ERFbrDWkihk dw7Q== 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=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o2si5697550ilo.2.2021.07.28.00.14.03; Wed, 28 Jul 2021 00:14:15 -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=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233182AbhG1HNW (ORCPT + 99 others); Wed, 28 Jul 2021 03:13:22 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:16013 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233128AbhG1HNU (ORCPT ); Wed, 28 Jul 2021 03:13:20 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4GZPtP4t4JzZtjx; Wed, 28 Jul 2021 15:09:49 +0800 (CST) Received: from dggpemm500002.china.huawei.com (7.185.36.229) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 28 Jul 2021 15:13:17 +0800 Received: from [10.174.178.247] (10.174.178.247) by dggpemm500002.china.huawei.com (7.185.36.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 28 Jul 2021 15:13:16 +0800 Subject: Re: [PATCH] riscv: fix the global name pfn_base confliction error To: Kenneth Lee , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Anup Patel , Atish Patra , Kenneth Lee , Kefeng Wang , "Vitaly Wool" , Guo Ren , "Jisheng Zhang" , Mike Rapoport , Nick Kossifidis , , CC: References: <20210728064318.375747-1-nek.in.cn@gmail.com> From: Hanjun Guo Message-ID: <0b813cde-ca37-9b83-c0c5-ce9f6b8eab3c@huawei.com> Date: Wed, 28 Jul 2021 15:13:16 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20210728064318.375747-1-nek.in.cn@gmail.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.178.247] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500002.china.huawei.com (7.185.36.229) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/7/28 14:43, Kenneth Lee wrote: > 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 > > 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); Just nit: I didn't see any driver in kernel refers to the riscv_global_pfn_base, can we just remove the EXPORT_SYMBOL()? Thanks Hanjun