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 94084C0015E for ; Tue, 25 Jul 2023 07:49:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 204326B0071; Tue, 25 Jul 2023 03:49:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1BCCE6B0074; Tue, 25 Jul 2023 03:49:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07C6D8E0001; Tue, 25 Jul 2023 03:49:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EDA256B0071 for ; Tue, 25 Jul 2023 03:49:05 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A0E6040D67 for ; Tue, 25 Jul 2023 07:49:05 +0000 (UTC) X-FDA: 81049358250.20.CD104AE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id 95AF04000C for ; Tue, 25 Jul 2023 07:49:03 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WybcbO8m; spf=pass (imf01.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=1690271343; 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=KmakmmEgZueO/YFdbpdTsIKHFwM4SrXCiaoJfcNVhDM=; b=OqDAQVqAD1lDyDlG6hz5EA9N/j1YVc+rwW7a2SkwlpMaDSHUum4oHSxyIxD1a7O6vPtwr2 jtIgT/tqplJQRE5UGZ79po2m8GPVgmyIvMYvkGLzQ6zbnS2KybKorGbM8/EKFxcbwbNczs vIGGNHOybZa97dkkH5p0lpZFDKf71Rc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WybcbO8m; spf=pass (imf01.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690271343; a=rsa-sha256; cv=none; b=NVh+EBDg6sWL2I8ZoFnQR7gA6Tjt2ttNczpQ5Ig/OM+TbHDxO6M4IzwlNgmTlA0QGak/b9 k3xt9DX13eQmg03ew52OQDKVB7c/hmuHOROxZuV8ywyp781XtD4wS1jJ4UrIt0DsadBxab UHkGfvbyI6DiaeUhaJWDp42NcIIrWgs= 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 D192D612FF for ; Tue, 25 Jul 2023 07:49:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 445C6C433CD for ; Tue, 25 Jul 2023 07:49:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690271342; bh=dX+VPQmke9zzpXA4ZaA5DPIXx5I7r20GjVudAX3lC4c=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=WybcbO8maYmdaugiZEag8QO7nLXquwsb6clBBSjQ2Xv5kN4Bog4hnneltUn5+7iSQ WAnUipowmp7kCISfBQZPSA6iW3LS6wtQ5zsBbRjcfJV8alZaSEV8yqZZ+enll/zioX Vecf8zJfyconZAFtIn1+AOFkxKgwO00d4MX3QzIZeibBTQ0vFrMsMx5NvnHC0awqKW 8e5HuYlcCHwX9gNxEtPjLqOgh/PhSutm0qUebpOh8VkjKwIvHgFpYDVcYAmGaQG+ov c9/Ad15DMgwNy4JtBM9WVFErbf9J/CoBqt3DEaIqAhXU3jrPjumGSnOLwxZzl2Zonb k4Abk1O8R95jg== Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-4fe04882c66so519676e87.3 for ; Tue, 25 Jul 2023 00:49:02 -0700 (PDT) X-Gm-Message-State: ABy/qLZrtWgVVxnYa3YPX/C8hOJOEK44x98QznZYY+i8ZOfrv9NFiy7v n0U/QeF8ESUZH2oQvX7TsMY0Owg+w0hGKsu6V0s= X-Google-Smtp-Source: APBJJlFcguhzjxkSC7PeabXtndYmHz0/4adKWBHqT1/aKRuIe+CfEpQ1bOfBfDnZPyR89TaKAqcucsZVaKxWgxAObR0= X-Received: by 2002:a05:6512:2523:b0:4f7:6966:36fb with SMTP id be35-20020a056512252300b004f7696636fbmr7905252lfb.12.1690271340083; Tue, 25 Jul 2023 00:49:00 -0700 (PDT) MIME-Version: 1.0 References: <20230725061451.1231480-1-lienze@kylinos.cn> <20230725061451.1231480-5-lienze@kylinos.cn> In-Reply-To: <20230725061451.1231480-5-lienze@kylinos.cn> From: Huacai Chen Date: Tue, 25 Jul 2023 15:48:30 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 4/4 v2] LoongArch: Add KFENCE support To: Enze Li Cc: 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, zhangqing@loongson.cn, yangtiezhu@loongson.cn, dvyukov@google.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 95AF04000C X-Rspam-User: X-Stat-Signature: 1trcqdk1pyxjq3okpo3nooo4ug1bsm1z X-Rspamd-Server: rspam01 X-HE-Tag: 1690271343-244379 X-HE-Meta: U2FsdGVkX1+cBfNfwdjlwftinFzMaAxPodZoSabG6ADmaxCURT3KP2fKt4HUErLjSRAFJUhLaj/h6qTW7BoutmV8KPLXbB9gB4yM87z5To7MPW/MIMTGablDnA8CM573r7qx+tw4HGHXqMVRAhOsEIZksfCe11HATZ+yqlxg2L8DIEOOn852whG6JgkrMqgPGzNx6HI957h/DXI8i9jCYss07IQir7A0K0Op/pD0VQVjRDyC2yFkoumiYpDerIbTAVGPUge1ldFKkZWmiECyWqWAgH+/v4MF0x1el6cqc8chnFKzJztRTfrscvdlug0vW1NqpoNVGKfP2uGNK58d3vKbA9RIWYZaAq4J0AuLK1en3vd3BRYDaeSv7BKDrd5LMjDByUgbkiDzRZiRetoCpG7Ch/Lum8uHjwTQtKmGv9DLDRSkPZIxSzz3Ja4mQR88D34qrk5tx96YVha33rwhrq+ikKyBEBckWL9T/HbrNrVPhL7vqA1geLpgYu0qYvo+Sb8bzrl6Os63OHKHzr6cgymlE2iHsOxBnzErnjk/Wamc57by6vNT002FjOF/p/NvK2WLx1oC0naXFJKnibavD1mxyWEXMI2rDFsplIsss+111LmirwjdMlTCTpBYaeSLyGJJJDwzA0tM9Etb0ssOeZ8I1THWeRX6Jeenhd8KB2UELBa/sPoC+/BnKioVCRDmJDLiNtjItlPNOkvk8mw1SKP22KyV8iHMoKKqKWJEPZp57GXTQm9vjoRBVkB3vF2S0xi5xwAbyIA49Aos+fxDoSbQgRoxnBE/sUlyA2X+IWAZPcZDoWXenYVOkIf3CfhtrjeFLwW1pJ/sOzedBFGCe03qcxbTXW+vy5Pg0Owffh8TgR3ZkIaH8i4tqV0qeEpI/3G0Su9JRy/Kuw2lH05emFE0lavfIpjX3lAkBaAnWeyeLWrQEk/uFdQ4tJ7jKyat75byppx48VlLnPbboj/ xwhJJW0T x6ILf7+ltVsucwllTLi7+vUuoAUeng/QM9uYdE2eiXumw8OjQXyDyjACK/Xgm/nygaF04jCHqI8wVATlJkpoM1FwfV2I63BMSBB6oAceKD9zGxy3dXKvAoyuHrVRjApNZ1NnrPvGqh9xGqTHNsZKyRx87V5Syz/w6X9hpfaqBCwR/I0IzqIEKJOjwUAwo5ar9KtqK0nNMc2LW7eh+ZmuVnYn6rasWdFsNUUgzVNrp5HDpZUUu7yPCIN3Tnrs4e3GS9zWub9ohLSYwAOCsq9NcVw0PzKervmlD03RFsmxvYRvpy7Avcl6qvyuzld+KlE3+jYUkXxxY/E2jY9fGgke0ZeFvdKjqrXw9zmffrwruD6fPd2QfBcM/bEic5z3HtY+bV3YNNNfak0yOGpgRlohElAfc6g== 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: Hi, Enze, On Tue, Jul 25, 2023 at 2:15=E2=80=AFPM Enze Li wrote: > > 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 . > > 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 > --- > 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 > + * Copyright (C) 2022-2023 KylinSoft Corporation. > + */ > + > +#ifndef _ASM_LOONGARCH_KFENCE_H > +#define _ASM_LOONGARCH_KFENCE_H > + > +#include > +#include > +#include > + > +static inline bool arch_kfence_init_pool(void) > +{ > + char *kfence_pool =3D __kfence_pool; > + struct vm_struct *area; > + int err; > + > + area =3D __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 =3D (char *)area->addr; > + err =3D ioremap_page_range((unsigned long)__kfence_pool, > + (unsigned long)__kfence_pool + KFENCE_PO= OL_SIZE, > + virt_to_phys((void *)kfence_pool), > + PAGE_KERNEL); > + if (err) { > + free_vm_area(area); > + 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 =3D 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_P= RESENT))); > + > + /* Flush this CPU's TLB. */ This comment can be removed since the logic is obvious. > + 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/includ= e/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) Needn't change to a new line. Others look good to me. Huacai > +#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_SIZ= E) > > #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 > #include > #include > +#include > > #include > #include > @@ -30,7 +31,8 @@ > > int show_unhandled_signals =3D 1; > > -static void __kprobes no_context(struct pt_regs *regs, unsigned long add= ress) > +static void __kprobes no_context(struct pt_regs *regs, unsigned long add= ress, > + unsigned long write) > { > const int field =3D 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 lo= ng address) > +static void __kprobes do_out_of_memory(struct pt_regs *regs, unsigned lo= ng address, > + unsigned long write) > { > /* > * We ran out of memory, call the OOM killer, and return the user= space > * (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); > -- > 2.34.1 > >