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 803A9C001DF for ; Wed, 2 Aug 2023 07:25:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BA91280132; Wed, 2 Aug 2023 03:25:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 06AC2280112; Wed, 2 Aug 2023 03:25:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E73FA280132; Wed, 2 Aug 2023 03:25:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D8592280112 for ; Wed, 2 Aug 2023 03:25:40 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A0F13C0DB0 for ; Wed, 2 Aug 2023 07:25:40 +0000 (UTC) X-FDA: 81078329640.17.FD7CC2C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id A9AE910001E for ; Wed, 2 Aug 2023 07:25:38 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mDWPY+Pq; spf=pass (imf05.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=1690961138; 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=9Lgge/lw4EWKaCT4g3ozJJRZy4v5CC4ezYAXn5Z45BU=; b=MPHbnEQ+UMmSYHc8AHgooQUf+faQ573tkx73bLVCs16kjSZ5xdMJ1vSJ5/E6ocABhZYQt8 wVsmTKgLKCMoC/H1kIH+qsmA+YMBqFPL5WR77bgZk29dSkgZazq6tqPwqWPR38Y+oXMvwT 1/wcK7aEWy3hOPP12igWI/ZQsk3TjXc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690961138; a=rsa-sha256; cv=none; b=jhYjOa4Kadjl2+5jEtPxGGpDweb0gqVpMXqhQbUQtNgP4f5DvhPU5YsCZNKqrufPtBdUqM ZmiLcrzcI9RjcstoC/3u9yNRXGRp8i6Hz/JDBzashFmpABAIqRFJCUlf38CSOf+0lt7tZ/ ysxcCQgxcd6oHlplZZ+lwtzCKE9+pSI= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mDWPY+Pq; spf=pass (imf05.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 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 BE373617A5 for ; Wed, 2 Aug 2023 07:25:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32897C433C9 for ; Wed, 2 Aug 2023 07:25:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690961137; bh=7ac5mLx+Z8tz6A020GlMURpe0CVYg0kIVLd/wHPImpA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=mDWPY+Pqb6q9P4ARFAneODV2JU7D9hQv1/2DvXBU+UFv79eWqtvXfkOo3d0SkZCUg ELFA6Wnmrz1rAzvI4fPbBs9mBAP+Ebpu2T1SHkDoKYJL1KRGXZPy64paoOee2jW6aB 86BaEpxEueX+EuoLKwVUN1RCE6Yf78tizBQs0mKwCGjv/L0KhMrehm8DutfgRu5zoZ JfAoSc4LUfwmyOoO1fvh+D8nq/XVfv/HMD6uF/y2aD1D98vhTqpe2n4e5rzfIhWoVk hNkNUsswn8kMWggIK5MZNeTX90glK949XOKmJctY+0hQlHK+JOXOpgwh5KDpPBnRvD YuQQYjsMO3PDg== Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-51cff235226so1336592a12.0 for ; Wed, 02 Aug 2023 00:25:37 -0700 (PDT) X-Gm-Message-State: ABy/qLYjG89btqh5k5jW7oRZku3Reyk2pz1fKGqeA8ro49nMdgQpx4dA VOrQTzr+F0nqxtC95jdpYMV7YLr1HySND81YZv0= X-Google-Smtp-Source: APBJJlEU0DcU0gsawBi6xcupkNk8Ve82mxjoSpWJn48IJwgcAHnxEVK2HPzY5o3KorKXS331qg802GDhtNSlbQ6nKKo= X-Received: by 2002:a05:6402:270f:b0:522:582f:91af with SMTP id y15-20020a056402270f00b00522582f91afmr5844319edd.9.1690961135362; Wed, 02 Aug 2023 00:25:35 -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: Wed, 2 Aug 2023 15:25:22 +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: A9AE910001E X-Rspam-User: X-Stat-Signature: 9qxspzt7us8kemt8or8gonmq1yrsqhzd X-Rspamd-Server: rspam03 X-HE-Tag: 1690961138-111622 X-HE-Meta: U2FsdGVkX198R8BTJWSfV5I9Jm3fWk54fQo2mpKYA5r7tl3AGkKKr7VDgabZrKFcrlvzBXzj9UmTmJnXJ/MCWnPhJffq8FfVOQ+d/SIRC9aNgi7Xc9ebp4uOxEWb8VloEShARJAWriLIvvQ5YICzW4FY5ug7zvqD7jtOMhVpJAgBA119+AycBjZmmteRSCdY1KlW4W1WQWqhPVyBnN3lYFOMHh46BVHcccoR3Ma53x3x/+aB4HE018kEZqJlYUNDzTtxxQhQhS9S9Vm6y+Ocq/w3rKGl47nCD9SsglVX7WNSoROfmY8A4FvW+8NCxmNI0GQh8VaVabWTLGnuCFTcEpOF81bn6NiOf8j9kzLtuOnMCqD3uYKthNp2iiyvWqBfaYxRt2lA5aRSpAdkWgEDksU2xPXS0mb8TPF9+WtGwQwHzpYJ/CqhNopCL+mZzh8Ji/3SvqJZGey/wFYjBLvDNFHK5G3rWOJelPPUGpgiv1S7ELLVPU26m7QOOmugXJfahcRrP9Y33HkQF23LtOiwqL0iEiWzV5Ml8Wq5kYH3ezBQjcEor/ZTgJf0d+iT/s7Qg42yRRgI3wuqOTnJB+FLHs1+qiaR7Ey7oeCTSLeG8DJUldPzzFO2awnwgp2urOU4Zur4rtoHY/8rhQhXhwHjM509o0zU5NFhVD+zOtZZrkPMi9HXDeNKkq7Zkn98GsITsYp/r11aXABJDhdJwCVnFGq3N0gzcn637vTiCma+7bAtkiX02OFaV74zVQgfygp2UWnNqBvKjPNxHONaDnKEURvLalrsKARDp4wwH8Oe/iaQsvV1hqIZ+yUNyiH3YFzJqql5uoQgMZkNgWQuWYQXdxLJWfCVC7u1bV8erfI07oAZZC9CHOMUl9DNppOanoMjcWn0+rk7hGVSU0MBlOfZIhetLaRqh54g5blrp/qCW+RorX3IKkCV861Dl/hnF7bhQzKwmfztBxHby5g4KdS Olk2gCom o2xw9ygWrMMtarBkdg/ibQ5GRmKgQp7aUZ5RCy6A5uLKyMORg7U0QdVB6JhZBvluvip7yr4wi0T42JAuIPATAEKTmbx6kIRBoQrlHv8/lp7cHTQxE93vWOP+YV9JCbsPifM6luPLZOYVxtHcxqWlzGO0G+zgKNCeIOf6mSJISXuUHVxMkqsRge3o+gf4lDlxKxc0+Ylyba0f0unUfnu6zT0cNkaAVC1UdNc4RvBzdmJZXVbMBxHXk2paY3fyPjKRzng8lNMx+6MGescvvBzXtCGN9EA2NQjK9o/BgS49jBZcueBmpAxGgAL9sjjnwy+huaaVpp0lK6VN7o7wOzohoPjBHjRfkNCBZHCn6otQZ41SSu/U= 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 Tue, Aug 1, 2023 at 9:22=E2=80=AFAM bibo mao wrote= : > > > > =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 replace= s > >> 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/inc= lude/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_struct = *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/numa= .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 fr= om, 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, unsigned = 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_all= oc(). > Can you share me the points that pte table must be allocated with membloc= k_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(). 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 idx= , > >> > >> BUG_ON(idx <=3D FIX_HOLE || idx >=3D __end_of_fixed_addresses)= ; > >> > >> - ptep =3D fixmap_pte(addr); > >> + /* > >> + * Now only FIX_EARLYCON_MEM_BASE fixed map is used > >> + * __set_fixmap must be called before mem_init since function > >> + * populate_kernel_pte allocates memory with memblock_alloc me= thod. > >> + */ > >> + ptep =3D populate_kernel_pte(addr); > >> if (!pte_none(*ptep)) { > >> pte_ERROR(*ptep); > >> return; > >> -- > >> 2.27.0 > >> > >