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 BA1FDEB64DA for ; Fri, 21 Jul 2023 03:13:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 388DA280183; Thu, 20 Jul 2023 23:13:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 337CE28004C; Thu, 20 Jul 2023 23:13:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D8D4280183; Thu, 20 Jul 2023 23:13:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0B82228004C for ; Thu, 20 Jul 2023 23:13:57 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CCA331A0106 for ; Fri, 21 Jul 2023 03:13:56 +0000 (UTC) X-FDA: 81034149672.10.A9745A2 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf16.hostedemail.com (Postfix) with ESMTP id A5638180008 for ; Fri, 21 Jul 2023 03:13:52 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of lienze@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=lienze@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689909233; 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; bh=gMQgEkHQqdx0wyO0gmmjDuJGj4sUrpTQIASYS0JLiLQ=; b=U6UQLpmepGTUfgeLYBOayiZaAYQdX1mD/b0NG+UKSOgUFguwGqsu2ry1ZLqffqsZHxvhP7 KBCIR2HT/PK/blvn2H61uQQe+nb+BQAaSWJoQnUFrXWXicCtGvyi7RQhfyrVu7Eb5oTzXg dywDh7+ks1oH3uTzCl1V4p5aIpiYfsA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of lienze@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=lienze@kylinos.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689909233; a=rsa-sha256; cv=none; b=3lzq31D+NlTx80iHb5YZOKivO1e6fpRcQAwzKxDgWaTAfFvJ+6IjsNQ/IiWwpZSJlDjrPK 1+dH7qJGYh0cjBvDU9J/Za+Cv2NZZLOP7Ml7g5SQyXnh49KTQaTf7xA2MJY4UDmqnhrZ2E 2jMxU+CKdbwiCRrnK7zghEBFukfXUbY= X-UUID: 2421b45754f94964a3bf6832243c5e1b-20230721 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.28,REQID:791aca66-b8cc-4267-8093-0ba519918957,IP:15, URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-INFO: VERSION:1.1.28,REQID:791aca66-b8cc-4267-8093-0ba519918957,IP:15,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:0 X-CID-META: VersionHash:176cd25,CLOUDID:ba75de87-44fb-401c-8de7-6a5572f1f5d5,B ulkID:230721111347J28IJWE1,BulkQuantity:0,Recheck:0,SF:19|44|24|17|102,TC: nil,Content:0,EDM:-3,IP:-2,URL:1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OS I:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_ULS, TF_CID_SPAM_SNR X-UUID: 2421b45754f94964a3bf6832243c5e1b-20230721 X-User: lienze@kylinos.cn Received: from ubuntu [(39.156.73.12)] by mailgw (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1140526717; Fri, 21 Jul 2023 11:13:44 +0800 From: Enze Li To: Huacai Chen 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 Subject: Re: [PATCH 4/4] LoongArch: Add KFENCE support In-Reply-To: (Huacai Chen's message of "Wed, 19 Jul 2023 23:27:50 +0800") References: <20230719082732.2189747-1-lienze@kylinos.cn> <20230719082732.2189747-5-lienze@kylinos.cn> Date: Fri, 21 Jul 2023 11:13:38 +0800 Message-ID: <87lefaez31.fsf@kylinos.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: A5638180008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 9xrriguo55rzw31d5za67gg757ztoj4h X-HE-Tag: 1689909232-568903 X-HE-Meta: U2FsdGVkX1/us0MANAxinefHUJDvAsvs0wU+SwiYABUNBvGJ+PMbgxmw5/Iro3Uv+7sfVLYG8VKM3xFWyco24AbC6tGBQxmdoOC+c6v/xiJUANryGyMHoTdbNeb0gRZr5YqJjAYoCgs1zjT8lwpaxvYZi93ICEX0MY58htSbuHmFAiyxsKeRr6eIThlxUgXXQ5LxAp55HBnI+GkC28GbQbEv60Ek/QegdyBSvd9yWsSc2CSqgJENmKcKmuCmYgFaa8ulD4t2Xy+7jflH89wFdCVF+n2EykT8MWuv/cRPwh1UVabOrVfiENn0SpIJaZW3X2lafS6EuJGOGy+hpeUmzZ+0CXKzSOIavoArwyXJbe3NDtx/ImnODc8Z1758NTgapQ92ePoV7zyYpbFe4ayAsiwBGPOh/KirktIxUkTBrpoGEMOnDc06zKlplp8wD6XX5aALbnSGpSq1gxHmkWfLoSMEITFd3d4BQSi9DfhhslyR6TNbRZ2KseL74AddffSjGoPPmExUDVvaI9x8pFhIby6QJZr465dSGmwBhol6OtQ3YpGO5w1UQu5BgK0QDDotwW+ia423xExZ4j57bat7RGffj2UWanbUSYFFF7ZDkThRrBO5UFq3xJAtSuUt2oPVyiYICr74V1FFJzgeu94NY4qiT2jJWulNvJR9DL5t1FsS/yKb014rznLNPNWaRTlJHPvYoz+PmrlFRzQ5qteAhtInEl5fp5a3FC0dZpMF4OJmDN9rjWrQJGukrvLFkyaPQJ4Hs+xWi7JvxIDfH+AWHGgr3kirjH1QmZPWbIsdF8b36wfodD2K4+OaGswQ9VTFgl7Z32bsoLbo5XQRSyPHk3VIEPYIAhUxmSTMnPRK/4FCxBvUd6zcwz9eSnSiS9u9uPwguH1xpoZr2W0RJXfg/UF+bhjK23omvLRFf3131NmCh7r+LH8AKjcaPx41ADb0XUnbkrZX7MpelhW6+LM n4HGXp3Y flnivgDqLRY9HIeyo7TYi6g58UCqqsMeGt1Bsw7ti2tr9qqOOl/ZPH2RKswhtUHA3aIeRnpczTtRhuf8FhJ3hCJBvEFSgeh3Ozw4PsZe5ZZ0ZTskL/4I43P7eSY3YIzk8qxx1 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: On Wed, Jul 19 2023 at 11:27:50 PM +0800, Huacai Chen wrote: > Hi, Enze, > > On Wed, Jul 19, 2023 at 4:34=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 using 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 | 6 +++ >> arch/loongarch/mm/fault.c | 22 ++++++---- >> 4 files changed, 83 insertions(+), 8 deletions(-) >> create mode 100644 arch/loongarch/include/asm/kfence.h >> >> diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig >> index 5411e3a4eb88..db27729003d3 100644 >> --- a/arch/loongarch/Kconfig >> +++ b/arch/loongarch/Kconfig >> @@ -93,6 +93,7 @@ config LOONGARCH >> select HAVE_ARCH_JUMP_LABEL >> select HAVE_ARCH_JUMP_LABEL_RELATIVE >> select HAVE_ARCH_KASAN >> + select HAVE_ARCH_KFENCE if 64BIT > "if 64BIT" can be dropped here. > Fixed. >> 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/includ= e/asm/kfence.h >> new file mode 100644 >> index 000000000000..2a85acc2bc70 >> --- /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 char *arch_kfence_init_pool(void) >> +{ >> + char *__kfence_pool_orig =3D __kfence_pool; > I prefer kfence_pool than __kfence_pool_orig here. > Fixed. >> + 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 NULL; >> + >> + __kfence_pool =3D (char *)area->addr; >> + err =3D ioremap_page_range((unsigned long)__kfence_pool, >> + (unsigned long)__kfence_pool + KFENCE_P= OOL_SIZE, >> + virt_to_phys((void *)__kfence_pool_orig= ), >> + PAGE_KERNEL); >> + if (err) { >> + free_vm_area(area); >> + return NULL; >> + } >> + >> + return __kfence_pool; >> +} >> + >> +/* 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_= 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/inclu= de/asm/pgtable.h >> index 0fc074b8bd48..5a9c81298fe3 100644 >> --- a/arch/loongarch/include/asm/pgtable.h >> +++ b/arch/loongarch/include/asm/pgtable.h >> @@ -85,7 +85,13 @@ extern unsigned long zero_page_mask; >> #define MODULES_VADDR (vm_map_base + PCI_IOSIZE + (2 * PAGE_SIZE)) >> #define MODULES_END (MODULES_VADDR + SZ_256M) >> >> +#ifdef CONFIG_KFENCE >> +#define KFENCE_AREA_START MODULES_END >> +#define KFENCE_AREA_END (KFENCE_AREA_START + SZ_512M) > Why you choose 512M here? > One day I noticed that 512M can hold 16K (default 255) KFENCE objects, which should be more than enough and I think this should be appropriate. As far as I see, KFENCE system does not have the upper limit of this value(CONFIG_KFENCE_NUM_OBJECTS), which could theoretically be any number. There's another way, how about setting this value to be determined by the configuration, like this, =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +#define KFENCE_AREA_END \ + (KFENCE_AREA_START + (CONFIG_KFENCE_NUM_OBJECTS + 1) * 2 * PAGE_SIZE) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> +#define VMALLOC_START KFENCE_AREA_END >> +#else >> #define VMALLOC_START MODULES_END >> +#endif > I don't like to put KFENCE_AREA between module and vmalloc range (it > may cause some problems), can we put it after vmemmap? I found that there is not enough space after vmemmap and that these spaces are affected by KASAN. As follows, Without KASAN ###### module 0xffff800002008000~0xffff800012008000 ###### malloc 0xffff800032008000~0xfffffefffe000000=20=20=20=20=20=20=20=20= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20 ###### vmemmap 0xffffff0000000000~0xffffffffffffffff With KASAN ###### module 0xffff800002008000~0xffff800012008000 ###### malloc 0xffff800032008000~0xffffbefffe000000 ###### vmemmap 0xffffbf0000000000~0xffffbfffffffffff What about put it before MODULES_START? =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -82,7 +82,14 @@ extern unsigned long zero_page_mask; * Avoid the first couple of pages so NULL pointer dereferences will * still reliably trap. */ +#ifdef CONFIG_KFENCE +#define KFENCE_AREA_START (vm_map_base + PCI_IOSIZE + (2 * PAGE_SIZE)) +#define KFENCE_AREA_END \ + (KFENCE_AREA_START + (CONFIG_KFENCE_NUM_OBJECTS + 1) * 2 * PAGE_SIZ= E) +#define MODULES_VADDR KFENCE_AREA_END +#else #define MODULES_VADDR (vm_map_base + PCI_IOSIZE + (2 * PAGE_SIZE)) +#endif #define MODULES_END (MODULES_VADDR + SZ_256M) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D Best Regards, Enze >> >> #ifndef CONFIG_KASAN >> #define VMALLOC_END \ >> 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 ad= dress) >> +static void __kprobes no_context(struct pt_regs *regs, unsigned long ad= dress, >> + 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 *reg= s, unsigned long address) >> die("Oops", regs); >> } >> >> -static void __kprobes do_out_of_memory(struct pt_regs *regs, unsigned l= ong address) >> +static void __kprobes do_out_of_memory(struct pt_regs *regs, unsigned l= ong address, >> + unsigned long write) >> { >> /* >> * We ran out of memory, call the OOM killer, and return the use= rspace >> * (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 >> >>