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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1DFCC04A94 for ; Thu, 10 Aug 2023 04:27:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD5BF6B0071; Thu, 10 Aug 2023 00:27:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D85C36B0074; Thu, 10 Aug 2023 00:27:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4D596B0075; Thu, 10 Aug 2023 00:27:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B55306B0071 for ; Thu, 10 Aug 2023 00:27:29 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 763894073C for ; Thu, 10 Aug 2023 04:27:29 +0000 (UTC) X-FDA: 81106911018.23.63D2835 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 86EDF1C0009 for ; Thu, 10 Aug 2023 04:27:27 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R8D35EId; spf=pass (imf18.hostedemail.com: domain of chenhuacai@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691641647; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wZIvEBBNHb0tSCoOhmng0x3uTOzEw6dGsyqPIfzPWLA=; b=13sbZ8CBXzFrwI3ImVfGrdTOGprrdOocaAiGEKsXgty/0/FKqPWGTfjmt7pGBS8QBCa6fx XBBZrWOdo0g5rMabIFp3BLqkstiuuV0ObPno0U7fdRZJzX1L7LJHUYeZ/bd3b7zXdIqhTV L7QPq4bOprSiGYLGCkcfs+jQlbDaK2I= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R8D35EId; spf=pass (imf18.hostedemail.com: domain of chenhuacai@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691641647; a=rsa-sha256; cv=none; b=jMCBhY+44sGAwuB4RLzH6gi/LSIHMsuMuRtifjN2Qztx9YbwSqFNoQmDRuEluVqhTi3pry YCS39y8KBWe7nqF2SWVitxJNZ/xboS407AgfT7NYv0SfTsVTeePZb+kcohy5OCEy/OVMBX yhED+Ts64a+6LmFv1rezbheBRGWlxKE= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7B2AC63706 for ; Thu, 10 Aug 2023 04:27:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E20FDC433CB for ; Thu, 10 Aug 2023 04:27:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691641645; bh=fPA9xRRA6+BAzg1S3f5+BWPETMEsncjG024BmrqNAgI=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=R8D35EIdK7ElUXcavekflNdEHdZo3dt8eKdrwjQdZbTy6SOFW+0WD5kaOMeYBAAtX EIUDPwGdsU++nsQopAEQpyKpFJ0jelb0jcUau1bQNUWI8goTqNjr4EPiH0t7hNVnkl S3bbsDYjaJ3Z6s/OokP/izARQrsGmfkWJkoo4bcqIGP3Hq/si13WYdiAmapb5wlYqT tOyikTjKhGbYBu/3y/8y0SUOzKD/+sZkuL+SQXjWWsrpRD6P/cRnMl6DQedNHjBmjw oPdknnsxuZDKETFW4gtwxekPSNdUgB4OI1rUygDT1rL+nGuDd30rOxZ6BAzp8PpfAv Y+IkigrK1iC8Q== Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-99357737980so72011966b.2 for ; Wed, 09 Aug 2023 21:27:25 -0700 (PDT) X-Gm-Message-State: AOJu0YxgCHoI4bTDkig2UjPQ+lpbX6uEZJXxvtyBqd8eWtcMDbZ47cFI Xs61EdqzMnUsqmFQ1rkupHrpoldBbS/oRpENAUw= X-Google-Smtp-Source: AGHT+IFB9Cpc8XTuN88wcX4sLDnjrEO81HoYsjBr+Nl8UlL/7LtZzyv3JjbSmr+06NF3+liJIWF2AmB0MLtABGM5hms= X-Received: by 2002:a17:906:11e:b0:99b:dca9:5b8f with SMTP id 30-20020a170906011e00b0099bdca95b8fmr1096110eje.56.1691641644091; Wed, 09 Aug 2023 21:27:24 -0700 (PDT) MIME-Version: 1.0 References: <20230712031622.1888321-1-maobibo@loongson.cn> <20230712031622.1888321-4-maobibo@loongson.cn> In-Reply-To: From: Huacai Chen Date: Thu, 10 Aug 2023 12:27:11 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 3/3] LoongArch: mm: Add unified function populate_kernel_pte To: bibo mao Cc: Dennis Zhou , Tejun Heo , Christoph Lameter , Andrew Morton , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mm@kvack.org, WANG Xuerui Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 86EDF1C0009 X-Rspam-User: X-Stat-Signature: qj45eynsjm8id6fu9qetxu3qq9dw3wby X-Rspamd-Server: rspam01 X-HE-Tag: 1691641647-599088 X-HE-Meta: U2FsdGVkX1/t0qArLP4YtdrYdLzYW/ffmUvWPnsFq95yxWVpefvhvPjO02C6NAei5RbnNEj71666xfe+F38diUjN6rXCWNLQKdIR9RyeJA2PFNsKvAtgcrqtTpnzWJPwMucPfJjCnO/HYZdDDejM2kYQ6s1RkEUedZf22GeqLCu2YaIxYDWuPTgGjL6dOFQQJHxtNZyTJ6OKdl73fQDphNJMUxOKAglN3iqzbzMtAoZg1ereb7NOG0dYWL0EdRY9nqv9QrPQuzzsv7l0meTE9s3aQzCrkmPph7tkxfAB5HfvCMzua0pTfLoGO8kJr1ItCGUQx9ntcEotegq02XnPa6ZqSh/X248VSGtKs+Sw0VR7yrP+/bfxAK3rl5JYTUwCBC7zRnMNaJuKfbM8btN41vj2FwoBI4GjbrqWjh/nCUeHQ5UyN8gjqqdExcNc9rE0tjtvPLHSP7wQZocBErx45X40qQcXTftqvgx+csUi7b4lZk9z2DNpeHZvWRpNU9u1kJOEIAobs472XU0FwjHxxtEvI06/heHYslSWAw8pXdC8DLkNQqd171V8SbfYcwqqTvbMUTzWKzEj6C3li/XWWdN1dYZrHlCHBAeW+fqoIUnPaDAYvZb1tFAWXJrFISNmKADDIj1VFpra/wzAr0tuKUQSsY7gojH2dCL82ZL37qvlEqsl3+T7vfjb4AD+WQ76tRbL/97vld9+31HXNUc2xwjl4syFpmOuyq2/vmlOZpXFw4+5Mtb3TQQwToOnzzdi+H9kFxvn5CmD5PrcxYuv+P+3rKhUdhC73O0O4VE0+ZosTl8oLhOTw1/OCFiAiBeIrgs2EH5cTyGcXO0gQVnLnZXEFuCxGoTQKbuuALd8tUYWbquslx7sOpkVFmxHWJ3wiw5xQ8KybgKAsiijxiW46xZBE5zcA74GMH1pa/oEmQkqWWHHSaHOMttuk6Sqwd4Hp00cWKbgNdVFkGfq/rD PKJoeOE4 x8XCDdsq6eOcQObqENYh83wQZN3L81YDx5s1ojG/0OXU7gwCzEShvsgH6AtdZEM7WelQXw5U0S8w6yUmrmIjYdEW8ULwVE3HM+DCwTVQ22vrxc/mTazVrwzOMveVCA7MXBipMBwpUNEUs8S7yFGkTongGy75K+JqKHZiBLnBMr7AP321VMGAfa8XitBZ1aht7Tkrx/NPzgRVTEHV8Gfv7KEXYsTCE4SyIv0F4AygaTWEnSm/Wmi2bIAvZLgHu110n6bcG4EeLqess4OrZPQH0UE5bIzT8X4zmPo1tVxEvQHdgNHFeJkRA97lHvJcca2D0EXc0jCuIimZT8+es+NlDrdGi5kdJJ3+dXNeVjRuRWkyijeI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Aug 10, 2023 at 12:09=E2=80=AFPM bibo mao wro= te: > > > > =E5=9C=A8 2023/8/2 15:25, Huacai Chen =E5=86=99=E9=81=93: > > On Tue, Aug 1, 2023 at 9:22=E2=80=AFAM bibo mao w= rote: > >> > >> > >> > >> =E5=9C=A8 2023/7/31 22:15, Huacai Chen =E5=86=99=E9=81=93: > >>> On Wed, Jul 12, 2023 at 11:16=E2=80=AFAM Bibo Mao wrote: > >>>> > >>>> Function pcpu_populate_pte and fixmap_pte are similar, they populate > >>>> one page from kernel address space. And there is confusion between > >>>> pgd and p4d in function fixmap_pte, such as pgd_none always returns > >>>> zero. This patch adds unified function populate_kernel_pte and repla= ces > >>>> pcpu_populate_pte and fixmap_pte. > >>>> > >>>> Signed-off-by: Bibo Mao > >>>> --- > >>>> arch/loongarch/include/asm/pgalloc.h | 1 + > >>>> arch/loongarch/kernel/numa.c | 40 +-------------------- > >>>> arch/loongarch/mm/init.c | 52 ++++++++++++++++---------= --- > >>>> 3 files changed, 32 insertions(+), 61 deletions(-) > >>>> > >>>> diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch/i= nclude/asm/pgalloc.h > >>>> index af1d1e4a6965..ca17b573dba6 100644 > >>>> --- a/arch/loongarch/include/asm/pgalloc.h > >>>> +++ b/arch/loongarch/include/asm/pgalloc.h > >>>> @@ -91,4 +91,5 @@ static inline pud_t *pud_alloc_one(struct mm_struc= t *mm, unsigned long address) > >>>> > >>>> #endif /* __PAGETABLE_PUD_FOLDED */ > >>>> > >>>> +extern pte_t * __init populate_kernel_pte(unsigned long addr); > >>>> #endif /* _ASM_PGALLOC_H */ > >>>> diff --git a/arch/loongarch/kernel/numa.c b/arch/loongarch/kernel/nu= ma.c > >>>> index 778e1c20bfb0..24a693b76873 100644 > >>>> --- a/arch/loongarch/kernel/numa.c > >>>> +++ b/arch/loongarch/kernel/numa.c > >>>> @@ -67,46 +67,8 @@ static int __init pcpu_cpu_distance(unsigned int = from, unsigned int to) > >>>> > >>>> void __init pcpu_populate_pte(unsigned long addr) > >>>> { > >>>> - pgd_t *pgd =3D pgd_offset_k(addr); > >>>> - p4d_t *p4d =3D p4d_offset(pgd, addr); > >>>> - pud_t *pud; > >>>> - pmd_t *pmd; > >>>> - > >>>> - if (p4d_none(*p4d)) { > >>>> - pud =3D memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE); > >>>> - if (!pud) > >>>> - goto err_alloc; > >>>> - p4d_populate(&init_mm, p4d, pud); > >>>> -#ifndef __PAGETABLE_PUD_FOLDED > >>>> - pud_init(pud); > >>>> -#endif > >>>> - } > >>>> - > >>>> - pud =3D pud_offset(p4d, addr); > >>>> - if (pud_none(*pud)) { > >>>> - pmd =3D memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE); > >>>> - if (!pmd) > >>>> - goto err_alloc; > >>>> - pud_populate(&init_mm, pud, pmd); > >>>> -#ifndef __PAGETABLE_PMD_FOLDED > >>>> - pmd_init(pmd); > >>>> -#endif > >>>> - } > >>>> - > >>>> - pmd =3D pmd_offset(pud, addr); > >>>> - if (!pmd_present(*pmd)) { > >>>> - pte_t *pte; > >>>> - > >>>> - pte =3D memblock_alloc(PAGE_SIZE, PAGE_SIZE); > >>>> - if (!pte) > >>>> - goto err_alloc; > >>>> - pmd_populate_kernel(&init_mm, pmd, pte); > >>>> - } > >>>> - > >>>> + populate_kernel_pte(addr); > >>>> return; > >>>> - > >>>> -err_alloc: > >>>> - panic("%s: Failed to allocate memory\n", __func__); > >>>> } > >>>> > >>>> void __init setup_per_cpu_areas(void) > >>>> diff --git a/arch/loongarch/mm/init.c b/arch/loongarch/mm/init.c > >>>> index 3b7d8129570b..6cd2948373ae 100644 > >>>> --- a/arch/loongarch/mm/init.c > >>>> +++ b/arch/loongarch/mm/init.c > >>>> @@ -191,46 +191,49 @@ void vmemmap_free(unsigned long start, unsigne= d long end, struct vmem_altmap *al > >>>> #endif > >>>> #endif > >>>> > >>>> -static pte_t *fixmap_pte(unsigned long addr) > >>>> +pte_t * __init populate_kernel_pte(unsigned long addr) > >>>> { > >>>> - pgd_t *pgd; > >>>> - p4d_t *p4d; > >>>> + pgd_t *pgd =3D pgd_offset_k(addr); > >>>> + p4d_t *p4d =3D p4d_offset(pgd, addr); > >>>> pud_t *pud; > >>>> pmd_t *pmd; > >>>> > >>>> - pgd =3D pgd_offset_k(addr); > >>>> - p4d =3D p4d_offset(pgd, addr); > >>>> - > >>>> - if (pgd_none(*pgd)) { > >>>> - pud_t *new __maybe_unused; > >>>> - > >>>> - new =3D memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > >>>> - pgd_populate(&init_mm, pgd, new); > >>>> + if (p4d_none(*p4d)) { > >>>> + pud =3D memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE); > >>>> + if (!pud) > >>>> + goto err_alloc; > >>>> + p4d_populate(&init_mm, p4d, pud); > >>>> #ifndef __PAGETABLE_PUD_FOLDED > >>>> - pud_init(new); > >>>> + pud_init(pud); > >>>> #endif > >>>> } > >>>> > >>>> pud =3D pud_offset(p4d, addr); > >>>> if (pud_none(*pud)) { > >>>> - pmd_t *new __maybe_unused; > >>>> - > >>>> - new =3D memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > >>>> - pud_populate(&init_mm, pud, new); > >>>> + pmd =3D memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE); > >>>> + if (!pmd) > >>>> + goto err_alloc; > >>>> + pud_populate(&init_mm, pud, pmd); > >>>> #ifndef __PAGETABLE_PMD_FOLDED > >>>> - pmd_init(new); > >>>> + pmd_init(pmd); > >>>> #endif > >>>> } > >>>> > >>>> pmd =3D pmd_offset(pud, addr); > >>>> - if (pmd_none(*pmd)) { > >>>> - pte_t *new __maybe_unused; > >>>> + if (!pmd_present(*pmd)) { > >>>> + pte_t *pte; > >>>> > >>>> - new =3D memblock_alloc_low(PAGE_SIZE, PAGE_SIZE); > >>>> - pmd_populate_kernel(&init_mm, pmd, new); > >>>> + pte =3D memblock_alloc(PAGE_SIZE, PAGE_SIZE); > >>> I don't think memblock_alloc_low() here can be replaced by memblock_a= lloc(). > >> Can you share me the points that pte table must be allocated with memb= lock_alloc_low > >> in this place? > > I forget the reason now, so if you confirm memblock_alloc() works well > > here, you can use it. But please don't use memblock_alloc_raw(). > what a mess, there is more comments if there is special reason, else ever= yone can > forgot by elapsed time. > > why the function memblock_alloc_raw can not be use? there is one useless = page copy. This is not a performance critical path, keeping consistency with mm/percpu.c can make life easier. Huacai > > Regards > Bibo Mao > > > > > > Huacai > >> > >> Regards > >> Bibo Mao > >>> > >>> > >>> Huacai > >>>> + if (!pte) > >>>> + goto err_alloc; > >>>> + pmd_populate_kernel(&init_mm, pmd, pte); > >>>> } > >>>> > >>>> return pte_offset_kernel(pmd, addr); > >>>> + > >>>> +err_alloc: > >>>> + panic("%s: Failed to allocate memory\n", __func__); > >>>> + return NULL; > >>>> } > >>>> > >>>> void __init __set_fixmap(enum fixed_addresses idx, > >>>> @@ -241,7 +244,12 @@ void __init __set_fixmap(enum fixed_addresses i= dx, > >>>> > >>>> BUG_ON(idx <=3D FIX_HOLE || idx >=3D __end_of_fixed_addresse= s); > >>>> > >>>> - ptep =3D fixmap_pte(addr); > >>>> + /* > >>>> + * Now only FIX_EARLYCON_MEM_BASE fixed map is used > >>>> + * __set_fixmap must be called before mem_init since functio= n > >>>> + * populate_kernel_pte allocates memory with memblock_alloc = method. > >>>> + */ > >>>> + ptep =3D populate_kernel_pte(addr); > >>>> if (!pte_none(*ptep)) { > >>>> pte_ERROR(*ptep); > >>>> return; > >>>> -- > >>>> 2.27.0 > >>>> > >> > >> > >