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 80A8BD3C550 for ; Fri, 18 Oct 2024 06:33:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E74DC6B008C; Fri, 18 Oct 2024 02:33:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E24936B0092; Fri, 18 Oct 2024 02:33:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC5116B0093; Fri, 18 Oct 2024 02:33:13 -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 A6D836B008C for ; Fri, 18 Oct 2024 02:33:13 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 7C176A0546 for ; Fri, 18 Oct 2024 06:32:51 +0000 (UTC) X-FDA: 82685755656.18.819D393 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf02.hostedemail.com (Postfix) with ESMTP id A28A280004 for ; Fri, 18 Oct 2024 06:32:50 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=J6w08C7i; spf=pass (imf02.hostedemail.com: domain of chenhuacai@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729233116; a=rsa-sha256; cv=none; b=tcNFXUNdYjYO4t11tgcIsfu6Xrd2l9XgLoRtdyAe24V3DTBhGitSKUzDS7cO+zM8VlMwcf 0y5r0smBu6nlVSe51sF2xdDQ4PpfvIRwfQqxuwlAlyeOtHIOGzNMbJa8+eykM3VXX7V1rr dNRUAk/qXfFYRXBBqNZ7rlkuQhZ+guk= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=J6w08C7i; spf=pass (imf02.hostedemail.com: domain of chenhuacai@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729233116; 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=bm5icURfyweJ1CmKvjrBSbfZN3542l2J6HuUi/lmM4o=; b=57Yk+bIAtysnHrIYAOYzsSoF0Mda8oSNuK1jgu4h7+d/e6eyZai6W5YrqUcu3RB6CBgzJU xBHUWncHAobDph+A9sayfVG6rpYRn4o1b6hmBXcqA4DBBigHlDMJCaJ/7gh4JHDTJ7DJm6 AXffV3WINnfS+9uYEJWOwefD8Uqxo4w= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 2D26DA44587 for ; Fri, 18 Oct 2024 06:33:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBFF4C4AF0B for ; Fri, 18 Oct 2024 06:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729233189; bh=f+x5lXmxjJX7JyvH/HMn+eYqW5wCrYa0iB338xS0QEw=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=J6w08C7i/h9ZPPr3Nz/xM0mXGFQtFxmEZREOMskO2IafZFylwCwtfqfI3j66hWGL1 OGXLRrPoqtfbggMfOfCECixfPEV6JeZMM1m3UazcZFXHaXmcAHK1GIFCzr85xHhUz3 jeDiHuBENQa+ZV8l59MagAX728hf1ww1fpZtitBMpgY87/ogQsl7a6W5vHd2o99fc8 DfLDMoMIBF8pG/7JDT2V5oiVPkt9ANwk9ywKIhtZ7dNRU0Z27oZk9z9RZ1ys7HxMno gkehyKiJ4e85cefQjwlinAnenQpEZ6+nNPm1f8W8PeGNRrzMAZvEBnpVWPpC6DP04z AMULdFMwWIwow== Received: by mail-ed1-f45.google.com with SMTP id 4fb4d7f45d1cf-5c96b2a10e1so2058747a12.2 for ; Thu, 17 Oct 2024 23:33:09 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCX/P+6qjdlHd9BGB0FsLrdJQwINi7RT8gdL3zAjyC/jgdz/kW/pg4ISme0C+uLSWzSifHQaSfAIjg==@kvack.org X-Gm-Message-State: AOJu0YybFOQG/rk4OCVQNzjI8gUjeT0TyKk4TyS/gAA/+F72u8cV8OoU foqo4hU1lHIAmHWamtoXfRjBC9gPK1tUvdpKxT5sfGpRSyjT7jtSAt+NCGeuUYPKbgdb+RClFN4 hrDa+jRSZUI1WDIVM0DpA0zETOL0= X-Google-Smtp-Source: AGHT+IGBGbvDGWhwfQDKz+VFSjXUY+hKa89N6yjf3e+e3r5WO+cS3/fWFX1PKGndjUNPovBoJ9B0Y1DctAt1wOFyf80= X-Received: by 2002:a17:907:1c24:b0:a9a:6d7:9c4 with SMTP id a640c23a62f3a-a9a69a63af8mr114144866b.12.1729233188396; Thu, 17 Oct 2024 23:33:08 -0700 (PDT) MIME-Version: 1.0 References: <20241014035855.1119220-1-maobibo@loongson.cn> <20241014035855.1119220-2-maobibo@loongson.cn> <5f76ede6-e8be-c7a9-f957-479afa2fb828@loongson.cn> In-Reply-To: <5f76ede6-e8be-c7a9-f957-479afa2fb828@loongson.cn> From: Huacai Chen Date: Fri, 18 Oct 2024 14:32:54 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2 1/3] LoongArch: Set initial pte entry with PAGE_GLOBAL for kernel space To: maobibo Cc: wuruiyang@loongson.cn, Andrey Ryabinin , Andrew Morton , David Hildenbrand , Barry Song , loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: hxic9eqob9zd1ssxwabs11usnyxz9dzd X-Rspamd-Queue-Id: A28A280004 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1729233170-94039 X-HE-Meta: U2FsdGVkX186o2FgWhcd7lWqradArsWFaUOPZ01W4wWxb8aKRRjLLV7/GW+wJWL8dIW1CAKmJ2weS9gdMGFLAIYEK7AoKyai4Zeuqkdjz72Iji/r+v/i1wvx8n8U7fJYkpXPY+Qu2c0Cbv9caxTPYB1+XRxsV1bqnFchJK0a6bVN6r3I2O6lBeaWQuxe9sbBqPXvC/wkhifylBS6MLWKScDEPJv7C8wgoH1KVjlJenlbizvG1qnKb843QvyNYksJCdS9/zP84Vv9OdFO7UfJSmxFNYePl0Sd/gX310txbUZtVYhBKjE2JmhGtsAQ94gIwYTZTQtABbNVfPOEG3YbXjvjlgCRwbnaqCgr/61zRus0Ohewul4nfvavCk9DL4BZ75GarJT37sLFeLjlCYqA7Yjzc7lZjpSSCNyyUX7DeuqX6qX8xkorsRucg1F6hXMc2+eKcEUy+8e/pIxDdWaJr1awkolYWwkfT4wdP+WYmDJ5HXbyY71c1gceSfbfTp2QrKkvB0kxMRKNYHI6ip5afuGDaSjG6b/o4B5fr0eO4ormRfiTWYjysiaM7+y0dw3z1t+T9Eel7YKMJRvXtWwL8o4Me0HGfeuZTeIdpaJWdvZomCTznamMZD+W/55z0SSp4/88101DUI4FeTwEOOHZJGoruRJPLuMBEWg9wWs9al3wZjxgIOpAcpdyqcAD02rl3996wnIdYYibf6EP3Aqr4kp10PAVXXQlxomXUtx+VyvHiTk3IJ0jzUI/eyZEG6SjnEd2wz0DHoa8CsLDQZhWlZqz/tFXzFvzp2Vw/VR13way4ODuvBlUZLTliimlFSpIl3+K+5BrrIFfg6Qw74XTeywFMxtY0grJ/R9A/2uxA4fR5PVAdxKGFXZe0ZKYhjqJE5hNIQRRbIB8c95r+brAfn+S/rzWazrnDoKglyGmSm6JTqHKGnDciNcx1w2F21mIMgfr3ux+ttk849zeZT+ qGnxOD0d pD/vLpEM+3YXaJcUqXH/af7pr9poARMtZtHVokhcYqZwnp5y6T46MF0rJ8hnT6tCTc1ZiY86uvfT9csH4/eEafVaBdc8AlAF9P8PqxieHc+plQqIfaN2AFivURWznIInhq7sS5m2jKWnKwe7Wr0te0P9rpDoGuFZ5/gezcehe56INB//vfvWBhzExY/7wtrXCLBFTgWaPcLx1zic91wGJy48yW4A7ZQ4naTIQSXy20iHpMj/+2Viqk5AiHtbH4+QOcSh24a6TDdBCbJiCwCAWVCYHXN6n9jhHvV6djozrtlHqv13RptwA0VVX6epstDlSbNU/Veni+6y2CD+cn/fyUCfwBbl23GaLkEFpwJe0hauBVfHEMCNsa1xOS2t3jZLWKBsuJEVK1zTKKOGzu9VW9CAnFM2VpV/K+vI6HzKX0jgSJ34= 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: List-Subscribe: List-Unsubscribe: On Fri, Oct 18, 2024 at 2:23=E2=80=AFPM maobibo wrote= : > > > > On 2024/10/18 =E4=B8=8B=E5=8D=8812:23, Huacai Chen wrote: > > On Fri, Oct 18, 2024 at 12:16=E2=80=AFPM maobibo = wrote: > >> > >> > >> > >> On 2024/10/18 =E4=B8=8B=E5=8D=8812:11, Huacai Chen wrote: > >>> On Fri, Oct 18, 2024 at 11:44=E2=80=AFAM maobibo wrote: > >>>> > >>>> > >>>> > >>>> On 2024/10/18 =E4=B8=8A=E5=8D=8811:14, Huacai Chen wrote: > >>>>> Hi, Bibo, > >>>>> > >>>>> I applied this patch but drop the part of arch/loongarch/mm/kasan_i= nit.c: > >>>>> https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-lo= ongson.git/commit/?h=3Dloongarch-next&id=3D15832255e84494853f543b4c70ced50a= fc403067 > >>>>> > >>>>> Because kernel_pte_init() should operate on page-table pages, not o= n > >>>>> data pages. You have already handle page-table page in > >>>>> mm/kasan/init.c, and if we don't drop the modification on data page= s > >>>>> in arch/loongarch/mm/kasan_init.c, the kernel fail to boot if KASAN= is > >>>>> enabled. > >>>>> > >>>> static inline void set_pte(pte_t *ptep, pte_t pteval) > >>>> { > >>>> WRITE_ONCE(*ptep, pteval); > >>>> - > >>>> - if (pte_val(pteval) & _PAGE_GLOBAL) { > >>>> - pte_t *buddy =3D ptep_buddy(ptep); > >>>> - /* > >>>> - * Make sure the buddy is global too (if it's !none, > >>>> - * it better already be global) > >>>> - */ > >>>> - if (pte_none(ptep_get(buddy))) { > >>>> -#ifdef CONFIG_SMP > >>>> - /* > >>>> - * For SMP, multiple CPUs can race, so we ne= ed > >>>> - * to do this atomically. > >>>> - */ > >>>> - __asm__ __volatile__( > >>>> - __AMOR "$zero, %[global], %[buddy] \n" > >>>> - : [buddy] "+ZB" (buddy->pte) > >>>> - : [global] "r" (_PAGE_GLOBAL) > >>>> - : "memory"); > >>>> - > >>>> - DBAR(0b11000); /* o_wrw =3D 0b11000 */ > >>>> -#else /* !CONFIG_SMP */ > >>>> - WRITE_ONCE(*buddy, __pte(pte_val(ptep_get(bu= ddy)) | _PAGE_GLOBAL)); > >>>> -#endif /* CONFIG_SMP */ > >>>> - } > >>>> - } > >>>> + DBAR(0b11000); /* o_wrw =3D 0b11000 */ > >>>> } > >>>> > >>>> No, please hold on. This issue exists about twenty years, Do we need= be > >>>> in such a hurry now? > >>>> > >>>> why is DBAR(0b11000) added in set_pte()? > >>> It exists before, not added by this patch. The reason is explained in > >>> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/co= mmit/?h=3Dv6.12-rc3&id=3Df93f67d06b1023313ef1662eac490e29c025c030 > >> why speculative accesses may cause spurious page fault in kernel space > >> with PTE enabled? speculative accesses exists anywhere, it does not > >> cause spurious page fault. > > Confirmed by Ruiyang Wu, and even if DBAR(0b11000) is wrong, that > > means another patch's mistake, not this one. This one just keeps the > > old behavior. > > +CC Ruiyang Wu here. > Also from Ruiyang Wu, the information is that speculative accesses may > insert stale TLB, however no page fault exception. > > So adding barrier in set_pte() does not prevent speculative accesses. > And you write patch here, however do not know the actual reason? > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit= /?h=3Dv6.12-rc3&id=3Df93f67d06b1023313ef1662eac490e29c025c030 I have CCed Ruiyang, whether the description is correct can be judged by hi= m. Huacai > > Bibo Mao > > > > Huacai > > > >> > >> Obvious you do not it and you write wrong patch. > >> > >>> > >>> Huacai > >>> > >>>> > >>>> Regards > >>>> Bibo Mao > >>>>> Huacai > >>>>> > >>>>> On Mon, Oct 14, 2024 at 11:59=E2=80=AFAM Bibo Mao wrote: > >>>>>> > >>>>>> Unlike general architectures, there are two pages in one TLB entry > >>>>>> on LoongArch system. For kernel space, it requires both two pte > >>>>>> entries with PAGE_GLOBAL bit set, else HW treats it as non-global > >>>>>> tlb, there will be potential problems if tlb entry for kernel spac= e > >>>>>> is not global. Such as fail to flush kernel tlb with function > >>>>>> local_flush_tlb_kernel_range() which only flush tlb with global bi= t. > >>>>>> > >>>>>> With function kernel_pte_init() added, it can be used to init pte > >>>>>> table when it is created for kernel address space, and the default > >>>>>> initial pte value is PAGE_GLOBAL rather than zero at beginning. > >>>>>> > >>>>>> Kernel address space areas includes fixmap, percpu, vmalloc, kasan > >>>>>> and vmemmap areas set default pte entry with PAGE_GLOBAL set. > >>>>>> > >>>>>> Signed-off-by: Bibo Mao > >>>>>> --- > >>>>>> arch/loongarch/include/asm/pgalloc.h | 13 +++++++++++++ > >>>>>> arch/loongarch/include/asm/pgtable.h | 1 + > >>>>>> arch/loongarch/mm/init.c | 4 +++- > >>>>>> arch/loongarch/mm/kasan_init.c | 4 +++- > >>>>>> arch/loongarch/mm/pgtable.c | 22 ++++++++++++++++++++= ++ > >>>>>> include/linux/mm.h | 1 + > >>>>>> mm/kasan/init.c | 8 +++++++- > >>>>>> mm/sparse-vmemmap.c | 5 +++++ > >>>>>> 8 files changed, 55 insertions(+), 3 deletions(-) > >>>>>> > >>>>>> diff --git a/arch/loongarch/include/asm/pgalloc.h b/arch/loongarch= /include/asm/pgalloc.h > >>>>>> index 4e2d6b7ca2ee..b2698c03dc2c 100644 > >>>>>> --- a/arch/loongarch/include/asm/pgalloc.h > >>>>>> +++ b/arch/loongarch/include/asm/pgalloc.h > >>>>>> @@ -10,8 +10,21 @@ > >>>>>> > >>>>>> #define __HAVE_ARCH_PMD_ALLOC_ONE > >>>>>> #define __HAVE_ARCH_PUD_ALLOC_ONE > >>>>>> +#define __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL > >>>>>> #include > >>>>>> > >>>>>> +static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) > >>>>>> +{ > >>>>>> + pte_t *pte; > >>>>>> + > >>>>>> + pte =3D (pte_t *) __get_free_page(GFP_KERNEL); > >>>>>> + if (!pte) > >>>>>> + return NULL; > >>>>>> + > >>>>>> + kernel_pte_init(pte); > >>>>>> + return pte; > >>>>>> +} > >>>>>> + > >>>>>> static inline void pmd_populate_kernel(struct mm_struct *mm, > >>>>>> pmd_t *pmd, pte_t *pte) > >>>>>> { > >>>>>> diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch= /include/asm/pgtable.h > >>>>>> index 9965f52ef65b..22e3a8f96213 100644 > >>>>>> --- a/arch/loongarch/include/asm/pgtable.h > >>>>>> +++ b/arch/loongarch/include/asm/pgtable.h > >>>>>> @@ -269,6 +269,7 @@ extern void set_pmd_at(struct mm_struct *mm, u= nsigned long addr, pmd_t *pmdp, pm > >>>>>> extern void pgd_init(void *addr); > >>>>>> extern void pud_init(void *addr); > >>>>>> extern void pmd_init(void *addr); > >>>>>> +extern void kernel_pte_init(void *addr); > >>>>>> > >>>>>> /* > >>>>>> * Encode/decode swap entries and swap PTEs. Swap PTEs are all= PTEs that > >>>>>> diff --git a/arch/loongarch/mm/init.c b/arch/loongarch/mm/init.c > >>>>>> index 8a87a482c8f4..9f26e933a8a3 100644 > >>>>>> --- a/arch/loongarch/mm/init.c > >>>>>> +++ b/arch/loongarch/mm/init.c > >>>>>> @@ -198,9 +198,11 @@ pte_t * __init populate_kernel_pte(unsigned l= ong addr) > >>>>>> if (!pmd_present(pmdp_get(pmd))) { > >>>>>> pte_t *pte; > >>>>>> > >>>>>> - pte =3D memblock_alloc(PAGE_SIZE, PAGE_SIZE); > >>>>>> + pte =3D memblock_alloc_raw(PAGE_SIZE, PAGE_SIZE); > >>>>>> if (!pte) > >>>>>> panic("%s: Failed to allocate memory\n"= , __func__); > >>>>>> + > >>>>>> + kernel_pte_init(pte); > >>>>>> pmd_populate_kernel(&init_mm, pmd, pte); > >>>>>> } > >>>>>> > >>>>>> diff --git a/arch/loongarch/mm/kasan_init.c b/arch/loongarch/mm/ka= san_init.c > >>>>>> index 427d6b1aec09..34988573b0d5 100644 > >>>>>> --- a/arch/loongarch/mm/kasan_init.c > >>>>>> +++ b/arch/loongarch/mm/kasan_init.c > >>>>>> @@ -152,6 +152,8 @@ static void __init kasan_pte_populate(pmd_t *p= mdp, unsigned long addr, > >>>>>> phys_addr_t page_phys =3D early ? > >>>>>> __pa_symbol(kasan_early= _shadow_page) > >>>>>> : kasan_alloc_zer= oed_page(node); > >>>>>> + if (!early) > >>>>>> + kernel_pte_init(__va(page_phys)); > >>>>>> next =3D addr + PAGE_SIZE; > >>>>>> set_pte(ptep, pfn_pte(__phys_to_pfn(page_phys),= PAGE_KERNEL)); > >>>>>> } while (ptep++, addr =3D next, addr !=3D end && __pte_= none(early, ptep_get(ptep))); > >>>>>> @@ -287,7 +289,7 @@ void __init kasan_init(void) > >>>>>> set_pte(&kasan_early_shadow_pte[i], > >>>>>> pfn_pte(__phys_to_pfn(__pa_symbol(kasan= _early_shadow_page)), PAGE_KERNEL_RO)); > >>>>>> > >>>>>> - memset(kasan_early_shadow_page, 0, PAGE_SIZE); > >>>>>> + kernel_pte_init(kasan_early_shadow_page); > >>>>>> csr_write64(__pa_symbol(swapper_pg_dir), LOONGARCH_CSR_= PGDH); > >>>>>> local_flush_tlb_all(); > >>>>>> > >>>>>> diff --git a/arch/loongarch/mm/pgtable.c b/arch/loongarch/mm/pgtab= le.c > >>>>>> index eb6a29b491a7..228ffc1db0a3 100644 > >>>>>> --- a/arch/loongarch/mm/pgtable.c > >>>>>> +++ b/arch/loongarch/mm/pgtable.c > >>>>>> @@ -38,6 +38,28 @@ pgd_t *pgd_alloc(struct mm_struct *mm) > >>>>>> } > >>>>>> EXPORT_SYMBOL_GPL(pgd_alloc); > >>>>>> > >>>>>> +void kernel_pte_init(void *addr) > >>>>>> +{ > >>>>>> + unsigned long *p, *end; > >>>>>> + unsigned long entry; > >>>>>> + > >>>>>> + entry =3D (unsigned long)_PAGE_GLOBAL; > >>>>>> + p =3D (unsigned long *)addr; > >>>>>> + end =3D p + PTRS_PER_PTE; > >>>>>> + > >>>>>> + do { > >>>>>> + p[0] =3D entry; > >>>>>> + p[1] =3D entry; > >>>>>> + p[2] =3D entry; > >>>>>> + p[3] =3D entry; > >>>>>> + p[4] =3D entry; > >>>>>> + p +=3D 8; > >>>>>> + p[-3] =3D entry; > >>>>>> + p[-2] =3D entry; > >>>>>> + p[-1] =3D entry; > >>>>>> + } while (p !=3D end); > >>>>>> +} > >>>>>> + > >>>>>> void pgd_init(void *addr) > >>>>>> { > >>>>>> unsigned long *p, *end; > >>>>>> diff --git a/include/linux/mm.h b/include/linux/mm.h > >>>>>> index ecf63d2b0582..6909fe059a2c 100644 > >>>>>> --- a/include/linux/mm.h > >>>>>> +++ b/include/linux/mm.h > >>>>>> @@ -3818,6 +3818,7 @@ void *sparse_buffer_alloc(unsigned long size= ); > >>>>>> struct page * __populate_section_memmap(unsigned long pfn, > >>>>>> unsigned long nr_pages, int nid, struct vmem_al= tmap *altmap, > >>>>>> struct dev_pagemap *pgmap); > >>>>>> +void kernel_pte_init(void *addr); > >>>>>> void pmd_init(void *addr); > >>>>>> void pud_init(void *addr); > >>>>>> pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); > >>>>>> diff --git a/mm/kasan/init.c b/mm/kasan/init.c > >>>>>> index 89895f38f722..ac607c306292 100644 > >>>>>> --- a/mm/kasan/init.c > >>>>>> +++ b/mm/kasan/init.c > >>>>>> @@ -106,6 +106,10 @@ static void __ref zero_pte_populate(pmd_t *pm= d, unsigned long addr, > >>>>>> } > >>>>>> } > >>>>>> > >>>>>> +void __weak __meminit kernel_pte_init(void *addr) > >>>>>> +{ > >>>>>> +} > >>>>>> + > >>>>>> static int __ref zero_pmd_populate(pud_t *pud, unsigned long a= ddr, > >>>>>> unsigned long end) > >>>>>> { > >>>>>> @@ -126,8 +130,10 @@ static int __ref zero_pmd_populate(pud_t *pud= , unsigned long addr, > >>>>>> > >>>>>> if (slab_is_available()) > >>>>>> p =3D pte_alloc_one_kernel(&ini= t_mm); > >>>>>> - else > >>>>>> + else { > >>>>>> p =3D early_alloc(PAGE_SIZE, NU= MA_NO_NODE); > >>>>>> + kernel_pte_init(p); > >>>>>> + } > >>>>>> if (!p) > >>>>>> return -ENOMEM; > >>>>>> > >>>>>> diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > >>>>>> index edcc7a6b0f6f..c0388b2e959d 100644 > >>>>>> --- a/mm/sparse-vmemmap.c > >>>>>> +++ b/mm/sparse-vmemmap.c > >>>>>> @@ -184,6 +184,10 @@ static void * __meminit vmemmap_alloc_block_z= ero(unsigned long size, int node) > >>>>>> return p; > >>>>>> } > >>>>>> > >>>>>> +void __weak __meminit kernel_pte_init(void *addr) > >>>>>> +{ > >>>>>> +} > >>>>>> + > >>>>>> pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned lo= ng addr, int node) > >>>>>> { > >>>>>> pmd_t *pmd =3D pmd_offset(pud, addr); > >>>>>> @@ -191,6 +195,7 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *= pud, unsigned long addr, int node) > >>>>>> void *p =3D vmemmap_alloc_block_zero(PAGE_SIZE,= node); > >>>>>> if (!p) > >>>>>> return NULL; > >>>>>> + kernel_pte_init(p); > >>>>>> pmd_populate_kernel(&init_mm, pmd, p); > >>>>>> } > >>>>>> return pmd; > >>>>>> -- > >>>>>> 2.39.3 > >>>>>> > >>>> > >>>> > >> > >> > >