From: Hari Bathini <hbathini@linux.ibm.com>
To: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
Michael Ellerman <mpe@ellerman.id.au>
Cc: Marco Elver <elver@google.com>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
Nicholas Piggin <npiggin@gmail.com>,
Alexander Potapenko <glider@google.com>,
"Naveen N. Rao" <naveen.n.rao@linux.ibm.com>,
Dmitry Vyukov <dvyukov@google.com>
Subject: [PATCH 2/2] radix/kfence: support late __kfence_pool allocation
Date: Wed, 24 Apr 2024 16:39:26 +0530 [thread overview]
Message-ID: <20240424110926.184077-2-hbathini@linux.ibm.com> (raw)
In-Reply-To: <20240424110926.184077-1-hbathini@linux.ibm.com>
With commit b33f778bba5ef ("kfence: alloc kfence_pool after system
startup"), KFENCE pool can be allocated after system startup via the
page allocator. This can lead to problems as all memory is not mapped
at page granularity anymore with CONFIG_KFENCE. Address this by direct
mapping all memory at PMD level and split the mapping for PMD pages
that overlap with __kfence_pool to page level granularity if and when
__kfence_pool is allocated after system startup.
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
---
arch/powerpc/include/asm/book3s/64/radix.h | 2 +
arch/powerpc/include/asm/kfence.h | 14 +++++-
arch/powerpc/mm/book3s64/radix_pgtable.c | 50 +++++++++++++++++++++-
3 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/radix.h b/arch/powerpc/include/asm/book3s/64/radix.h
index 8f55ff74bb68..0423ddbcf73c 100644
--- a/arch/powerpc/include/asm/book3s/64/radix.h
+++ b/arch/powerpc/include/asm/book3s/64/radix.h
@@ -340,6 +340,8 @@ extern void radix__vmemmap_remove_mapping(unsigned long start,
extern int radix__map_kernel_page(unsigned long ea, unsigned long pa,
pgprot_t flags, unsigned int psz);
+extern bool radix_kfence_init_pool(void);
+
static inline unsigned long radix__get_tree_size(void)
{
unsigned long rts_field;
diff --git a/arch/powerpc/include/asm/kfence.h b/arch/powerpc/include/asm/kfence.h
index 18ec2b06ba1e..c5d2fb2f9ecb 100644
--- a/arch/powerpc/include/asm/kfence.h
+++ b/arch/powerpc/include/asm/kfence.h
@@ -18,12 +18,24 @@
#ifdef CONFIG_KFENCE
extern bool kfence_early_init;
-#endif
+
+static inline bool kfence_alloc_pool_late(void)
+{
+ return !kfence_early_init;
+}
static inline bool arch_kfence_init_pool(void)
{
+#ifdef CONFIG_PPC_BOOK3S_64
+ if (radix_enabled())
+ return radix_kfence_init_pool();
+#endif
+
return true;
}
+#else
+static inline bool kfence_alloc_pool_late(void) { return false; }
+#endif
#ifdef CONFIG_PPC64
static inline bool kfence_protect_page(unsigned long addr, bool protect)
diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c
index fccbf92f279b..f4374e3e31e1 100644
--- a/arch/powerpc/mm/book3s64/radix_pgtable.c
+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c
@@ -253,6 +253,53 @@ void radix__mark_initmem_nx(void)
}
#endif /* CONFIG_STRICT_KERNEL_RWX */
+#ifdef CONFIG_KFENCE
+static inline int radix_split_pmd_page(pmd_t *pmd, unsigned long addr)
+{
+ pte_t *pte = pte_alloc_one_kernel(&init_mm);
+ unsigned long pfn = PFN_DOWN(__pa(addr));
+ int i;
+
+ if (!pte)
+ return -ENOMEM;
+
+ for (i = 0; i < PTRS_PER_PTE; i++) {
+ __set_pte_at(&init_mm, addr, pte + i, pfn_pte(pfn + i, PAGE_KERNEL), 0);
+ asm volatile("ptesync": : :"memory");
+ }
+ pmd_populate_kernel(&init_mm, pmd, pte);
+
+ flush_tlb_kernel_range(addr, addr + PMD_SIZE);
+ return 0;
+}
+
+bool radix_kfence_init_pool(void)
+{
+ unsigned int page_psize, pmd_psize;
+ unsigned long addr;
+ pmd_t *pmd;
+
+ if (!kfence_alloc_pool_late())
+ return true;
+
+ page_psize = shift_to_mmu_psize(PAGE_SHIFT);
+ pmd_psize = shift_to_mmu_psize(PMD_SHIFT);
+ for (addr = (unsigned long)__kfence_pool; is_kfence_address((void *)addr);
+ addr += PAGE_SIZE) {
+ pmd = pmd_off_k(addr);
+
+ if (pmd_leaf(*pmd)) {
+ if (radix_split_pmd_page(pmd, addr & PMD_MASK))
+ return false;
+ update_page_count(pmd_psize, -1);
+ update_page_count(page_psize, PTRS_PER_PTE);
+ }
+ }
+
+ return true;
+}
+#endif
+
static inline void __meminit
print_mapping(unsigned long start, unsigned long end, unsigned long size, bool exec)
{
@@ -391,7 +438,8 @@ static void __init radix_init_pgtable(void)
continue;
}
- WARN_ON(create_physical_mapping(start, end, -1, PAGE_KERNEL, ~0UL));
+ WARN_ON(create_physical_mapping(start, end, -1, PAGE_KERNEL,
+ kfence_alloc_pool_late() ? PMD_SIZE : ~0UL));
}
#ifdef CONFIG_KFENCE
--
2.44.0
next prev parent reply other threads:[~2024-04-24 11:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 11:09 [PATCH 1/2] radix/kfence: map __kfence_pool at page granularity Hari Bathini
2024-04-24 11:09 ` Hari Bathini [this message]
2024-05-01 7:03 ` [PATCH 2/2] radix/kfence: support late __kfence_pool allocation Ritesh Harjani
2024-05-01 5:45 ` [PATCH 1/2] radix/kfence: map __kfence_pool at page granularity Ritesh Harjani
2024-05-07 12:33 ` Christophe Leroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240424110926.184077-2-hbathini@linux.ibm.com \
--to=hbathini@linux.ibm.com \
--cc=aneesh.kumar@linux.ibm.com \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=naveen.n.rao@linux.ibm.com \
--cc=npiggin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).