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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47A0BC433EF for ; Tue, 30 Nov 2021 06:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238720AbhK3Gpm (ORCPT ); Tue, 30 Nov 2021 01:45:42 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]:31925 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233500AbhK3Gpl (ORCPT ); Tue, 30 Nov 2021 01:45:41 -0500 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4J3CLt4BgzzcbkW; Tue, 30 Nov 2021 14:42:14 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:20 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:19 +0800 Message-ID: Date: Tue, 30 Nov 2021 14:42:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH RFC 4/4] mm: percpu: Add generic pcpu_populate_pte() function Content-Language: en-US To: Dennis Zhou CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20211121093557.139034-1-wangkefeng.wang@huawei.com> <20211121093557.139034-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggeme705-chm.china.huawei.com (10.1.199.101) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/11/30 6:49, Dennis Zhou wrote: > On Sun, Nov 21, 2021 at 05:35:57PM +0800, Kefeng Wang wrote: >> When NEED_PER_CPU_PAGE_FIRST_CHUNK enabled, we need a function to >> populate pte, add a generic pcpu populate pte function and switch >> to use it. >> >> Signed-off-by: Kefeng Wang >> --- >> arch/powerpc/kernel/setup_64.c | 47 +-------------------- >> arch/sparc/kernel/smp_64.c | 57 +------------------------ >> arch/x86/kernel/setup_percpu.c | 5 +-- >> drivers/base/arch_numa.c | 51 +--------------------- >> include/linux/percpu.h | 5 +-- >> mm/percpu.c | 77 +++++++++++++++++++++++++++++++--- >> 6 files changed, 79 insertions(+), 163 deletions(-) >> ... >> diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c >> index cd672bd46241..4eadbe45078e 100644 >> --- a/arch/x86/kernel/setup_percpu.c >> +++ b/arch/x86/kernel/setup_percpu.c >> @@ -101,7 +101,7 @@ static int __init pcpu_cpu_to_node(int cpu) >> return IS_ENABLED(CONFIG_NUMA) ? early_cpu_to_node(cpu) : NUMA_NO_NODE; >> } >> >> -static void __init pcpup_populate_pte(unsigned long addr) >> +void __init pcpu_populate_pte(unsigned long addr) >> { >> populate_extra_pte(addr); >> } >> @@ -163,8 +163,7 @@ void __init setup_per_cpu_areas(void) >> } >> if (rc < 0) >> rc = pcpu_page_first_chunk(PERCPU_FIRST_CHUNK_RESERVE, >> - pcpu_cpu_to_node, >> - pcpup_populate_pte); >> + pcpu_cpu_to_node); > x86 has it's own implementation that differs for 32 bit. I'm not > confident this is correct to drop in as a replacement for x86, so I'd > prefer to keep populate_pte_fn() around. The x86's pcpup_populate_pte() version is not dropped. We define a __weak pcpu_populate_pte function in mm/percpu.c, and there is a own version on x86,  so no function change on x86. I will add this into changelog, arch/x86/kernel/setup_percpu.c:  void __init pcpu_populate_pte(unsigned long addr) include/linux/percpu.h:                 void __init pcpu_populate_pte(unsigned long addr); mm/percpu.c:                                void __init __weak pcpu_populate_pte(unsigned long addr) mm/percpu.c: pcpu_populate_pte(unit_addr + (i << PAGE_SHIFT)); >> diff --git a/include/linux/percpu.h b/include/linux/percpu.h >> index d73c97ef4ff4..f1ec5ad1351c 100644 >> --- a/include/linux/percpu.h >> +++ b/include/linux/percpu.h >> @@ -95,7 +95,6 @@ extern const char * const pcpu_fc_names[PCPU_FC_NR]; >> extern enum pcpu_fc pcpu_chosen_fc; >> >> typedef int (pcpu_fc_cpu_to_node_fn_t)(int cpu); >> -typedef void (*pcpu_fc_populate_pte_fn_t)(unsigned long addr); >> typedef int (pcpu_fc_cpu_distance_fn_t)(unsigned int from, unsigned int to); >> >> extern struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups, >> @@ -113,9 +112,9 @@ extern int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif >> >> #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK >> +void __init pcpu_populate_pte(unsigned long addr); >> extern int __init pcpu_page_first_chunk(size_t reserved_size, >> - pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn, >> - pcpu_fc_populate_pte_fn_t populate_pte_fn); >> + pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn); >> #endif >> >> extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __alloc_size(1); >> diff --git a/mm/percpu.c b/mm/percpu.c >> index efaa1cbaf73d..d907daed04eb 100644 >> --- a/mm/percpu.c >> +++ b/mm/percpu.c >> @@ -3162,11 +3162,80 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif /* BUILD_EMBED_FIRST_CHUNK */ >> ... >> +void __init __weak pcpu_populate_pte(unsigned long addr) >> +{ >> + pgd_t *pgd = pgd_offset_k(addr); >> + p4d_t *p4d; >> + pud_t *pud; >> + pmd_t *pmd; >> + >> + if (pgd_none(*pgd)) { >> + p4d_t *new; >> + >> + new = memblock_alloc_from(P4D_TABLE_SIZE, P4D_TABLE_SIZE, PAGE_SIZE); > It's unnecessary to specify a min_addr to memblock_alloc_from() as it > won't allocate 0 anyway. So please use memblock_alloc() instead. ok, will use memblock_alloc in this function 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F17A0C433F5 for ; Tue, 30 Nov 2021 06:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OnIVko7cj5Q/gevXA+v+lMPvQ0399R2BqMDHvQ59V88=; b=MrIdqFEaoN4mHI 6Nn7wNbJCwLNBuoMFMyPnpdRugv4wEvw1KCjKD3qETGFFRRjVdPLO/2I0PMqCljS2iH6QfTLs8XAX NUlOEeJQ2+2k9HRNGIkZRsKN9191W6S5+8SBxKiHL5XoLbcrfa42W9zHqGQJnTKRGN/F9u3SqdMNY LpOXLbZ5TeUH6te37t6BqJkfKMF8bStnaZL12DIvP7Au801Qnr1TFq4KkEsPx2e0Y/azDj3OVgH2m 07zv/w52EWVS6hOAAOR+zNAh5XRzoXHgtB/fo2S6oZNEyNlYLe2v6uRzns3SlTj2+7BMWBoZPg8gV Kqx/jtiyAGQk8/mR7uuw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrwqd-003pLc-Oc; Tue, 30 Nov 2021 06:42:39 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrwqN-003pGt-Gh; Tue, 30 Nov 2021 06:42:25 +0000 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4J3CLt4BgzzcbkW; Tue, 30 Nov 2021 14:42:14 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:20 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:19 +0800 Message-ID: Date: Tue, 30 Nov 2021 14:42:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH RFC 4/4] mm: percpu: Add generic pcpu_populate_pte() function Content-Language: en-US To: Dennis Zhou CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20211121093557.139034-1-wangkefeng.wang@huawei.com> <20211121093557.139034-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggeme705-chm.china.huawei.com (10.1.199.101) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211129_224223_920382_512E8BCE X-CRM114-Status: GOOD ( 14.71 ) 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: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Ck9uIDIwMjEvMTEvMzAgNjo0OSwgRGVubmlzIFpob3Ugd3JvdGU6Cj4gT24gU3VuLCBOb3YgMjEs IDIwMjEgYXQgMDU6MzU6NTdQTSArMDgwMCwgS2VmZW5nIFdhbmcgd3JvdGU6Cj4+IFdoZW4gTkVF RF9QRVJfQ1BVX1BBR0VfRklSU1RfQ0hVTksgZW5hYmxlZCwgd2UgbmVlZCBhIGZ1bmN0aW9uIHRv Cj4+IHBvcHVsYXRlIHB0ZSwgYWRkIGEgZ2VuZXJpYyBwY3B1IHBvcHVsYXRlIHB0ZSBmdW5jdGlv biBhbmQgc3dpdGNoCj4+IHRvIHVzZSBpdC4KPj4KPj4gU2lnbmVkLW9mZi1ieTogS2VmZW5nIFdh bmcgPHdhbmdrZWZlbmcud2FuZ0BodWF3ZWkuY29tPgo+PiAtLS0KPj4gICBhcmNoL3Bvd2VycGMv a2VybmVsL3NldHVwXzY0LmMgfCA0NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0KPj4gICBhcmNoL3Nw YXJjL2tlcm5lbC9zbXBfNjQuYyAgICAgfCA1NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4+ ICAgYXJjaC94ODYva2VybmVsL3NldHVwX3BlcmNwdS5jIHwgIDUgKy0tCj4+ICAgZHJpdmVycy9i YXNlL2FyY2hfbnVtYS5jICAgICAgIHwgNTEgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+PiAgIGlu Y2x1ZGUvbGludXgvcGVyY3B1LmggICAgICAgICB8ICA1ICstLQo+PiAgIG1tL3BlcmNwdS5jICAg ICAgICAgICAgICAgICAgICB8IDc3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0K Pj4gICA2IGZpbGVzIGNoYW5nZWQsIDc5IGluc2VydGlvbnMoKyksIDE2MyBkZWxldGlvbnMoLSkK Pj4KLi4uCj4+IGRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMgYi9h cmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMKPj4gaW5kZXggY2Q2NzJiZDQ2MjQxLi40ZWFk YmU0NTA3OGUgMTAwNjQ0Cj4+IC0tLSBhL2FyY2gveDg2L2tlcm5lbC9zZXR1cF9wZXJjcHUuYwo+ PiArKysgYi9hcmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMKPj4gQEAgLTEwMSw3ICsxMDEs NyBAQCBzdGF0aWMgaW50IF9faW5pdCBwY3B1X2NwdV90b19ub2RlKGludCBjcHUpCj4+ICAgCXJl dHVybiBJU19FTkFCTEVEKENPTkZJR19OVU1BKSA/IGVhcmx5X2NwdV90b19ub2RlKGNwdSkgOiBO VU1BX05PX05PREU7Cj4+ICAgfQo+PiAgIAo+PiAtc3RhdGljIHZvaWQgX19pbml0IHBjcHVwX3Bv cHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpCj4+ICt2b2lkIF9faW5pdCBwY3B1X3BvcHVs YXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpCj4+ICAgewo+PiAgIAlwb3B1bGF0ZV9leHRyYV9w dGUoYWRkcik7Cj4+ICAgfQo+PiBAQCAtMTYzLDggKzE2Myw3IEBAIHZvaWQgX19pbml0IHNldHVw X3Blcl9jcHVfYXJlYXModm9pZCkKPj4gICAJfQo+PiAgIAlpZiAocmMgPCAwKQo+PiAgIAkJcmMg PSBwY3B1X3BhZ2VfZmlyc3RfY2h1bmsoUEVSQ1BVX0ZJUlNUX0NIVU5LX1JFU0VSVkUsCj4+IC0J CQkJCSAgIHBjcHVfY3B1X3RvX25vZGUsCj4+IC0JCQkJCSAgIHBjcHVwX3BvcHVsYXRlX3B0ZSk7 Cj4+ICsJCQkJCSAgIHBjcHVfY3B1X3RvX25vZGUpOwo+IHg4NiBoYXMgaXQncyBvd24gaW1wbGVt ZW50YXRpb24gdGhhdCBkaWZmZXJzIGZvciAzMiBiaXQuIEknbSBub3QKPiBjb25maWRlbnQgdGhp cyBpcyBjb3JyZWN0IHRvIGRyb3AgaW4gYXMgYSByZXBsYWNlbWVudCBmb3IgeDg2LCBzbyBJJ2QK PiBwcmVmZXIgdG8ga2VlcCBwb3B1bGF0ZV9wdGVfZm4oKSBhcm91bmQuCgoKVGhlIHg4NidzIHBj cHVwX3BvcHVsYXRlX3B0ZSgpIHZlcnNpb24gaXMgbm90IGRyb3BwZWQuCgpXZSBkZWZpbmUgYSBf X3dlYWsgcGNwdV9wb3B1bGF0ZV9wdGUgZnVuY3Rpb24gaW4gbW0vcGVyY3B1LmMsCgphbmQgdGhl cmUgaXMgYSBvd24gdmVyc2lvbiBvbiB4ODYswqAgc28gbm8gZnVuY3Rpb24gY2hhbmdlIG9uIHg4 Ni4KCkkgd2lsbCBhZGQgdGhpcyBpbnRvIGNoYW5nZWxvZywKCmFyY2gveDg2L2tlcm5lbC9zZXR1 cF9wZXJjcHUuYzrCoCB2b2lkIF9faW5pdCBwY3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCAKbG9u ZyBhZGRyKQppbmNsdWRlL2xpbnV4L3BlcmNwdS5oOsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIHZvaWQgX19pbml0IApwY3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIp OwptbS9wZXJjcHUuYzrCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCB2b2lkIF9faW5pdCBfX3dlYWsgCnBjcHVfcG9wdWxhdGVfcHRl KHVuc2lnbmVkIGxvbmcgYWRkcikKbW0vcGVyY3B1LmM6IHBjcHVfcG9wdWxhdGVfcHRlKHVuaXRf YWRkciArIChpIDw8IFBBR0VfU0hJRlQpKTsKCgo+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51 eC9wZXJjcHUuaCBiL2luY2x1ZGUvbGludXgvcGVyY3B1LmgKPj4gaW5kZXggZDczYzk3ZWY0ZmY0 Li5mMWVjNWFkMTM1MWMgMTAwNjQ0Cj4+IC0tLSBhL2luY2x1ZGUvbGludXgvcGVyY3B1LmgKPj4g KysrIGIvaW5jbHVkZS9saW51eC9wZXJjcHUuaAo+PiBAQCAtOTUsNyArOTUsNiBAQCBleHRlcm4g Y29uc3QgY2hhciAqIGNvbnN0IHBjcHVfZmNfbmFtZXNbUENQVV9GQ19OUl07Cj4+ICAgZXh0ZXJu IGVudW0gcGNwdV9mYyBwY3B1X2Nob3Nlbl9mYzsKPj4gICAKPj4gICB0eXBlZGVmIGludCAocGNw dV9mY19jcHVfdG9fbm9kZV9mbl90KShpbnQgY3B1KTsKPj4gLXR5cGVkZWYgdm9pZCAoKnBjcHVf ZmNfcG9wdWxhdGVfcHRlX2ZuX3QpKHVuc2lnbmVkIGxvbmcgYWRkcik7Cj4+ICAgdHlwZWRlZiBp bnQgKHBjcHVfZmNfY3B1X2Rpc3RhbmNlX2ZuX3QpKHVuc2lnbmVkIGludCBmcm9tLCB1bnNpZ25l ZCBpbnQgdG8pOwo+PiAgIAo+PiAgIGV4dGVybiBzdHJ1Y3QgcGNwdV9hbGxvY19pbmZvICogX19p bml0IHBjcHVfYWxsb2NfYWxsb2NfaW5mbyhpbnQgbnJfZ3JvdXBzLAo+PiBAQCAtMTEzLDkgKzEx Miw5IEBAIGV4dGVybiBpbnQgX19pbml0IHBjcHVfZW1iZWRfZmlyc3RfY2h1bmsoc2l6ZV90IHJl c2VydmVkX3NpemUsIHNpemVfdCBkeW5fc2l6ZSwKPj4gICAjZW5kaWYKPj4gICAKPj4gICAjaWZk ZWYgQ09ORklHX05FRURfUEVSX0NQVV9QQUdFX0ZJUlNUX0NIVU5LCj4+ICt2b2lkIF9faW5pdCBw Y3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpOwo+PiAgIGV4dGVybiBpbnQgX19p bml0IHBjcHVfcGFnZV9maXJzdF9jaHVuayhzaXplX3QgcmVzZXJ2ZWRfc2l6ZSwKPj4gLQkJCQlw Y3B1X2ZjX2NwdV90b19ub2RlX2ZuX3QgY3B1X3RvX25kX2ZuLAo+PiAtCQkJCXBjcHVfZmNfcG9w dWxhdGVfcHRlX2ZuX3QgcG9wdWxhdGVfcHRlX2ZuKTsKPj4gKwkJCQlwY3B1X2ZjX2NwdV90b19u b2RlX2ZuX3QgY3B1X3RvX25kX2ZuKTsKPj4gICAjZW5kaWYKPj4gICAKPj4gICBleHRlcm4gdm9p ZCBfX3BlcmNwdSAqX19hbGxvY19yZXNlcnZlZF9wZXJjcHUoc2l6ZV90IHNpemUsIHNpemVfdCBh bGlnbikgX19hbGxvY19zaXplKDEpOwo+PiBkaWZmIC0tZ2l0IGEvbW0vcGVyY3B1LmMgYi9tbS9w ZXJjcHUuYwo+PiBpbmRleCBlZmFhMWNiYWY3M2QuLmQ5MDdkYWVkMDRlYiAxMDA2NDQKPj4gLS0t IGEvbW0vcGVyY3B1LmMKPj4gKysrIGIvbW0vcGVyY3B1LmMKPj4gQEAgLTMxNjIsMTEgKzMxNjIs ODAgQEAgaW50IF9faW5pdCBwY3B1X2VtYmVkX2ZpcnN0X2NodW5rKHNpemVfdCByZXNlcnZlZF9z aXplLCBzaXplX3QgZHluX3NpemUsCj4+ICAgI2VuZGlmIC8qIEJVSUxEX0VNQkVEX0ZJUlNUX0NI VU5LICovCj4+ICAgCi4uLgo+PiArdm9pZCBfX2luaXQgX193ZWFrIHBjcHVfcG9wdWxhdGVfcHRl KHVuc2lnbmVkIGxvbmcgYWRkcikKPj4gK3sKPj4gKwlwZ2RfdCAqcGdkID0gcGdkX29mZnNldF9r KGFkZHIpOwo+PiArCXA0ZF90ICpwNGQ7Cj4+ICsJcHVkX3QgKnB1ZDsKPj4gKwlwbWRfdCAqcG1k Owo+PiArCj4+ICsJaWYgKHBnZF9ub25lKCpwZ2QpKSB7Cj4+ICsJCXA0ZF90ICpuZXc7Cj4+ICsK Pj4gKwkJbmV3ID0gbWVtYmxvY2tfYWxsb2NfZnJvbShQNERfVEFCTEVfU0laRSwgUDREX1RBQkxF X1NJWkUsIFBBR0VfU0laRSk7Cj4gSXQncyB1bm5lY2Vzc2FyeSB0byBzcGVjaWZ5IGEgbWluX2Fk ZHIgdG8gbWVtYmxvY2tfYWxsb2NfZnJvbSgpIGFzIGl0Cj4gd29uJ3QgYWxsb2NhdGUgMCBhbnl3 YXkuIFNvIHBsZWFzZSB1c2UgbWVtYmxvY2tfYWxsb2MoKSBpbnN0ZWFkLgoKb2ssIHdpbGwgdXNl IG1lbWJsb2NrX2FsbG9jIGluIHRoaXMgZnVuY3Rpb24KCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1yaXNjdiBtYWlsaW5nIGxpc3QKbGludXgt cmlzY3ZAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWls bWFuL2xpc3RpbmZvL2xpbnV4LXJpc2N2Cg== 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 Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A82A4C433F5 for ; Tue, 30 Nov 2021 06:43:26 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4J3CNF1HQvz3cZ6 for ; Tue, 30 Nov 2021 17:43:25 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com (client-ip=45.249.212.187; helo=szxga01-in.huawei.com; envelope-from=wangkefeng.wang@huawei.com; receiver=) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4J3CMk5JRbz2yS3 for ; Tue, 30 Nov 2021 17:42:55 +1100 (AEDT) Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4J3CLt4BgzzcbkW; Tue, 30 Nov 2021 14:42:14 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:20 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:19 +0800 Message-ID: Date: Tue, 30 Nov 2021 14:42:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH RFC 4/4] mm: percpu: Add generic pcpu_populate_pte() function Content-Language: en-US To: Dennis Zhou References: <20211121093557.139034-1-wangkefeng.wang@huawei.com> <20211121093557.139034-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggeme705-chm.china.huawei.com (10.1.199.101) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-ia64@vger.kernel.org, dave.hansen@linux.intel.com, linux-mips@vger.kernel.org, linux-mm@kvack.org, paulus@samba.org, hpa@zytor.com, sparclinux@vger.kernel.org, cl@linux.com, will@kernel.org, linux-riscv@lists.infradead.org, x86@kernel.org, mingo@redhat.com, catalin.marinas@arm.com, aou@eecs.berkeley.edu, bp@alien8.de, paul.walmsley@sifive.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, tsbogend@alpha.franken.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, palmer@dabbelt.com, tj@kernel.org, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 2021/11/30 6:49, Dennis Zhou wrote: > On Sun, Nov 21, 2021 at 05:35:57PM +0800, Kefeng Wang wrote: >> When NEED_PER_CPU_PAGE_FIRST_CHUNK enabled, we need a function to >> populate pte, add a generic pcpu populate pte function and switch >> to use it. >> >> Signed-off-by: Kefeng Wang >> --- >> arch/powerpc/kernel/setup_64.c | 47 +-------------------- >> arch/sparc/kernel/smp_64.c | 57 +------------------------ >> arch/x86/kernel/setup_percpu.c | 5 +-- >> drivers/base/arch_numa.c | 51 +--------------------- >> include/linux/percpu.h | 5 +-- >> mm/percpu.c | 77 +++++++++++++++++++++++++++++++--- >> 6 files changed, 79 insertions(+), 163 deletions(-) >> ... >> diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c >> index cd672bd46241..4eadbe45078e 100644 >> --- a/arch/x86/kernel/setup_percpu.c >> +++ b/arch/x86/kernel/setup_percpu.c >> @@ -101,7 +101,7 @@ static int __init pcpu_cpu_to_node(int cpu) >> return IS_ENABLED(CONFIG_NUMA) ? early_cpu_to_node(cpu) : NUMA_NO_NODE; >> } >> >> -static void __init pcpup_populate_pte(unsigned long addr) >> +void __init pcpu_populate_pte(unsigned long addr) >> { >> populate_extra_pte(addr); >> } >> @@ -163,8 +163,7 @@ void __init setup_per_cpu_areas(void) >> } >> if (rc < 0) >> rc = pcpu_page_first_chunk(PERCPU_FIRST_CHUNK_RESERVE, >> - pcpu_cpu_to_node, >> - pcpup_populate_pte); >> + pcpu_cpu_to_node); > x86 has it's own implementation that differs for 32 bit. I'm not > confident this is correct to drop in as a replacement for x86, so I'd > prefer to keep populate_pte_fn() around. The x86's pcpup_populate_pte() version is not dropped. We define a __weak pcpu_populate_pte function in mm/percpu.c, and there is a own version on x86,  so no function change on x86. I will add this into changelog, arch/x86/kernel/setup_percpu.c:  void __init pcpu_populate_pte(unsigned long addr) include/linux/percpu.h:                 void __init pcpu_populate_pte(unsigned long addr); mm/percpu.c:                                void __init __weak pcpu_populate_pte(unsigned long addr) mm/percpu.c: pcpu_populate_pte(unit_addr + (i << PAGE_SHIFT)); >> diff --git a/include/linux/percpu.h b/include/linux/percpu.h >> index d73c97ef4ff4..f1ec5ad1351c 100644 >> --- a/include/linux/percpu.h >> +++ b/include/linux/percpu.h >> @@ -95,7 +95,6 @@ extern const char * const pcpu_fc_names[PCPU_FC_NR]; >> extern enum pcpu_fc pcpu_chosen_fc; >> >> typedef int (pcpu_fc_cpu_to_node_fn_t)(int cpu); >> -typedef void (*pcpu_fc_populate_pte_fn_t)(unsigned long addr); >> typedef int (pcpu_fc_cpu_distance_fn_t)(unsigned int from, unsigned int to); >> >> extern struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups, >> @@ -113,9 +112,9 @@ extern int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif >> >> #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK >> +void __init pcpu_populate_pte(unsigned long addr); >> extern int __init pcpu_page_first_chunk(size_t reserved_size, >> - pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn, >> - pcpu_fc_populate_pte_fn_t populate_pte_fn); >> + pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn); >> #endif >> >> extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __alloc_size(1); >> diff --git a/mm/percpu.c b/mm/percpu.c >> index efaa1cbaf73d..d907daed04eb 100644 >> --- a/mm/percpu.c >> +++ b/mm/percpu.c >> @@ -3162,11 +3162,80 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif /* BUILD_EMBED_FIRST_CHUNK */ >> ... >> +void __init __weak pcpu_populate_pte(unsigned long addr) >> +{ >> + pgd_t *pgd = pgd_offset_k(addr); >> + p4d_t *p4d; >> + pud_t *pud; >> + pmd_t *pmd; >> + >> + if (pgd_none(*pgd)) { >> + p4d_t *new; >> + >> + new = memblock_alloc_from(P4D_TABLE_SIZE, P4D_TABLE_SIZE, PAGE_SIZE); > It's unnecessary to specify a min_addr to memblock_alloc_from() as it > won't allocate 0 anyway. So please use memblock_alloc() instead. ok, will use memblock_alloc in this function 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5E129C433F5 for ; Tue, 30 Nov 2021 06:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Nnk8udNVeSv0CVymSi5/6YS7XXZ2OMLryiLqTJed+1g=; b=YOTmN1PDYM1qmr hx6QBxKy3drSu+JusBAkrFVs5N1NV5gUy6Gz/M+PSnp2RHgWuenCE7Ww6J3+la1Bu9F//4q0iqaaw zTEPIIc/T2tDkItaq5tqISGI8jUVJ3PCe419kKZrUtmuNXv8X7+oJyXLuQOMSBGlG6HZF7R/3qGAA 8m3AwD+lSrB5/Bd0fXSus49CtmiIWrN1gH+DMdzQW4L+SMAcxgHKebRk+igOhSXWsfjpcR1zdSBXz YsU1pQQKnHtDMyv9oIgp54ebTgijGglgeukoAroH/aqzLsP8R86zfSpbp7NfBLsEGp+Ojypori58M 0FibWRkSfs/UNRSWXIYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrwqS-003pIJ-Bu; Tue, 30 Nov 2021 06:42:28 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrwqN-003pGt-Gh; Tue, 30 Nov 2021 06:42:25 +0000 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4J3CLt4BgzzcbkW; Tue, 30 Nov 2021 14:42:14 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:20 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Tue, 30 Nov 2021 14:42:19 +0800 Message-ID: Date: Tue, 30 Nov 2021 14:42:18 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH RFC 4/4] mm: percpu: Add generic pcpu_populate_pte() function Content-Language: en-US To: Dennis Zhou CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , References: <20211121093557.139034-1-wangkefeng.wang@huawei.com> <20211121093557.139034-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggeme705-chm.china.huawei.com (10.1.199.101) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211129_224223_920382_512E8BCE X-CRM114-Status: GOOD ( 14.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Ck9uIDIwMjEvMTEvMzAgNjo0OSwgRGVubmlzIFpob3Ugd3JvdGU6Cj4gT24gU3VuLCBOb3YgMjEs IDIwMjEgYXQgMDU6MzU6NTdQTSArMDgwMCwgS2VmZW5nIFdhbmcgd3JvdGU6Cj4+IFdoZW4gTkVF RF9QRVJfQ1BVX1BBR0VfRklSU1RfQ0hVTksgZW5hYmxlZCwgd2UgbmVlZCBhIGZ1bmN0aW9uIHRv Cj4+IHBvcHVsYXRlIHB0ZSwgYWRkIGEgZ2VuZXJpYyBwY3B1IHBvcHVsYXRlIHB0ZSBmdW5jdGlv biBhbmQgc3dpdGNoCj4+IHRvIHVzZSBpdC4KPj4KPj4gU2lnbmVkLW9mZi1ieTogS2VmZW5nIFdh bmcgPHdhbmdrZWZlbmcud2FuZ0BodWF3ZWkuY29tPgo+PiAtLS0KPj4gICBhcmNoL3Bvd2VycGMv a2VybmVsL3NldHVwXzY0LmMgfCA0NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0KPj4gICBhcmNoL3Nw YXJjL2tlcm5lbC9zbXBfNjQuYyAgICAgfCA1NyArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCj4+ ICAgYXJjaC94ODYva2VybmVsL3NldHVwX3BlcmNwdS5jIHwgIDUgKy0tCj4+ICAgZHJpdmVycy9i YXNlL2FyY2hfbnVtYS5jICAgICAgIHwgNTEgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+PiAgIGlu Y2x1ZGUvbGludXgvcGVyY3B1LmggICAgICAgICB8ICA1ICstLQo+PiAgIG1tL3BlcmNwdS5jICAg ICAgICAgICAgICAgICAgICB8IDc3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0K Pj4gICA2IGZpbGVzIGNoYW5nZWQsIDc5IGluc2VydGlvbnMoKyksIDE2MyBkZWxldGlvbnMoLSkK Pj4KLi4uCj4+IGRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMgYi9h cmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMKPj4gaW5kZXggY2Q2NzJiZDQ2MjQxLi40ZWFk YmU0NTA3OGUgMTAwNjQ0Cj4+IC0tLSBhL2FyY2gveDg2L2tlcm5lbC9zZXR1cF9wZXJjcHUuYwo+ PiArKysgYi9hcmNoL3g4Ni9rZXJuZWwvc2V0dXBfcGVyY3B1LmMKPj4gQEAgLTEwMSw3ICsxMDEs NyBAQCBzdGF0aWMgaW50IF9faW5pdCBwY3B1X2NwdV90b19ub2RlKGludCBjcHUpCj4+ICAgCXJl dHVybiBJU19FTkFCTEVEKENPTkZJR19OVU1BKSA/IGVhcmx5X2NwdV90b19ub2RlKGNwdSkgOiBO VU1BX05PX05PREU7Cj4+ICAgfQo+PiAgIAo+PiAtc3RhdGljIHZvaWQgX19pbml0IHBjcHVwX3Bv cHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpCj4+ICt2b2lkIF9faW5pdCBwY3B1X3BvcHVs YXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpCj4+ICAgewo+PiAgIAlwb3B1bGF0ZV9leHRyYV9w dGUoYWRkcik7Cj4+ICAgfQo+PiBAQCAtMTYzLDggKzE2Myw3IEBAIHZvaWQgX19pbml0IHNldHVw X3Blcl9jcHVfYXJlYXModm9pZCkKPj4gICAJfQo+PiAgIAlpZiAocmMgPCAwKQo+PiAgIAkJcmMg PSBwY3B1X3BhZ2VfZmlyc3RfY2h1bmsoUEVSQ1BVX0ZJUlNUX0NIVU5LX1JFU0VSVkUsCj4+IC0J CQkJCSAgIHBjcHVfY3B1X3RvX25vZGUsCj4+IC0JCQkJCSAgIHBjcHVwX3BvcHVsYXRlX3B0ZSk7 Cj4+ICsJCQkJCSAgIHBjcHVfY3B1X3RvX25vZGUpOwo+IHg4NiBoYXMgaXQncyBvd24gaW1wbGVt ZW50YXRpb24gdGhhdCBkaWZmZXJzIGZvciAzMiBiaXQuIEknbSBub3QKPiBjb25maWRlbnQgdGhp cyBpcyBjb3JyZWN0IHRvIGRyb3AgaW4gYXMgYSByZXBsYWNlbWVudCBmb3IgeDg2LCBzbyBJJ2QK PiBwcmVmZXIgdG8ga2VlcCBwb3B1bGF0ZV9wdGVfZm4oKSBhcm91bmQuCgoKVGhlIHg4NidzIHBj cHVwX3BvcHVsYXRlX3B0ZSgpIHZlcnNpb24gaXMgbm90IGRyb3BwZWQuCgpXZSBkZWZpbmUgYSBf X3dlYWsgcGNwdV9wb3B1bGF0ZV9wdGUgZnVuY3Rpb24gaW4gbW0vcGVyY3B1LmMsCgphbmQgdGhl cmUgaXMgYSBvd24gdmVyc2lvbiBvbiB4ODYswqAgc28gbm8gZnVuY3Rpb24gY2hhbmdlIG9uIHg4 Ni4KCkkgd2lsbCBhZGQgdGhpcyBpbnRvIGNoYW5nZWxvZywKCmFyY2gveDg2L2tlcm5lbC9zZXR1 cF9wZXJjcHUuYzrCoCB2b2lkIF9faW5pdCBwY3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCAKbG9u ZyBhZGRyKQppbmNsdWRlL2xpbnV4L3BlcmNwdS5oOsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgIHZvaWQgX19pbml0IApwY3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIp OwptbS9wZXJjcHUuYzrCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCB2b2lkIF9faW5pdCBfX3dlYWsgCnBjcHVfcG9wdWxhdGVfcHRl KHVuc2lnbmVkIGxvbmcgYWRkcikKbW0vcGVyY3B1LmM6IHBjcHVfcG9wdWxhdGVfcHRlKHVuaXRf YWRkciArIChpIDw8IFBBR0VfU0hJRlQpKTsKCgo+PiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51 eC9wZXJjcHUuaCBiL2luY2x1ZGUvbGludXgvcGVyY3B1LmgKPj4gaW5kZXggZDczYzk3ZWY0ZmY0 Li5mMWVjNWFkMTM1MWMgMTAwNjQ0Cj4+IC0tLSBhL2luY2x1ZGUvbGludXgvcGVyY3B1LmgKPj4g KysrIGIvaW5jbHVkZS9saW51eC9wZXJjcHUuaAo+PiBAQCAtOTUsNyArOTUsNiBAQCBleHRlcm4g Y29uc3QgY2hhciAqIGNvbnN0IHBjcHVfZmNfbmFtZXNbUENQVV9GQ19OUl07Cj4+ICAgZXh0ZXJu IGVudW0gcGNwdV9mYyBwY3B1X2Nob3Nlbl9mYzsKPj4gICAKPj4gICB0eXBlZGVmIGludCAocGNw dV9mY19jcHVfdG9fbm9kZV9mbl90KShpbnQgY3B1KTsKPj4gLXR5cGVkZWYgdm9pZCAoKnBjcHVf ZmNfcG9wdWxhdGVfcHRlX2ZuX3QpKHVuc2lnbmVkIGxvbmcgYWRkcik7Cj4+ICAgdHlwZWRlZiBp bnQgKHBjcHVfZmNfY3B1X2Rpc3RhbmNlX2ZuX3QpKHVuc2lnbmVkIGludCBmcm9tLCB1bnNpZ25l ZCBpbnQgdG8pOwo+PiAgIAo+PiAgIGV4dGVybiBzdHJ1Y3QgcGNwdV9hbGxvY19pbmZvICogX19p bml0IHBjcHVfYWxsb2NfYWxsb2NfaW5mbyhpbnQgbnJfZ3JvdXBzLAo+PiBAQCAtMTEzLDkgKzEx Miw5IEBAIGV4dGVybiBpbnQgX19pbml0IHBjcHVfZW1iZWRfZmlyc3RfY2h1bmsoc2l6ZV90IHJl c2VydmVkX3NpemUsIHNpemVfdCBkeW5fc2l6ZSwKPj4gICAjZW5kaWYKPj4gICAKPj4gICAjaWZk ZWYgQ09ORklHX05FRURfUEVSX0NQVV9QQUdFX0ZJUlNUX0NIVU5LCj4+ICt2b2lkIF9faW5pdCBw Y3B1X3BvcHVsYXRlX3B0ZSh1bnNpZ25lZCBsb25nIGFkZHIpOwo+PiAgIGV4dGVybiBpbnQgX19p bml0IHBjcHVfcGFnZV9maXJzdF9jaHVuayhzaXplX3QgcmVzZXJ2ZWRfc2l6ZSwKPj4gLQkJCQlw Y3B1X2ZjX2NwdV90b19ub2RlX2ZuX3QgY3B1X3RvX25kX2ZuLAo+PiAtCQkJCXBjcHVfZmNfcG9w dWxhdGVfcHRlX2ZuX3QgcG9wdWxhdGVfcHRlX2ZuKTsKPj4gKwkJCQlwY3B1X2ZjX2NwdV90b19u b2RlX2ZuX3QgY3B1X3RvX25kX2ZuKTsKPj4gICAjZW5kaWYKPj4gICAKPj4gICBleHRlcm4gdm9p ZCBfX3BlcmNwdSAqX19hbGxvY19yZXNlcnZlZF9wZXJjcHUoc2l6ZV90IHNpemUsIHNpemVfdCBh bGlnbikgX19hbGxvY19zaXplKDEpOwo+PiBkaWZmIC0tZ2l0IGEvbW0vcGVyY3B1LmMgYi9tbS9w ZXJjcHUuYwo+PiBpbmRleCBlZmFhMWNiYWY3M2QuLmQ5MDdkYWVkMDRlYiAxMDA2NDQKPj4gLS0t IGEvbW0vcGVyY3B1LmMKPj4gKysrIGIvbW0vcGVyY3B1LmMKPj4gQEAgLTMxNjIsMTEgKzMxNjIs ODAgQEAgaW50IF9faW5pdCBwY3B1X2VtYmVkX2ZpcnN0X2NodW5rKHNpemVfdCByZXNlcnZlZF9z aXplLCBzaXplX3QgZHluX3NpemUsCj4+ICAgI2VuZGlmIC8qIEJVSUxEX0VNQkVEX0ZJUlNUX0NI VU5LICovCj4+ICAgCi4uLgo+PiArdm9pZCBfX2luaXQgX193ZWFrIHBjcHVfcG9wdWxhdGVfcHRl KHVuc2lnbmVkIGxvbmcgYWRkcikKPj4gK3sKPj4gKwlwZ2RfdCAqcGdkID0gcGdkX29mZnNldF9r KGFkZHIpOwo+PiArCXA0ZF90ICpwNGQ7Cj4+ICsJcHVkX3QgKnB1ZDsKPj4gKwlwbWRfdCAqcG1k Owo+PiArCj4+ICsJaWYgKHBnZF9ub25lKCpwZ2QpKSB7Cj4+ICsJCXA0ZF90ICpuZXc7Cj4+ICsK Pj4gKwkJbmV3ID0gbWVtYmxvY2tfYWxsb2NfZnJvbShQNERfVEFCTEVfU0laRSwgUDREX1RBQkxF X1NJWkUsIFBBR0VfU0laRSk7Cj4gSXQncyB1bm5lY2Vzc2FyeSB0byBzcGVjaWZ5IGEgbWluX2Fk ZHIgdG8gbWVtYmxvY2tfYWxsb2NfZnJvbSgpIGFzIGl0Cj4gd29uJ3QgYWxsb2NhdGUgMCBhbnl3 YXkuIFNvIHBsZWFzZSB1c2UgbWVtYmxvY2tfYWxsb2MoKSBpbnN0ZWFkLgoKb2ssIHdpbGwgdXNl IG1lbWJsb2NrX2FsbG9jIGluIHRoaXMgZnVuY3Rpb24KCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kefeng Wang Date: Tue, 30 Nov 2021 06:42:18 +0000 Subject: Re: [PATCH RFC 4/4] mm: percpu: Add generic pcpu_populate_pte() function Message-Id: List-Id: References: <20211121093557.139034-1-wangkefeng.wang@huawei.com> <20211121093557.139034-5-wangkefeng.wang@huawei.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Dennis Zhou Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, tj@kernel.org, gregkh@linuxfoundation.org, cl@linux.com, catalin.marinas@arm.com, will@kernel.org, tsbogend@alpha.franken.de, mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, linux-arm-kernel@lists.infradead.org, linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, sparclinux@vger.kernel.org, x86@kernel.org On 2021/11/30 6:49, Dennis Zhou wrote: > On Sun, Nov 21, 2021 at 05:35:57PM +0800, Kefeng Wang wrote: >> When NEED_PER_CPU_PAGE_FIRST_CHUNK enabled, we need a function to >> populate pte, add a generic pcpu populate pte function and switch >> to use it. >> >> Signed-off-by: Kefeng Wang >> --- >> arch/powerpc/kernel/setup_64.c | 47 +-------------------- >> arch/sparc/kernel/smp_64.c | 57 +------------------------ >> arch/x86/kernel/setup_percpu.c | 5 +-- >> drivers/base/arch_numa.c | 51 +--------------------- >> include/linux/percpu.h | 5 +-- >> mm/percpu.c | 77 +++++++++++++++++++++++++++++++--- >> 6 files changed, 79 insertions(+), 163 deletions(-) >> ... >> diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c >> index cd672bd46241..4eadbe45078e 100644 >> --- a/arch/x86/kernel/setup_percpu.c >> +++ b/arch/x86/kernel/setup_percpu.c >> @@ -101,7 +101,7 @@ static int __init pcpu_cpu_to_node(int cpu) >> return IS_ENABLED(CONFIG_NUMA) ? early_cpu_to_node(cpu) : NUMA_NO_NODE; >> } >> >> -static void __init pcpup_populate_pte(unsigned long addr) >> +void __init pcpu_populate_pte(unsigned long addr) >> { >> populate_extra_pte(addr); >> } >> @@ -163,8 +163,7 @@ void __init setup_per_cpu_areas(void) >> } >> if (rc < 0) >> rc = pcpu_page_first_chunk(PERCPU_FIRST_CHUNK_RESERVE, >> - pcpu_cpu_to_node, >> - pcpup_populate_pte); >> + pcpu_cpu_to_node); > x86 has it's own implementation that differs for 32 bit. I'm not > confident this is correct to drop in as a replacement for x86, so I'd > prefer to keep populate_pte_fn() around. The x86's pcpup_populate_pte() version is not dropped. We define a __weak pcpu_populate_pte function in mm/percpu.c, and there is a own version on x86,  so no function change on x86. I will add this into changelog, arch/x86/kernel/setup_percpu.c:  void __init pcpu_populate_pte(unsigned long addr) include/linux/percpu.h:                 void __init pcpu_populate_pte(unsigned long addr); mm/percpu.c:                                void __init __weak pcpu_populate_pte(unsigned long addr) mm/percpu.c: pcpu_populate_pte(unit_addr + (i << PAGE_SHIFT)); >> diff --git a/include/linux/percpu.h b/include/linux/percpu.h >> index d73c97ef4ff4..f1ec5ad1351c 100644 >> --- a/include/linux/percpu.h >> +++ b/include/linux/percpu.h >> @@ -95,7 +95,6 @@ extern const char * const pcpu_fc_names[PCPU_FC_NR]; >> extern enum pcpu_fc pcpu_chosen_fc; >> >> typedef int (pcpu_fc_cpu_to_node_fn_t)(int cpu); >> -typedef void (*pcpu_fc_populate_pte_fn_t)(unsigned long addr); >> typedef int (pcpu_fc_cpu_distance_fn_t)(unsigned int from, unsigned int to); >> >> extern struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups, >> @@ -113,9 +112,9 @@ extern int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif >> >> #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK >> +void __init pcpu_populate_pte(unsigned long addr); >> extern int __init pcpu_page_first_chunk(size_t reserved_size, >> - pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn, >> - pcpu_fc_populate_pte_fn_t populate_pte_fn); >> + pcpu_fc_cpu_to_node_fn_t cpu_to_nd_fn); >> #endif >> >> extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __alloc_size(1); >> diff --git a/mm/percpu.c b/mm/percpu.c >> index efaa1cbaf73d..d907daed04eb 100644 >> --- a/mm/percpu.c >> +++ b/mm/percpu.c >> @@ -3162,11 +3162,80 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, >> #endif /* BUILD_EMBED_FIRST_CHUNK */ >> ... >> +void __init __weak pcpu_populate_pte(unsigned long addr) >> +{ >> + pgd_t *pgd = pgd_offset_k(addr); >> + p4d_t *p4d; >> + pud_t *pud; >> + pmd_t *pmd; >> + >> + if (pgd_none(*pgd)) { >> + p4d_t *new; >> + >> + new = memblock_alloc_from(P4D_TABLE_SIZE, P4D_TABLE_SIZE, PAGE_SIZE); > It's unnecessary to specify a min_addr to memblock_alloc_from() as it > won't allocate 0 anyway. So please use memblock_alloc() instead. ok, will use memblock_alloc in this function