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 D6494C61DA4 for ; Mon, 13 Mar 2023 13:01:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D15A6B0071; Mon, 13 Mar 2023 09:01:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 581406B0072; Mon, 13 Mar 2023 09:01:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 449446B0074; Mon, 13 Mar 2023 09:01:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 368F66B0071 for ; Mon, 13 Mar 2023 09:01:42 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CDD311C634E for ; Mon, 13 Mar 2023 13:01:41 +0000 (UTC) X-FDA: 80563886802.02.9246FF8 Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 1B2AB80008 for ; Mon, 13 Mar 2023 13:01:38 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kz6RVKwl; spf=pass (imf30.hostedemail.com: domain of elver@google.com designates 209.85.166.172 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678712499; 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=UUegi1pERaaM+ShYDfaoYG51oElajvWu+QrEVQP0z44=; b=vFlycPIrOvUfB/Zc4Um7b26Wz/FyAmdPK/b8APUY4rSiph4QcB5t6wrwyaUzZjE4grpg5j mqSL7l/fSf3TPR8G0o2V6WmJ0yo+PRPKP4zo7VykWAp2RI4nW4zfzQrJJct5fCYK7+WIXI xqXCwZt1oZdmU6Tei4EjEvxbN0nXmbU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=kz6RVKwl; spf=pass (imf30.hostedemail.com: domain of elver@google.com designates 209.85.166.172 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678712499; a=rsa-sha256; cv=none; b=03qWcHhaMcQe4aJPREZ6atHF1X0eMxEQIBWnahQIVasFQY4YpZ4BSveECRuj0nUwaZ4Wp2 kxxnnLpEsxiw3YtkPq8fDcKZYrbT/wzN5BwgEKMaTJjji7cAKq2H/nfJrWN6sMiGx41zE6 5zz2IahhqFSzDYcE/QObLE4gzL8/KCQ= Received: by mail-il1-f172.google.com with SMTP id j6so2427662ilr.7 for ; Mon, 13 Mar 2023 06:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678712498; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=UUegi1pERaaM+ShYDfaoYG51oElajvWu+QrEVQP0z44=; b=kz6RVKwlkGI8S/JMPVTKLare7WXkSso+fhz9AYl31UWMFJ4Ec6bFLRHKN7PLBOjwPb yCvZ1dmNFIi3hDIiS/LMt92JhaWq1cGnLEcVbeDDSePXiMj9kBJHGSKeJGEGWwZWjmIF LGxViNlB4qrJdSciht+TjO2qm4QVizIe2cwQargB3emgMWNtLVTK4+wPwqOTTdxz7HGY Fk9A3yia0jSlzQ4oKrofWVLnNsWwJjXFKRWaEFhfIstS6X7tcDzxUtGAJcTlLWBSjwVX SykHYB0wLVWIcYV/mQ5omXnP/hRTdk1irMNdj5e97B1c0YTftTrPmiO/SSaR6NF32KTR A9KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678712498; 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=UUegi1pERaaM+ShYDfaoYG51oElajvWu+QrEVQP0z44=; b=j4dfEl0K4QfVPEjUqLQ6Cn3NEepHuJuw9DG09AhIqZAYwu5rfNFMRmamS3hmKmE4+D 5T+AGg0ohDfPN8rHgO1Pc99267tJPq2BoNmLDek+xjERjr7Mccbpy3lM+tKtHl80l4b3 k2ZvI1kksJ8JmcxG7THcjxpKKfF79E9Urmcq8jFqNy35H7DrVO3vaiKQaBcl06uC6kb5 c/MNQYV8pFOu18hx2FOb0SuKwVvwjrxBqz7UHONk17OZ+cY8aqRBAURI/2G5C8cgU/49 FxUafUC+YzG2iKvQTqv2D2Iea9dSvxc7O77Lk79QYG0yusvondwyxkrWiHmZ4npQzvh6 /q1Q== X-Gm-Message-State: AO0yUKWD0YDSkr1S3ZPu5mPYbo0Mk8l/VdKS4gBsZp+Q9fG5u/IfeZyu F34iXfZ4GGuj7XFQmTSwtXUEQT0zr7xsRv5UblA9Rw== X-Google-Smtp-Source: AK7set/cFLZjz8zTWNWmP2lNM90drENUnn2cdtknWTxDSCdmBFDQVdyHtjTRxa8MUtDQjF2V1KcwnicGeBJmS69vjb8= X-Received: by 2002:a05:6e02:4c4:b0:322:fe5b:d776 with SMTP id f4-20020a056e0204c400b00322fe5bd776mr2448276ils.4.1678712497945; Mon, 13 Mar 2023 06:01:37 -0700 (PDT) MIME-Version: 1.0 References: <1678708637-8669-1-git-send-email-quic_zhenhuah@quicinc.com> In-Reply-To: <1678708637-8669-1-git-send-email-quic_zhenhuah@quicinc.com> From: Marco Elver Date: Mon, 13 Mar 2023 14:00:56 +0100 Message-ID: Subject: Re: [PATCH v6] 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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 1dpdmzj79fxu8ze3k3j5msw9shxqmt7t X-Rspamd-Queue-Id: 1B2AB80008 X-HE-Tag: 1678712498-389307 X-HE-Meta: U2FsdGVkX1/MYHkPvSeU52mer/s2Ipfpd3/w2D1pFFiRomVimRTY5TH1z8SeGVjNiTbTQdZWnM1QWTuCg6jy4ACJIFw5CdwEGzHPmwyu2aGchaaIQ9+zCWJDzQoqEBFo8o/R4pcjeXYqbpk0F1InsWG69GeXdr1hnHGpLOg03NWjZQn/LMfXVg27pqrPQBLHZ/pT8iTF5lnCsGpS+TEptjFHbGOjpppbKT/boEAHNrCxLnWMFsd9W1iB6vYVIn4cWZIVieu3yBeP7VXdIv9Jc/m8/TIL26d2kmrIFhJpJytcQiLulboEC+CEcCcR3YvWxnIvS8wGdA3rtL1CTXCsHtL+n5o4SCYElUMFvYy9WdbGM4gtrGElaTpQxKT0jpTokkiB3ZVkKBIiTOkjBC8QTmAUbeu2t1BXCskD+UZb9nfIce3MztnWYp4z1sQZ2p+440QaD6dW5iPgbaikYX3qtDTyLsbiSEK18PSrpe1QK3ZZipi+MIGhUhYA4/zGKgHqr2JbScfDUKpWZ3x3WbIzufZiLD34pm+hsogmTXss/eD+d7s2bneVEJt/t9oNW+HktK5ZYqqzSQfTqTJ/6LPkWPj6PE7SrgiK2M1QQuTPuHrthvqSrw8w+31ymSVQkHunO96eN6DuuXrJkDz5PaSEwZeiBjwrbz7TEP9tTDO4SjIZ1C8LksRy70FDoAeOp9Qejff7F4TflBXFIM4ukcBQoXLFzY7iHS/s1zGWSbd8unMMMEWpjJPgtAWwE21lTfO439SYvQr12mQLSO2PF+6KDpNSwwMnLBY8aSWjPROxUg7iF7AdI9o7MH+tqw3QN7CWQsLQ2GSLY3GF9MrCJ70+8uE7836BmDF6Y6bUwuF7RzXOBaMMLa8uTC+mvOLB0SdMcrpzf2HOMqAHZ+f8Sp5c9bXK1Rll3WjD/A2M+g9CgZ2/EwX2VngD9DdBOM+Qs2KqubLnxzrb4IfXkfMOXel O3jGu36b Dt4+xvKJIGndaecB2Lv4QmY9+EoBUjvddPlMPg8ey/o34VvtlzZxlheaAeF3GwDYtOma8vYHdglb+I1T3MR6zr20T8O0vSX+JBVV6eIdg6gSgnGUlte8Jlv3UwsDACJAYELmoLHX31yDVVamOp5e2j0WfAMGNCmqthHJS84aCdeUe0u4tXOaGaTeI/vS97yheYOTQFO6jxJX/4BOvHfn3KiN5eGy7ggXhpN6xjpj3Dd+j9o+STAKnqS01aJMM7gdM2eKkNKr3Vz+xn9OyS7tGw3c9sX7k/8t4tggtWZeVQfZcptC+gqPMtu5E30QOJCRD06e6zjC/+ucu7fRJ547menoO5Z4aWedhJDYwueKujdmIRTKJtkCAtPv3/XaCQeBj33OS8/zLNOPvva5zR9xl2bCNADi5nnvsYk99lz78CN8OTAc= 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 12:57, Zhenhua Huang wrote: > > Kfence only needs its pool to be mapped as page granularity, if it is > inited early. 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. Need to be noticed that late init of kfence pool still requires > page granularity mapping. > > 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. > > 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 | 8 ++++++-- > include/linux/kfence.h | 10 ++++++++++ > mm/kfence/core.c | 9 +++++++++ > 4 files changed, 67 insertions(+), 2 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..25e4a983 100644 > --- a/arch/arm64/mm/pageattr.c > +++ b/arch/arm64/mm/pageattr.c > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -22,12 +23,15 @@ 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. > + * > + * Kfence pool requires page granularity mapping also if we init it > + * late. > */ > return (rodata_enabled && rodata_full) || debug_pagealloc_enabled() || > - IS_ENABLED(CONFIG_KFENCE); > + (IS_ENABLED(CONFIG_KFENCE) && !kfence_sample_interval); If you're struggling with kfence_sample_interval not existing if !CONFIG_KFENCE, this is one of the occasions where it'd be perfectly fine to write: bool can_set_direct_map(void) { #ifdef CONFIG_KFENCE /* ... your comment here ...*/ if (!kfence_sample_interval) return true; } #endif return ......... } > } > > 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..2b77eee 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,12 @@ bool __kfence_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *sla > > #else /* CONFIG_KFENCE */ > > +extern unsigned long kfence_sample_interval; This variable does not exist if !CONFIG_KFENCE, please remove. See suggestion above. > +#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 >