From nobody Sun Feb 8 15:18:43 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A930723C505 for ; Thu, 18 Dec 2025 19:47:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766087281; cv=none; b=YsNYH+fz4o5HLArk+gOcBymX0gu6wSMr8V/0+omBrgTyoP7nmpH3ZNkFP7AhPU0KqdBo7r4BmzBZ8Ww8x2BX6mpkZSRQz1/EP4DqFihpAYL5Q5BSDEml2DIEiTmbTlsXVwywPK3/JiMVIHqqkLkUi8c85OQO9FysWsYfklWSSoc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766087281; c=relaxed/simple; bh=v8BwxoG9NY339KmfZzRFFpdR8KSrQgwum6JczV5BJfw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tppmkoXyaPakczugSOPsA0t04AWZJPHnyxVevxc1d/NePKje5ZD1avrlbKTzbTwxqywD4bWzQLmIDAoYUD2IPB8h7QviUgzyZqCoFeB4fgvZx0A0g1TCrnpU9waQ5NICVPipinPxg0W/V7G3xsGBwlaXPsqVSWkVyRdbQMizmPs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1ED11106F; Thu, 18 Dec 2025 11:47:51 -0800 (PST) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 36DFD3F73F; Thu, 18 Dec 2025 11:47:55 -0800 (PST) From: Yeoreum Yun To: catalin.marinas@arm.com, will@kernel.org, ryan.roberts@arm.com, akpm@linux-foundation.org, david@kernel.org, kevin.brodsky@arm.com, quic_zhenhuah@quicinc.com, dev.jain@arm.com, yang@os.amperecomputing.com, chaitanyas.prakash@arm.com, bigeasy@linutronix.de, clrkwllms@kernel.org, rostedt@goodmis.org, lorenzo.stoakes@oracle.com, ardb@kernel.org, jackmanb@google.com, vbabka@suse.cz, mhocko@suse.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Yeoreum Yun Subject: [PATCH v3 1/2] arm64: mmu: avoid allocating pages while splitting the linear mapping Date: Thu, 18 Dec 2025 19:47:49 +0000 Message-Id: <20251218194750.395301-2-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218194750.395301-1-yeoreum.yun@arm.com> References: <20251218194750.395301-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" linear_map_split_to_ptes() currently allocates page tables while splitting the linear mapping into PTEs under stop_machine() using GFP_ATOMI= C. This is fine for non-PREEMPT_RT configurations. However, it becomes problematic on PREEMPT_RT, because generic memory allocation/free APIs (e.g. pgtable_alloc(), __get_free_pages= (), etc.) cannot be called from a non-preemptible context, except for the _nolock() v= ariants. This is because generic memory allocation/free paths are sleepable, as they rely on spin_lock(), which becomes sleepable on PREEMPT_RT. In other words, even calling pgtable_alloc() with GFP_ATOMIC is not permitt= ed in __linear_map_split_to_pte() when it is executed by the stopper thread, where preemption is disabled on PREEMPT_RT. To address this, the required number of page tables is first collected and preallocated, and the preallocated page tables are then used when splitting the linear mapping in __linear_map_split_to_pte(). Fixes: 3df6979d222b ("arm64: mm: split linear mapping if BBML2 unsupported = on secondary CPUs") Signed-off-by: Yeoreum Yun --- arch/arm64/mm/mmu.c | 232 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 184 insertions(+), 48 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 9ae7ce00a7ef..96a9fa505e71 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -527,18 +527,15 @@ static void early_create_pgd_mapping(pgd_t *pgdir, ph= ys_addr_t phys, panic("Failed to create page tables\n"); } =20 -static phys_addr_t __pgd_pgtable_alloc(struct mm_struct *mm, gfp_t gfp, - enum pgtable_type pgtable_type) -{ - /* Page is zeroed by init_clear_pgtable() so don't duplicate effort. */ - struct ptdesc *ptdesc =3D pagetable_alloc(gfp & ~__GFP_ZERO, 0); - phys_addr_t pa; - - if (!ptdesc) - return INVALID_PHYS_ADDR; - - pa =3D page_to_phys(ptdesc_page(ptdesc)); +static struct ptdesc **split_pgtables; +static int split_pgtables_order; +static unsigned long split_pgtables_count; +static unsigned long split_pgtables_idx; =20 +static __always_inline void __pgd_pgtable_init(struct mm_struct *mm, + struct ptdesc *ptdesc, + enum pgtable_type pgtable_type) +{ switch (pgtable_type) { case TABLE_PTE: BUG_ON(!pagetable_pte_ctor(mm, ptdesc)); @@ -554,19 +551,28 @@ static phys_addr_t __pgd_pgtable_alloc(struct mm_stru= ct *mm, gfp_t gfp, break; } =20 - return pa; } =20 -static phys_addr_t -pgd_pgtable_alloc_init_mm_gfp(enum pgtable_type pgtable_type, gfp_t gfp) +static phys_addr_t __pgd_pgtable_alloc(struct mm_struct *mm, gfp_t gfp, + enum pgtable_type pgtable_type) { - return __pgd_pgtable_alloc(&init_mm, gfp, pgtable_type); + /* Page is zeroed by init_clear_pgtable() so don't duplicate effort. */ + struct ptdesc *ptdesc =3D pagetable_alloc(gfp & ~__GFP_ZERO, 0); + + if (!ptdesc) + return INVALID_PHYS_ADDR; + + __pgd_pgtable_init(mm, ptdesc, pgtable_type); + + return page_to_phys(ptdesc_page(ptdesc)); } =20 +typedef phys_addr_t (split_pgtable_alloc_fn)(enum pgtable_type); + static phys_addr_t __maybe_unused pgd_pgtable_alloc_init_mm(enum pgtable_type pgtable_type) { - return pgd_pgtable_alloc_init_mm_gfp(pgtable_type, GFP_PGTABLE_KERNEL); + return __pgd_pgtable_alloc(&init_mm, GFP_PGTABLE_KERNEL, pgtable_type); } =20 static phys_addr_t @@ -575,6 +581,23 @@ pgd_pgtable_alloc_special_mm(enum pgtable_type pgtable= _type) return __pgd_pgtable_alloc(NULL, GFP_PGTABLE_KERNEL, pgtable_type); } =20 +static phys_addr_t +pgd_pgtable_get_preallocated(enum pgtable_type pgtable_type) +{ + struct ptdesc *ptdesc; + + if (WARN_ON(split_pgtables_idx >=3D split_pgtables_count)) + return INVALID_PHYS_ADDR; + + ptdesc =3D split_pgtables[split_pgtables_idx++]; + if (!ptdesc) + return INVALID_PHYS_ADDR; + + __pgd_pgtable_init(&init_mm, ptdesc, pgtable_type); + + return page_to_phys(ptdesc_page(ptdesc)); +} + static void split_contpte(pte_t *ptep) { int i; @@ -584,7 +607,9 @@ static void split_contpte(pte_t *ptep) __set_pte(ptep, pte_mknoncont(__ptep_get(ptep))); } =20 -static int split_pmd(pmd_t *pmdp, pmd_t pmd, gfp_t gfp, bool to_cont) +static int split_pmd(pmd_t *pmdp, pmd_t pmd, + split_pgtable_alloc_fn *pgtable_alloc_fn, + bool to_cont) { pmdval_t tableprot =3D PMD_TYPE_TABLE | PMD_TABLE_UXN | PMD_TABLE_AF; unsigned long pfn =3D pmd_pfn(pmd); @@ -593,7 +618,7 @@ static int split_pmd(pmd_t *pmdp, pmd_t pmd, gfp_t gfp,= bool to_cont) pte_t *ptep; int i; =20 - pte_phys =3D pgd_pgtable_alloc_init_mm_gfp(TABLE_PTE, gfp); + pte_phys =3D pgtable_alloc_fn(TABLE_PTE); if (pte_phys =3D=3D INVALID_PHYS_ADDR) return -ENOMEM; ptep =3D (pte_t *)phys_to_virt(pte_phys); @@ -628,7 +653,9 @@ static void split_contpmd(pmd_t *pmdp) set_pmd(pmdp, pmd_mknoncont(pmdp_get(pmdp))); } =20 -static int split_pud(pud_t *pudp, pud_t pud, gfp_t gfp, bool to_cont) +static int split_pud(pud_t *pudp, pud_t pud, + split_pgtable_alloc_fn *pgtable_alloc_fn, + bool to_cont) { pudval_t tableprot =3D PUD_TYPE_TABLE | PUD_TABLE_UXN | PUD_TABLE_AF; unsigned int step =3D PMD_SIZE >> PAGE_SHIFT; @@ -638,7 +665,7 @@ static int split_pud(pud_t *pudp, pud_t pud, gfp_t gfp,= bool to_cont) pmd_t *pmdp; int i; =20 - pmd_phys =3D pgd_pgtable_alloc_init_mm_gfp(TABLE_PMD, gfp); + pmd_phys =3D pgtable_alloc_fn(TABLE_PMD); if (pmd_phys =3D=3D INVALID_PHYS_ADDR) return -ENOMEM; pmdp =3D (pmd_t *)phys_to_virt(pmd_phys); @@ -707,7 +734,7 @@ static int split_kernel_leaf_mapping_locked(unsigned lo= ng addr) if (!pud_present(pud)) goto out; if (pud_leaf(pud)) { - ret =3D split_pud(pudp, pud, GFP_PGTABLE_KERNEL, true); + ret =3D split_pud(pudp, pud, pgd_pgtable_alloc_init_mm, true); if (ret) goto out; } @@ -732,7 +759,7 @@ static int split_kernel_leaf_mapping_locked(unsigned lo= ng addr) */ if (ALIGN_DOWN(addr, PMD_SIZE) =3D=3D addr) goto out; - ret =3D split_pmd(pmdp, pmd, GFP_PGTABLE_KERNEL, true); + ret =3D split_pmd(pmdp, pmd, pgd_pgtable_alloc_init_mm, true); if (ret) goto out; } @@ -831,34 +858,35 @@ int split_kernel_leaf_mapping(unsigned long start, un= signed long end) static int split_to_ptes_pud_entry(pud_t *pudp, unsigned long addr, unsigned long next, struct mm_walk *walk) { - gfp_t gfp =3D *(gfp_t *)walk->private; + split_pgtable_alloc_fn *pgtable_alloc_fn =3D walk->private; pud_t pud =3D pudp_get(pudp); - int ret =3D 0; =20 - if (pud_leaf(pud)) - ret =3D split_pud(pudp, pud, gfp, false); + if (!pud_leaf(pud)) + return 0; =20 - return ret; + return split_pud(pudp, pud, pgtable_alloc_fn, false); } =20 static int split_to_ptes_pmd_entry(pmd_t *pmdp, unsigned long addr, unsigned long next, struct mm_walk *walk) { - gfp_t gfp =3D *(gfp_t *)walk->private; + split_pgtable_alloc_fn *pgtable_alloc_fn =3D walk->private; pmd_t pmd =3D pmdp_get(pmdp); - int ret =3D 0; + int ret; =20 - if (pmd_leaf(pmd)) { - if (pmd_cont(pmd)) - split_contpmd(pmdp); - ret =3D split_pmd(pmdp, pmd, gfp, false); + if (!pmd_leaf(pmd)) + return 0; =20 - /* - * We have split the pmd directly to ptes so there is no need to - * visit each pte to check if they are contpte. - */ - walk->action =3D ACTION_CONTINUE; - } + if (pmd_cont(pmd)) + split_contpmd(pmdp); + + ret =3D split_pmd(pmdp, pmd, pgtable_alloc_fn, false); + + /* + * We have split the pmd directly to ptes so there is no need to + * visit each pte to check if they are contpte. + */ + walk->action =3D ACTION_CONTINUE; =20 return ret; } @@ -880,13 +908,15 @@ static const struct mm_walk_ops split_to_ptes_ops =3D= { .pte_entry =3D split_to_ptes_pte_entry, }; =20 -static int range_split_to_ptes(unsigned long start, unsigned long end, gfp= _t gfp) +static int range_split_to_ptes(unsigned long start, unsigned long end, + split_pgtable_alloc_fn *pgtable_alloc_fn) { int ret; =20 arch_enter_lazy_mmu_mode(); ret =3D walk_kernel_page_table_range_lockless(start, end, - &split_to_ptes_ops, NULL, &gfp); + &split_to_ptes_ops, NULL, + pgtable_alloc_fn); arch_leave_lazy_mmu_mode(); =20 return ret; @@ -903,6 +933,105 @@ static void __init init_idmap_kpti_bbml2_flag(void) smp_mb(); } =20 +static int __init +collect_to_split_pud_entry(pud_t *pudp, unsigned long addr, + unsigned long next, struct mm_walk *walk) +{ + pud_t pud =3D pudp_get(pudp); + + if (pud_leaf(pud)) + split_pgtables_count +=3D 1 + PTRS_PER_PMD; + + return 0; +} + +static int __init +collect_to_split_pmd_entry(pmd_t *pmdp, unsigned long addr, + unsigned long next, struct mm_walk *walk) +{ + pmd_t pmd =3D pmdp_get(pmdp); + + if (pmd_leaf(pmd)) + split_pgtables_count++; + + walk->action =3D ACTION_CONTINUE; + + return 0; +} + +static void __init linear_map_free_split_pgtables(void) +{ + int i; + + if (!split_pgtables_count || !split_pgtables) + goto skip_free; + + for (i =3D split_pgtables_idx; i < split_pgtables_count; i++) { + if (split_pgtables[i]) + pagetable_free(split_pgtables[i]); + } + + free_pages((unsigned long)split_pgtables, split_pgtables_order); + +skip_free: + split_pgtables =3D NULL; + split_pgtables_count =3D 0; + split_pgtables_idx =3D 0; + split_pgtables_order =3D 0; +} + +static int __init linear_map_prealloc_split_pgtables(void) +{ + int ret, i; + unsigned long lstart =3D _PAGE_OFFSET(vabits_actual); + unsigned long lend =3D PAGE_END; + unsigned long kstart =3D (unsigned long)lm_alias(_stext); + unsigned long kend =3D (unsigned long)lm_alias(__init_begin); + + const struct mm_walk_ops collect_to_split_ops =3D { + .pud_entry =3D collect_to_split_pud_entry, + .pmd_entry =3D collect_to_split_pmd_entry + }; + + split_pgtables_idx =3D 0; + split_pgtables_count =3D 0; + + ret =3D walk_kernel_page_table_range_lockless(lstart, kstart, + &collect_to_split_ops, + NULL, NULL); + if (!ret) + ret =3D walk_kernel_page_table_range_lockless(kend, lend, + &collect_to_split_ops, + NULL, NULL); + if (ret || !split_pgtables_count) + goto error; + + ret =3D -ENOMEM; + + split_pgtables_order =3D + order_base_2(PAGE_ALIGN(split_pgtables_count * + sizeof(struct ptdesc *)) >> PAGE_SHIFT); + + split_pgtables =3D (struct ptdesc **) __get_free_pages(GFP_KERNEL | __GFP= _ZERO, + split_pgtables_order); + if (!split_pgtables) + goto error; + + for (i =3D 0; i < split_pgtables_count; i++) { + split_pgtables[i] =3D pagetable_alloc(GFP_KERNEL, 0); + if (!split_pgtables[i]) + goto error; + } + + ret =3D 0; + +error: + if (ret) + linear_map_free_split_pgtables(); + + return ret; +} + static int __init linear_map_split_to_ptes(void *__unused) { /* @@ -928,9 +1057,9 @@ static int __init linear_map_split_to_ptes(void *__unu= sed) * PTE. The kernel alias remains static throughout runtime so * can continue to be safely mapped with large mappings. */ - ret =3D range_split_to_ptes(lstart, kstart, GFP_ATOMIC); + ret =3D range_split_to_ptes(lstart, kstart, pgd_pgtable_get_preallocated= ); if (!ret) - ret =3D range_split_to_ptes(kend, lend, GFP_ATOMIC); + ret =3D range_split_to_ptes(kend, lend, pgd_pgtable_get_preallocated); if (ret) panic("Failed to split linear map\n"); flush_tlb_kernel_range(lstart, lend); @@ -963,10 +1092,16 @@ static int __init linear_map_split_to_ptes(void *__u= nused) =20 void __init linear_map_maybe_split_to_ptes(void) { - if (linear_map_requires_bbml2 && !system_supports_bbml2_noabort()) { - init_idmap_kpti_bbml2_flag(); - stop_machine(linear_map_split_to_ptes, NULL, cpu_online_mask); - } + if (!linear_map_requires_bbml2 || system_supports_bbml2_noabort()) + return; + + if (linear_map_prealloc_split_pgtables()) + panic("Failed to split linear map\n"); + + init_idmap_kpti_bbml2_flag(); + stop_machine(linear_map_split_to_ptes, NULL, cpu_online_mask); + + linear_map_free_split_pgtables(); } =20 /* @@ -1088,6 +1223,7 @@ bool arch_kfence_init_pool(void) unsigned long end =3D start + KFENCE_POOL_SIZE; int ret; =20 + /* Exit early if we know the linear map is already pte-mapped. */ if (!split_leaf_mapping_possible()) return true; @@ -1097,7 +1233,7 @@ bool arch_kfence_init_pool(void) return true; =20 mutex_lock(&pgtable_split_lock); - ret =3D range_split_to_ptes(start, end, GFP_PGTABLE_KERNEL); + ret =3D range_split_to_ptes(start, end, pgd_pgtable_alloc_init_mm); mutex_unlock(&pgtable_split_lock); =20 /* --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7} From nobody Sun Feb 8 15:18:43 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3B1C2237163 for ; Thu, 18 Dec 2025 19:48:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766087284; cv=none; b=XjZhYqI3YQdjPJr0prZ440RYwpOnyKuf8GNqcW2PkTUCSxKwt9T9niCIhvXw59zjxADBN7jZrT9CTcwOGdoaDv7UBazugJNXVhTJ1rl2hxDI+Iq0/Gw0KjZBGcVPTgeLSAwa5OFY16xTTt0MKwcvuDu5zu1R2q2PLJyVJagP88Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766087284; c=relaxed/simple; bh=/e8eQsTQi4rndWYxlM8kV6VgM4jrF2N3g+ytpb1b9K8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HYJ+vsK7EjKJsUSs0H33SDvPwql8v9jM9rbJy9lY8rPkMkJ09/KQ5xE3WSFOaJNMYHPzuZgpsfPjfPBvqp2wJayNwYeZG3biz0hMrJroHrriJdRkbmRGg6OoVwkqD1srp9ncByhZOHqFPIewzrUZtkLuEJRI5OBzcX82JCBr/Jw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 70339106F; Thu, 18 Dec 2025 11:47:54 -0800 (PST) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 845433F73F; Thu, 18 Dec 2025 11:47:58 -0800 (PST) From: Yeoreum Yun To: catalin.marinas@arm.com, will@kernel.org, ryan.roberts@arm.com, akpm@linux-foundation.org, david@kernel.org, kevin.brodsky@arm.com, quic_zhenhuah@quicinc.com, dev.jain@arm.com, yang@os.amperecomputing.com, chaitanyas.prakash@arm.com, bigeasy@linutronix.de, clrkwllms@kernel.org, rostedt@goodmis.org, lorenzo.stoakes@oracle.com, ardb@kernel.org, jackmanb@google.com, vbabka@suse.cz, mhocko@suse.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Yeoreum Yun Subject: [PATCH v3 2/2] arm64: mmu: avoid allocating pages while installing ng-mapping for KPTI Date: Thu, 18 Dec 2025 19:47:50 +0000 Message-Id: <20251218194750.395301-3-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218194750.395301-1-yeoreum.yun@arm.com> References: <20251218194750.395301-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The current __kpti_install_ng_mappings() allocates a temporary PGD while installing the NG mapping for KPTI under stop_machine(), using GFP_ATOMIC. This is fine in the non-PREEMPT_RT case. However, it becomes a problem under PREEMPT_RT because generic memory allocation/free APIs (e.g., pgtable_alloc(), __get_free_pages(), etc.) cannot be invoked in a non-preemptible context, except for the *_nolock() variants. These generic allocators may sleep due to their use of spin_lock(). In other words, calling __get_free_pages(), even with GFP_ATOMIC, is not allowed in __kpti_install_ng_mappings(), which is executed by the stopper thread where preemption is disabled under PREEMPT_RT. To address this, preallocate the page needed for the temporary PGD before invoking __kpti_install_ng_mappings() via stop_machine(). Fixes: 47546a1912fc ("arm64: mm: install KPTI nG mappings with MMU enabled") Signed-off-by: Yeoreum Yun Reviewed-by: Ryan Roberts --- arch/arm64/mm/mmu.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 96a9fa505e71..9ad9612728e6 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1369,7 +1369,7 @@ static phys_addr_t __init kpti_ng_pgd_alloc(enum pgta= ble_type type) return kpti_ng_temp_alloc; } =20 -static int __init __kpti_install_ng_mappings(void *__unused) +static int __init __kpti_install_ng_mappings(void *data) { typedef void (kpti_remap_fn)(int, int, phys_addr_t, unsigned long); extern kpti_remap_fn idmap_kpti_install_ng_mappings; @@ -1377,10 +1377,9 @@ static int __init __kpti_install_ng_mappings(void *_= _unused) =20 int cpu =3D smp_processor_id(); int levels =3D CONFIG_PGTABLE_LEVELS; - int order =3D order_base_2(levels); u64 kpti_ng_temp_pgd_pa =3D 0; pgd_t *kpti_ng_temp_pgd; - u64 alloc =3D 0; + u64 alloc =3D *(u64 *)data; =20 if (levels =3D=3D 5 && !pgtable_l5_enabled()) levels =3D 4; @@ -1391,8 +1390,6 @@ static int __init __kpti_install_ng_mappings(void *__= unused) =20 if (!cpu) { int ret; - - alloc =3D __get_free_pages(GFP_ATOMIC | __GFP_ZERO, order); kpti_ng_temp_pgd =3D (pgd_t *)(alloc + (levels - 1) * PAGE_SIZE); kpti_ng_temp_alloc =3D kpti_ng_temp_pgd_pa =3D __pa(kpti_ng_temp_pgd); =20 @@ -1423,16 +1420,17 @@ static int __init __kpti_install_ng_mappings(void *= __unused) remap_fn(cpu, num_online_cpus(), kpti_ng_temp_pgd_pa, KPTI_NG_TEMP_VA); cpu_uninstall_idmap(); =20 - if (!cpu) { - free_pages(alloc, order); + if (!cpu) arm64_use_ng_mappings =3D true; - } =20 return 0; } =20 void __init kpti_install_ng_mappings(void) { + int order =3D order_base_2(CONFIG_PGTABLE_LEVELS); + u64 alloc; + /* Check whether KPTI is going to be used */ if (!arm64_kernel_unmapped_at_el0()) return; @@ -1445,8 +1443,14 @@ void __init kpti_install_ng_mappings(void) if (arm64_use_ng_mappings) return; =20 + alloc =3D __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); + if (!alloc) + panic("Failed to alloc page tables\n"); + init_idmap_kpti_bbml2_flag(); - stop_machine(__kpti_install_ng_mappings, NULL, cpu_online_mask); + stop_machine(__kpti_install_ng_mappings, &alloc, cpu_online_mask); + + free_pages(alloc, order); } =20 static pgprot_t __init kernel_exec_prot(void) --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}