From: Jackie Liu <liu.yun@linux.dev>
To: Enze Li <lienze@kylinos.cn>,
chenhuacai@kernel.org, kernel@xen0n.name,
loongarch@lists.linux.dev, glider@google.com, elver@google.com,
akpm@linux-foundation.org, kasan-dev@googlegroups.com,
linux-mm@kvack.org
Cc: zhangqing@loongson.cn, yangtiezhu@loongson.cn, dvyukov@google.com
Subject: Re: [PATCH 4/4 v2] LoongArch: Add KFENCE support
Date: Tue, 25 Jul 2023 22:34:50 +0800 [thread overview]
Message-ID: <fa3dcc1b-03b2-567c-b143-8e3a100af9f6@linux.dev> (raw)
In-Reply-To: <20230725061451.1231480-5-lienze@kylinos.cn>
在 2023/7/25 14:14, Enze Li 写道:
> The LoongArch architecture is quite different from other architectures.
> When the allocating of KFENCE itself is done, it is mapped to the direct
> mapping configuration window [1] by default on LoongArch. It means that
> it is not possible to use the page table mapped mode which required by
> the KFENCE system and therefore it should be remapped to the appropriate
> region.
>
> This patch adds architecture specific implementation details for KFENCE.
> In particular, this implements the required interface in <asm/kfence.h>.
>
> Tested this patch by running the testcases and all passed.
>
> [1] https://loongson.github.io/LoongArch-Documentation/LoongArch-Vol1-EN.html#virtual-address-space-and-address-translation-mode
>
> Signed-off-by: Enze Li <lienze@kylinos.cn>
> ---
> arch/loongarch/Kconfig | 1 +
> arch/loongarch/include/asm/kfence.h | 62 ++++++++++++++++++++++++++++
> arch/loongarch/include/asm/pgtable.h | 14 ++++++-
> arch/loongarch/mm/fault.c | 22 ++++++----
> 4 files changed, 90 insertions(+), 9 deletions(-)
> create mode 100644 arch/loongarch/include/asm/kfence.h
>
> diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> index 70635ea3d1e4..5b63b16be49e 100644
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@ -91,6 +91,7 @@ config LOONGARCH
> select HAVE_ARCH_AUDITSYSCALL
> select HAVE_ARCH_JUMP_LABEL
> select HAVE_ARCH_JUMP_LABEL_RELATIVE
> + select HAVE_ARCH_KFENCE
> select HAVE_ARCH_MMAP_RND_BITS if MMU
> select HAVE_ARCH_SECCOMP_FILTER
> select HAVE_ARCH_TRACEHOOK
> diff --git a/arch/loongarch/include/asm/kfence.h b/arch/loongarch/include/asm/kfence.h
> new file mode 100644
> index 000000000000..fb39076fe4d7
> --- /dev/null
> +++ b/arch/loongarch/include/asm/kfence.h
> @@ -0,0 +1,62 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * KFENCE support for LoongArch.
> + *
> + * Author: Enze Li <lienze@kylinos.cn>
> + * Copyright (C) 2022-2023 KylinSoft Corporation.
> + */
> +
> +#ifndef _ASM_LOONGARCH_KFENCE_H
> +#define _ASM_LOONGARCH_KFENCE_H
> +
> +#include <linux/kfence.h>
> +#include <asm/pgtable.h>
> +#include <asm/tlb.h>
> +
> +static inline bool arch_kfence_init_pool(void)
> +{
> + char *kfence_pool = __kfence_pool;
> + struct vm_struct *area;
> + int err;
> +
> + area = __get_vm_area_caller(KFENCE_POOL_SIZE, VM_IOREMAP,
> + KFENCE_AREA_START, KFENCE_AREA_END,
> + __builtin_return_address(0));
> + if (!area)
> + return false;
> +
> + __kfence_pool = (char *)area->addr;
I think there should be something wrong here.
> + err = ioremap_page_range((unsigned long)__kfence_pool,
> + (unsigned long)__kfence_pool + KFENCE_POOL_SIZE,
> + virt_to_phys((void *)kfence_pool),
> + PAGE_KERNEL);
> + if (err) {
> + free_vm_area(area);
If err > 0, return area->addr here, It's not correct.
--
Jackie Liu
> + return false;
> + }
> +
> + return true;
> +}
> +
> +/* Protect the given page and flush TLB. */
> +static inline bool kfence_protect_page(unsigned long addr, bool protect)
> +{
> + pte_t *pte = virt_to_kpte(addr);
> +
> + if (WARN_ON(!pte) || pte_none(*pte))
> + return false;
> +
> + if (protect)
> + set_pte(pte, __pte(pte_val(*pte) & ~(_PAGE_VALID | _PAGE_PRESENT)));
> + else
> + set_pte(pte, __pte(pte_val(*pte) | (_PAGE_VALID | _PAGE_PRESENT)));
> +
> + /* Flush this CPU's TLB. */
> + preempt_disable();
> + local_flush_tlb_one(addr);
> + preempt_enable();
> +
> + return true;
> +}
> +
> +#endif /* _ASM_LOONGARCH_KFENCE_H */
> diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h
> index 98a0c98de9d1..2702a6ba7122 100644
> --- a/arch/loongarch/include/asm/pgtable.h
> +++ b/arch/loongarch/include/asm/pgtable.h
> @@ -77,6 +77,13 @@ extern unsigned long zero_page_mask;
> (virt_to_page((void *)(empty_zero_page + (((unsigned long)(vaddr)) & zero_page_mask))))
> #define __HAVE_COLOR_ZERO_PAGE
>
> +#ifdef CONFIG_KFENCE
> +#define KFENCE_AREA_SIZE \
> + (((CONFIG_KFENCE_NUM_OBJECTS + 1) * 2 + 2) * PAGE_SIZE)
> +#else
> +#define KFENCE_AREA_SIZE 0
> +#endif
> +
> /*
> * TLB refill handlers may also map the vmalloc area into xkvrange.
> * Avoid the first couple of pages so NULL pointer dereferences will
> @@ -88,11 +95,16 @@ extern unsigned long zero_page_mask;
> #define VMALLOC_START MODULES_END
> #define VMALLOC_END \
> (vm_map_base + \
> - min(PTRS_PER_PGD * PTRS_PER_PUD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, (1UL << cpu_vabits)) - PMD_SIZE - VMEMMAP_SIZE)
> + min(PTRS_PER_PGD * PTRS_PER_PUD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, (1UL << cpu_vabits)) - PMD_SIZE - VMEMMAP_SIZE - KFENCE_AREA_SIZE)
>
> #define vmemmap ((struct page *)((VMALLOC_END + PMD_SIZE) & PMD_MASK))
> #define VMEMMAP_END ((unsigned long)vmemmap + VMEMMAP_SIZE - 1)
>
> +#ifdef CONFIG_KFENCE
> +#define KFENCE_AREA_START VMEMMAP_END
> +#define KFENCE_AREA_END (KFENCE_AREA_START + KFENCE_AREA_SIZE)
> +#endif
> +
> #define pte_ERROR(e) \
> pr_err("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
> #ifndef __PAGETABLE_PMD_FOLDED
> diff --git a/arch/loongarch/mm/fault.c b/arch/loongarch/mm/fault.c
> index da5b6d518cdb..c0319128b221 100644
> --- a/arch/loongarch/mm/fault.c
> +++ b/arch/loongarch/mm/fault.c
> @@ -23,6 +23,7 @@
> #include <linux/kprobes.h>
> #include <linux/perf_event.h>
> #include <linux/uaccess.h>
> +#include <linux/kfence.h>
>
> #include <asm/branch.h>
> #include <asm/mmu_context.h>
> @@ -30,7 +31,8 @@
>
> int show_unhandled_signals = 1;
>
> -static void __kprobes no_context(struct pt_regs *regs, unsigned long address)
> +static void __kprobes no_context(struct pt_regs *regs, unsigned long address,
> + unsigned long write)
> {
> const int field = sizeof(unsigned long) * 2;
>
> @@ -38,6 +40,9 @@ static void __kprobes no_context(struct pt_regs *regs, unsigned long address)
> if (fixup_exception(regs))
> return;
>
> + if (kfence_handle_page_fault(address, write, regs))
> + return;
> +
> /*
> * Oops. The kernel tried to access some bad page. We'll have to
> * terminate things with extreme prejudice.
> @@ -51,14 +56,15 @@ static void __kprobes no_context(struct pt_regs *regs, unsigned long address)
> die("Oops", regs);
> }
>
> -static void __kprobes do_out_of_memory(struct pt_regs *regs, unsigned long address)
> +static void __kprobes do_out_of_memory(struct pt_regs *regs, unsigned long address,
> + unsigned long write)
> {
> /*
> * We ran out of memory, call the OOM killer, and return the userspace
> * (which will retry the fault, or kill us if we got oom-killed).
> */
> if (!user_mode(regs)) {
> - no_context(regs, address);
> + no_context(regs, address, write);
> return;
> }
> pagefault_out_of_memory();
> @@ -69,7 +75,7 @@ static void __kprobes do_sigbus(struct pt_regs *regs,
> {
> /* Kernel mode? Handle exceptions or die */
> if (!user_mode(regs)) {
> - no_context(regs, address);
> + no_context(regs, address, write);
> return;
> }
>
> @@ -90,7 +96,7 @@ static void __kprobes do_sigsegv(struct pt_regs *regs,
>
> /* Kernel mode? Handle exceptions or die */
> if (!user_mode(regs)) {
> - no_context(regs, address);
> + no_context(regs, address, write);
> return;
> }
>
> @@ -149,7 +155,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs,
> */
> if (address & __UA_LIMIT) {
> if (!user_mode(regs))
> - no_context(regs, address);
> + no_context(regs, address, write);
> else
> do_sigsegv(regs, write, address, si_code);
> return;
> @@ -211,7 +217,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs,
>
> if (fault_signal_pending(fault, regs)) {
> if (!user_mode(regs))
> - no_context(regs, address);
> + no_context(regs, address, write);
> return;
> }
>
> @@ -232,7 +238,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs,
> if (unlikely(fault & VM_FAULT_ERROR)) {
> mmap_read_unlock(mm);
> if (fault & VM_FAULT_OOM) {
> - do_out_of_memory(regs, address);
> + do_out_of_memory(regs, address, write);
> return;
> } else if (fault & VM_FAULT_SIGSEGV) {
> do_sigsegv(regs, write, address, si_code);
next prev parent reply other threads:[~2023-07-25 14:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-25 6:14 [PATCH 0/4 v2] Add KFENCE support for LoongArch Enze Li
2023-07-25 6:14 ` [PATCH 1/4 v2] LoongArch: mm: Add page table mapped mode support Enze Li
2023-07-25 7:38 ` Huacai Chen
2023-07-25 6:14 ` [PATCH 2/4 v2] LoongArch: Get stack without NMI when providing regs parameter Enze Li
2023-07-25 7:40 ` Huacai Chen
2023-07-26 2:59 ` Jinyang He
2023-07-28 6:57 ` Enze Li
2023-07-25 6:14 ` [PATCH 3/4 v2] KFENCE: Defer the assignment of the local variable addr Enze Li
2023-07-25 7:45 ` Huacai Chen
2023-07-25 6:14 ` [PATCH 4/4 v2] LoongArch: Add KFENCE support Enze Li
2023-07-25 7:48 ` Huacai Chen
2023-07-25 14:34 ` Jackie Liu [this message]
2023-07-28 6:01 ` Enze Li
2023-07-27 1:26 ` Huacai Chen
2023-07-28 3:27 ` Enze Li
2023-07-28 4:33 ` Huacai Chen
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=fa3dcc1b-03b2-567c-b143-8e3a100af9f6@linux.dev \
--to=liu.yun@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=chenhuacai@kernel.org \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=kernel@xen0n.name \
--cc=lienze@kylinos.cn \
--cc=linux-mm@kvack.org \
--cc=loongarch@lists.linux.dev \
--cc=yangtiezhu@loongson.cn \
--cc=zhangqing@loongson.cn \
/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 NNTP newsgroup(s).