From patchwork Mon Mar 13 05:03:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenhua Huang X-Patchwork-Id: 13171971 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 8AB57C6FD19 for ; Mon, 13 Mar 2023 05:04:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D0B46B0071; Mon, 13 Mar 2023 01:04:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 080E26B0072; Mon, 13 Mar 2023 01:04:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8D4D8E0001; Mon, 13 Mar 2023 01:04:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DB1F96B0071 for ; Mon, 13 Mar 2023 01:04:25 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 97C1FA969D for ; Mon, 13 Mar 2023 05:04:25 +0000 (UTC) X-FDA: 80562684090.18.E9DE079 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by imf02.hostedemail.com (Postfix) with ESMTP id 69CDE8000C for ; Mon, 13 Mar 2023 05:04:23 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=bDsJQFDw; spf=pass (imf02.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com; dmarc=pass (policy=none) header.from=quicinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678683863; 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: references:dkim-signature; bh=CeryZ7tZlQlJhqewejfy6u0bmLwteHR+Jp7YCP2Di8o=; b=uiF/VEoP4HaTJqOc73QsJW5WYJdY68FuqtgOBsgRDNEEUFkNjHuC0bLEl3VibyaARCP4za g6+KUsi0eLDPGjN3/tkdBMb3BaV+J2EbaMSgahXKOT+/Znhhqwpus7lXtFkoLwpUs73uI6 eLJpq2IpWmDmfPAyCctWOEfBCJnPa0s= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=bDsJQFDw; spf=pass (imf02.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com; dmarc=pass (policy=none) header.from=quicinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678683863; a=rsa-sha256; cv=none; b=vWm+Kxo02J6PUEiJ1L+R9TjzKC4k7f1q24eUGxG6lU5jjZFz3SIXxWGTZzGzPNs8I2PJMJ 3sacF311IcLVtaLltLcSeITrukrKETCE4oG9BksZNU8Z2ne3uD49INRpbsAmSycypby9IY rIBAhiCb8MkpbqI3OOwywd64MqUrakg= Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32D2j8V2023829; Mon, 13 Mar 2023 05:03:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=CeryZ7tZlQlJhqewejfy6u0bmLwteHR+Jp7YCP2Di8o=; b=bDsJQFDwlEXXhIQjfiH38bTi5lqt9v3CQ1yQ5JrwjT/I86CH/dtjLubYv4ddnLGr2RxA 9sYMr5XQ+cCBhlSc2bLfsPjWTVwX3glzYjyXycetc4sXgCUoakQpmoUq8zHNfUXmgh9B TON5M4sTBeScxFA08Z5Fq2D68pVqoMWxoI/JqVQJKIBZDmjYoibu3PsP4MVeft1s3Glv /6GHzS9NbcgIWY9GSJ6fxfLD3AIZ9U7JLjQHLMw4ksfVOxVj9o/LLNVx5ThgTT6HR9Yg pXFW8CCwKGZVhQbENmnen3o/af5lHHeLIzMI8Fp3/B+i7y9k13remsVrqNaXLvbqpiDT mw== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p8jxgbu2r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Mar 2023 05:03:58 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32D53wr7028703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Mar 2023 05:03:58 GMT Received: from zhenhuah-gv.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 12 Mar 2023 22:03:53 -0700 From: Zhenhua Huang To: , , , , , , , , , , CC: Zhenhua Huang , , , , , , Subject: [PATCH v5] mm,kfence: decouple kfence from page granularity mapping judgement Date: Mon, 13 Mar 2023 13:03:45 +0800 Message-ID: <1678683825-11866-1-git-send-email-quic_zhenhuah@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: MO1973YtmlI57rI4ltRoGnB3M8FHdypl X-Proofpoint-ORIG-GUID: MO1973YtmlI57rI4ltRoGnB3M8FHdypl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-12_10,2023-03-10_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 suspectscore=0 mlxscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 spamscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303130040 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 69CDE8000C X-Rspam-User: X-Stat-Signature: p6i57arpow6w4zdpu9qhfzymtdajib5w X-HE-Tag: 1678683863-835337 X-HE-Meta: U2FsdGVkX1+MGoX/vvvWEBgEO3ElxetYEAVTA5DJ+10oBHaimA7wYLfrgZ8GIS+egfLJPf9UsyMHLM+cybr2kQuRY/OZKI4FpqjdlwKVdLylkRcWlWrtf1CJbQWK/vx/9Et0CklhB2NxiTewlfXqFy6y4FSkBl8d2BfSD+S3pVx/jfLjSqghe4w3lcwrKefsAKb3QJkHbOZS9u7Cp2xWfKnanYn7RN1GERi6VRVTgulmJl1th7QJSzLD4riof2S2w24ZLQqqmQy7EqQ+3NLHuv8JB8V8BOIsSeFgh5//WnRGu1jbSfufcM1WqAOLdVWZMwYEpJIMK12tZmFW/MFHGJN1bBCcHxy4bDY9nRwjwL+uilozQMmqimcgiRvMqFLHKqYVb6XC3qAY990hoXWUr6A/m0SRhuiw63MBFKODdtJFVZnv96f7MWrmeXdWdewLjgPzm7zW1/XL2yIRtKibuQ1hyhHFpLaFcREORkmo4N9VEDj0wmrqxNtTIV17FAudkic/LrG1CJevOqkAYDX7izAXuPLeGvxJNvqiVsaqPEiHGOlm7yuScD+4sXsRqHV4CBjqs3kGz6XCx+HPUe3BhB/kIYC3JyBJW44toY8s5OZjhUIHEvZmP0xzWnXRcOQb/O7/f8UnsF1AhFFXfX83HCEX0GVVrwlI8XBCbp/qVVKx7E4I70lUspu19RPFnlFlF70KdOOKu9iDrNlPCUrELXHqCGH1ZISGgBdyhaq8M9TpoEm3aT3cU5dheIK43vuU+dSvhHk5cPa9vAo/Wq68xF89PHaqgEfOKZgEb90k19p6Ra0cvo5H3unjrmIMM/600E3p6HD/PildU63964hqJHoZHtZhuBDUp89UXKPkDm4iHcPllOuu7BdyaaWfesK9sYnR53MN8MIpoz8BgHGBoHKQgHJuHhCCNAzZrjCJr0DxVNmy7Ma+6uLF5D9iyFok8DUK9Pg5HdB+2dSLxIV IxduQVPs zdspcXE9fHfEOYCuXp8nhMa1kUvJCnJVhJDlAtiOhXF0aBARFhRtwFWQMoDSCvEUO+EFxnjzr6ecQrMokNpK1RCAaRp0alC/f7es/fP0Dll5Cwp165QU+YfdIIEpvtuy5on/uI0i17NIHVJmMLBjrmT36w4hyEsmQMLSr0QedDY8zHDyX/n2tFJbyE1kld2TU9BWIRaBDgky3GVxqX4lhBGjg6S7SXNE5Bb9FAbz/WOGhA0DI+YKdZ38DlZ5B8OaU5SFSd6zmimT9xy2wrQ9kmaBZbwkhs+CvRN4SEvkYei+1afJQJMNyYjYmZ/uPakDaAtRBeI0xQnrxNFxKgYyDg0vnOkOHOwu75/3q 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: 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. 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))