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 C8B39C7618D for ; Mon, 13 Mar 2023 07:51:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F73E8E0001; Mon, 13 Mar 2023 03:51:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 380BF6B0072; Mon, 13 Mar 2023 03:51:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FB988E0001; Mon, 13 Mar 2023 03:51:35 -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 0AEB56B0071 for ; Mon, 13 Mar 2023 03:51:35 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BFA73C0756 for ; Mon, 13 Mar 2023 07:51:34 +0000 (UTC) X-FDA: 80563105308.08.09CE387 Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by imf25.hostedemail.com (Postfix) with ESMTP id 1166EA0010 for ; Mon, 13 Mar 2023 07:51:32 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="bHrEW/Uf"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of elver@google.com designates 209.85.166.174 as permitted sender) smtp.mailfrom=elver@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678693893; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zre3cMMIhgx2jQEOm1j7EJjcBMgwQWtjDIhJZ7Z9Qm4=; b=UKAUbwVMKmmWwMkCt63Mz0bYx2YsmfAgBfZ3AobZyPYBsXGvkWngVAz8EVu5UClVdfbxEN ZdT3b/05rUwUeKHwKdvdpczwP08jbaV0gqpidiCFGgqta7y+8GQeX0QRYC+ClVzKHP+l6g LclIWqGKux2/462O/umxlefe4FiGrkQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="bHrEW/Uf"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of elver@google.com designates 209.85.166.174 as permitted sender) smtp.mailfrom=elver@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678693893; a=rsa-sha256; cv=none; b=qLj1y3boDz76rQN2Am9SC2VZVEVs3ULobQR9PCTV4qMFVVSKu1jqIBqhgdFr3iZyUI9OB/ Lzu7YqfkzwQU4YTfYZJEb3x7LOH4l2jxxxuzn0e6wgWQpVIGJ2GMxYto87U+KzmeIXSWSi DUSPBxS6FYkc0Unb/uHEDGIHEl9E05Q= Received: by mail-il1-f174.google.com with SMTP id bp11so1140005ilb.3 for ; Mon, 13 Mar 2023 00:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678693892; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=zre3cMMIhgx2jQEOm1j7EJjcBMgwQWtjDIhJZ7Z9Qm4=; b=bHrEW/UfhgpXZIQvcoQ9eDBnhT7kccdauDhCtt7KKq+pBRa3psgXNM6B/Q3H20dYU3 0nT82WImjyBHBJ2vK+M4LAGV50ub7BAHIxqaoyjZ1QartUe2svsMiiT5JR10HRuojVL3 QndA4/Z1rRYokH50opqPu5uM2Gw4OqZcTlQvHjFN0YRl9oUvFOIN/Oe7qI1FRPJp+m34 g5liHHhxbyfvGPacrJRZvwz/HlYb/B+H8Dz1LYHWURNFOqCkeW8OlQYrFOj+mGPVG2fS BmNyuj76IKmqwRjMMsOyhXEVLNIzi0b+RgS06Uk4I6S4WbTqG558w1DFUIolAd7pL4ji LwWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678693892; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zre3cMMIhgx2jQEOm1j7EJjcBMgwQWtjDIhJZ7Z9Qm4=; b=Qb/rJ/Y2K6EZHtFjOAzEf2l6Zt/UgcUqM9+yJ6tFKdUyzgGYaqfNxqGTTPoExdTtB8 jE8QIsH1RiT4OtzWH7+w+Zn5n8JJdWLTyLoYVBl72Dnf4xtkXBI0+8jR4icEQ7nHJdLW lg7weZvSw8mqZdM83Se3QlsLcxTye9HF1uA1oHGbBTMzMUBbVPgSW0Uf+TOMr4Mt/ETT sWAlSmlKNuBKEH4evaIAwg0uyOV08+h+zywI2hZ8+sPgDuYl0LSBS2/aP+vJTTiKqquu rL4RfB255479b0aez8pDaark3xCM9sNUtJci5YkJtBbeirFMTG5Oq9b0XrGicdX0G69T aqGw== X-Gm-Message-State: AO0yUKXjzrq9CAamOCf9qyDeLbUrdN0QCAhJbY2NnxDOMlsiqfn6iqv0 BwekDKbBLBk3bUrXRwfyFmTRT4ddVjsmSLBrHikBLw== X-Google-Smtp-Source: AK7set/DOUQuSe0KCQqodCCIphurIp1q6QvK3O8yWvEU4fJjTqFE/Bwo14VLNfnehtLuh6v4BjzRN2QXwAIghWqvXdg= X-Received: by 2002:a05:6e02:690:b0:323:855:9daa with SMTP id o16-20020a056e02069000b0032308559daamr1091203ils.4.1678693892072; Mon, 13 Mar 2023 00:51:32 -0700 (PDT) MIME-Version: 1.0 References: <1678683825-11866-1-git-send-email-quic_zhenhuah@quicinc.com> In-Reply-To: <1678683825-11866-1-git-send-email-quic_zhenhuah@quicinc.com> From: Marco Elver Date: Mon, 13 Mar 2023 08:50:50 +0100 Message-ID: Subject: Re: [PATCH v5] mm,kfence: decouple kfence from page granularity mapping judgement To: Zhenhua Huang Cc: catalin.marinas@arm.com, will@kernel.org, glider@google.com, dvyukov@google.com, akpm@linux-foundation.org, robin.murphy@arm.com, mark.rutland@arm.com, jianyong.wu@arm.com, james.morse@arm.com, wangkefeng.wang@huawei.com, linux-arm-kernel@lists.infradead.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, quic_pkondeti@quicinc.com, quic_guptap@quicinc.com, quic_tingweiz@quicinc.com Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 1166EA0010 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: csm6uo3rziefmpm4fww57m41oddhriwf X-HE-Tag: 1678693892-541937 X-HE-Meta: U2FsdGVkX1+/azPlkE7ULBFROaCn9AhmLibl07+0c4kdKwxt01ZkA2qUl/JE8kf4wLS5PDsAUYoZyyWrSa5r4UoymTnAXV2NFCvfdem+9D9e3fdpuIZGskBjOfQDQnDChRE9TjhK396XzGw9KAy3u8Pnau+9zFWMAsPNy7u+Ow3ICBQ4VJj0Zx+Uzr2y1agQRXAjUR55Mr9U4KTGeXOPDJ/FfeO1VVUSDQozR20WHrPu5b30gmUsMJJcZBMPixbaRBpF4aocDYEIEe+oMOYYjAfuOG3o1Zue5hsUOQL4G0AmRZ1qf/Q9xfkbeQ7MvbenXVpLFDiQcktOmSmMyLbPbl0vdWWSo5G1VFUgAI9M5/cFM/NHKztFwpbV4E1pGQ0CVbOltczoYrpPVvQyY5oUaGjSpkceAyhM2I4fV0ZiirqnfK57jr/1s1Wjo4QG8gGW2VIVKfGOUdAMR6/scnr4PH23/R4pyJqZmuZCgpmInST8rQCfHCIdHYteXgPD96LehSucQpASXj6bXOuMuKbnwe0KYSnmI6eP3FppqwowxLlpMOW9kHymLesDOLKa0a14Oll93S5GFgz5D8+DVwNabGNvLtU6YJ0yxeC115I76NwdB94qZ+QiJAfHtH58BGGCCrTrEd89e0II3VFHzZZUuybd5Z8vQ8qHf2e1zBFNH8jHami9j/RQi+vOgu4sCiabc526DfCEGNLpR77g/RqhseRabtO3ExKjB4m0gY2X55YTzM5yusCnZBk10VqTaAo/AakrCTfUGaW4O0Nz/i7sWX0jEP+rOuO/y7USTEkGvYY5PH/12YtpbCp5hztrjPle7e1VEqjF4D2nXCdkABQKGu0vR48ebUr0/eHJUDUUndd2TpwV8LPRqbcd31jzkkubwA5oSZUVIXQtax+Ey/NFydA3lmdu4YEjwW8ofIUxxbxRdaUb5kORfYzYVN79cyZyr6Pq4+7SOCWN2GadEFh U44glM0P ySK0SGiPjR5KxsFAaTlN1ClZ6IYSftOm2+L7bW16RoNqdhBY4wzUUdQerUSuS1wrbwbENygMwnTN9WQ1th6VsLgVamMnz7LVtjJHxR3Gd9+0mx0TNmcLz7pQpu5fl4BfR08NEanVrgFS72enOVIBplMHBsDnV1LbZ7xppg+Nxmk+fnqATpWGt44L6zUFGxWRTzhtNj0FLFmzbqd2c/6rEENz/sswSL423j17oFmYtuLmn6OrAswYGO1CHxVTnmaPtB1PKjOkz6QZG0chFU36w5WaH3l/Img5tmqFi+16aDygyXbdIISb6BGjaUwAM3CHt5gMpYn29ilwSWkuIvUFv1a2c3Z4KbjB54om0LBqobx1RLGte2m6nH8xqAp7KznMOqqGkhOW0E923Lihx8vPuM4N/RhFs6AuuL5QsS38BsEs8YQE= 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 Mon, 13 Mar 2023 at 06:04, Zhenhua Huang wrote: > > Kfence only needs its pool to be mapped as page granularity, previous > judgement was a bit over protected. From [1], Mark suggested to "just > map the KFENCE region a page granularity". So I decouple it from judgement > and do page granularity mapping for kfence pool only. > > Page granularity mapping in theory cost more(2M per 1GB) memory on arm64 > platform. Like what I've tested on QEMU(emulated 1GB RAM) with > gki_defconfig, also turning off rodata protection: > Before: > [root@liebao ]# cat /proc/meminfo > MemTotal: 999484 kB > After: > [root@liebao ]# cat /proc/meminfo > MemTotal: 1001480 kB > > To implement this, also relocate the kfence pool allocation before the > linear mapping setting up, arm64_kfence_alloc_pool is to allocate phys > addr, __kfence_pool is to be set after linear mapping set up. This patch still breaks the late-init capabilities that Kefeng pointed out. I think the only viable option is: 1. If KFENCE early init is requested on arm64, do what you're doing here. 2. If KFENCE is compiled in, but not enabled, do what was done before, so it can be enabled late. Am I missing an option? > > LINK: [1] https://lore.kernel.org/linux-arm-kernel/Y+IsdrvDNILA59UN@FVFF77S0Q05N/ > Suggested-by: Mark Rutland > Signed-off-by: Zhenhua Huang > --- > arch/arm64/mm/mmu.c | 42 ++++++++++++++++++++++++++++++++++++++++++ > arch/arm64/mm/pageattr.c | 5 ++--- > include/linux/kfence.h | 8 ++++++++ > mm/kfence/core.c | 9 +++++++++ > 4 files changed, 61 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 6f9d889..ca5c932 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -525,6 +526,31 @@ static int __init enable_crash_mem_map(char *arg) > } > early_param("crashkernel", enable_crash_mem_map); > > +#ifdef CONFIG_KFENCE > + > +static phys_addr_t arm64_kfence_alloc_pool(void) > +{ > + phys_addr_t kfence_pool; > + > + if (!kfence_sample_interval) > + return 0; > + > + kfence_pool = memblock_phys_alloc(KFENCE_POOL_SIZE, PAGE_SIZE); > + if (!kfence_pool) > + pr_err("failed to allocate kfence pool\n"); > + > + return kfence_pool; > +} > + > +#else > + > +static phys_addr_t arm64_kfence_alloc_pool(void) > +{ > + return 0; > +} > + > +#endif > + > static void __init map_mem(pgd_t *pgdp) > { > static const u64 direct_map_end = _PAGE_END(VA_BITS_MIN); > @@ -532,6 +558,7 @@ static void __init map_mem(pgd_t *pgdp) > phys_addr_t kernel_end = __pa_symbol(__init_begin); > phys_addr_t start, end; > int flags = NO_EXEC_MAPPINGS; > + phys_addr_t kfence_pool; > u64 i; > > /* > @@ -564,6 +591,10 @@ static void __init map_mem(pgd_t *pgdp) > } > #endif > > + kfence_pool = arm64_kfence_alloc_pool(); > + if (kfence_pool) > + memblock_mark_nomap(kfence_pool, KFENCE_POOL_SIZE); > + > /* map all the memory banks */ > for_each_mem_range(i, &start, &end) { > if (start >= end) > @@ -608,6 +639,17 @@ static void __init map_mem(pgd_t *pgdp) > } > } > #endif > + > + /* Kfence pool needs page-level mapping */ > + if (kfence_pool) { > + __map_memblock(pgdp, kfence_pool, > + kfence_pool + KFENCE_POOL_SIZE, > + pgprot_tagged(PAGE_KERNEL), > + NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS); > + memblock_clear_nomap(kfence_pool, KFENCE_POOL_SIZE); > + /* kfence_pool really mapped now */ > + kfence_set_pool(kfence_pool); > + } > } > > void mark_rodata_ro(void) > diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c > index 79dd201..61156d0 100644 > --- a/arch/arm64/mm/pageattr.c > +++ b/arch/arm64/mm/pageattr.c > @@ -22,12 +22,11 @@ bool rodata_full __ro_after_init = IS_ENABLED(CONFIG_RODATA_FULL_DEFAULT_ENABLED > bool can_set_direct_map(void) > { > /* > - * rodata_full, DEBUG_PAGEALLOC and KFENCE require linear map to be > + * rodata_full and DEBUG_PAGEALLOC require linear map to be > * mapped at page granularity, so that it is possible to > * protect/unprotect single pages. > */ > - return (rodata_enabled && rodata_full) || debug_pagealloc_enabled() || > - IS_ENABLED(CONFIG_KFENCE); > + return (rodata_enabled && rodata_full) || debug_pagealloc_enabled(); > } > > static int change_page_range(pte_t *ptep, unsigned long addr, void *data) > diff --git a/include/linux/kfence.h b/include/linux/kfence.h > index 726857a..570d4e3 100644 > --- a/include/linux/kfence.h > +++ b/include/linux/kfence.h > @@ -64,6 +64,12 @@ static __always_inline bool is_kfence_address(const void *addr) > void __init kfence_alloc_pool(void); > > /** > + * kfence_set_pool() - allows an arch to set the > + * KFENCE pool during early init > + */ > +void __init kfence_set_pool(phys_addr_t addr); > + > +/** > * kfence_init() - perform KFENCE initialization at boot time > * > * Requires that kfence_alloc_pool() was called before. This sets up the > @@ -222,8 +228,10 @@ bool __kfence_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *sla > > #else /* CONFIG_KFENCE */ > > +#define KFENCE_POOL_SIZE 0 > static inline bool is_kfence_address(const void *addr) { return false; } > static inline void kfence_alloc_pool(void) { } > +static inline void kfence_set_pool(phys_addr_t addr) { } > static inline void kfence_init(void) { } > static inline void kfence_shutdown_cache(struct kmem_cache *s) { } > static inline void *kfence_alloc(struct kmem_cache *s, size_t size, gfp_t flags) { return NULL; } > diff --git a/mm/kfence/core.c b/mm/kfence/core.c > index 5349c37..0765395 100644 > --- a/mm/kfence/core.c > +++ b/mm/kfence/core.c > @@ -814,12 +814,21 @@ void __init kfence_alloc_pool(void) > if (!kfence_sample_interval) > return; > > + /* if the pool has already been initialized by arch, skip the below */ > + if (__kfence_pool) > + return; > + > __kfence_pool = memblock_alloc(KFENCE_POOL_SIZE, PAGE_SIZE); > > if (!__kfence_pool) > pr_err("failed to allocate pool\n"); > } > > +void __init kfence_set_pool(phys_addr_t addr) > +{ > + __kfence_pool = phys_to_virt(addr); > +} > + > static void kfence_init_enable(void) > { > if (!IS_ENABLED(CONFIG_KFENCE_STATIC_KEYS)) > -- > 2.7.4 >