From patchwork Mon Mar 13 11:57:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenhua Huang X-Patchwork-Id: 13172410 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 41538C6FD1C for ; Mon, 13 Mar 2023 11:57:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCEFB6B0072; Mon, 13 Mar 2023 07:57:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B7EB76B0074; Mon, 13 Mar 2023 07:57:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1F7A6B0078; Mon, 13 Mar 2023 07:57:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 901DD6B0072 for ; Mon, 13 Mar 2023 07:57:48 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 62FA14095E for ; Mon, 13 Mar 2023 11:57:48 +0000 (UTC) X-FDA: 80563725816.04.4AD456C Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by imf28.hostedemail.com (Postfix) with ESMTP id 64EC8C000B for ; Mon, 13 Mar 2023 11:57:45 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=nt6ubkNZ; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf28.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678708665; 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=kzU56oRMq1BLyfE79pFBanLtUrgRyEEuF+2+50JBPf8=; b=lLxLCzpqilwmGA2zpfiKmoMIucWXZTr0gIctFZlfF4L69B8UkNmI+drj+M+pg0pNEFd0yY HftUz6uuTvmYs517rUjCWT+zeUQmCnze83MtGQtW9PsMy9Ckx/M3ehu3I4Ml697KMS9HEB fOWGL4oL5O2hlK3Z2yuqm3sf2RGYHS4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=nt6ubkNZ; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf28.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678708665; a=rsa-sha256; cv=none; b=W+qRVRn1R4+MxKizbfFKyHaouvS+OUAtjcWT4V6SXAFb4RKYGsnJPsm0U+R0Pc6iHg8NEm CMAIOi2I1yKxjRlwUTz9gy/nZgLPw95XahJFtVU5/OZF8Jl76SCDDJ72SZQs3hSxwLX5ee 9Ijlz1bzaPubtV0OhLS/X7ncltcwXGQ= Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32DBAsNl004085; Mon, 13 Mar 2023 11:57:31 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=kzU56oRMq1BLyfE79pFBanLtUrgRyEEuF+2+50JBPf8=; b=nt6ubkNZAkcae2oEAzqJ0Nrjza/45hrX/XFV+fsx6SgguNo2oaImEoyte0BHVk57vKCA xz9oY74lrOMqJgMYF6QvdLqjxq8pV7U1xLXMgcJl1OZU8nbnQnPf1Ig7lN3/c/EgkYps KnqxipZ/Ccyyfi01HDAVI9eNNEiLHC+lutK1MBOFFU1RgU5khScoAZUo85vbvZoyqJGT +3djKO19acJckoHmXoq8Wy3qPBL74pkoa7LAFDAvRlJlc9/Pbnh9dOx8Zg0aVoYpw63t Ik9UcEWoFXNnfScDWM6jC5SX1XoVekDLg+TSEQsz2ZHXfSpvNNw6MObDTlxYw/IbY9XY hA== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p8h88mnbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Mar 2023 11:57:31 +0000 Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32DBvUKE021983 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Mar 2023 11:57:30 GMT Received: from zhenhuah-gv.qualcomm.com (10.80.80.8) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 13 Mar 2023 04:57:25 -0700 From: Zhenhua Huang To: , , , , , , , , , , CC: Zhenhua Huang , , , , , , Subject: [PATCH v6] mm,kfence: decouple kfence from page granularity mapping judgement Date: Mon, 13 Mar 2023 19:57:17 +0800 Message-ID: <1678708637-8669-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: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: iaTz0-yEuRVqmrCL0KyIoiv5drwO_M1G X-Proofpoint-ORIG-GUID: iaTz0-yEuRVqmrCL0KyIoiv5drwO_M1G 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-13_05,2023-03-13_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303130098 X-Rspamd-Queue-Id: 64EC8C000B X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: x61b4cywbfc4bt56suaw8n4fqrzunkdp X-HE-Tag: 1678708665-210923 X-HE-Meta: U2FsdGVkX19+ONhHqkE99pbOXx0mrHkguocINgFRso9ZefWnEx5muNIAX+aLN8w8YRAdY1zqlvr4OgbKw5MPVFtXD1RcTmT9siBfGK+9B+UYCGr9546puAMo3Tv/VgEGAEpPu19lw5I5ULAkz75yii2zYKRgF/FqMElmqpMQYv36q/wQfoIPMdXiQGWVo3SwrLzX2mk/8uufMHu9NUpuCRRYIt04rAy0VH1bgM+mzfmG/hcGAoHSl3z4Bmi/jVAJJakNihrM9PMzyFUI/tsGaWkRSZQbM5h2BewL7D7FhLTHMP5vx+JnKNbF3eOou/OtCs/Iery1PawWymCjUfJpUvwIeNRpzzDOh3g+suLjdPxPVbmJxoQlvUGez8Dr69q/+bw6zh18jVjqzMKL+vnUj7ITyVkMx7HThQbXfxlVUh84GBaaYkfQXmpit+G0oUsBa6mMij4c7phHAG3yqJ922Qb9BFa5mEsohpe9rvzgpE6ArjOpPSamEs81K7p//UPZ0BqNCl2esu8iKn1U16Rh+dxgCK41TKHIdQOxVD0BEOEAa/JJZRSuM70xszJSfdD/OxWGZaCXMT2bdfl2YohKnjDmSADttqMNJmlAEa8smLOSZBBCjeAPqwB4l/UU1evx54CK1YaOcCU8rIBN31UtzxvWPSupKJugkV7NrmOGYVeNLOyt/4gZdEEOSpZHK5M0mAnjafM+YjJPZNdF7DdPly8F/ZEabrAKVf/bR8CLjnBprAUfzvza57tp23uSwRpG0wqF10018WEmz3rvt9HO6T674TranwVikOnVKj6SebR4V6AtSTxRcPSC9O3DcMjVMWA5r87cg7Z3OvzhjkaXOm//HYk8jILDG7GfCLEoFnSoGEWeQaAaJnv9/fK/9lSCab5b9Lxf5Olgqgb7DweRd+dRj0nPPWiXUiAGEbni9KPWvb80Laj9HZc9f4R95lDs54PmgoK0GPLFPGsAmEn McXD9dkR pnm/L69G0h0X9cgwTsinu04/AeFa/EN75yEFltTcsKt9bGWdrTcdntf/uxuZUsVZAV/nv/e6xrkWhQCneYrVWPFDPJgVvf4TYSvooQxykzxDKBjcTBQL21gKPkxXBiCxSox0xa9AjU9+06CPp2Elwmbrp6+i/oAEhl/MF9uUr42me4zSrDamTZjtbuOdI+joIdQVk48ZoNqGrLsD8iL/Pp9mMVQd3dhAy5jw3rTJETBPnhDfnpTz94C5eKwfYXHCdu/s29Z8MrX5L+L0ZaJBrfYNSOQRPMIW8dD0i+R/8cX1AG31lHIWldUrFGrNr31TxzPTHZkPc6UTt3xr4h6gy/vXGOm5lIyWO2AOy 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, 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); } 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; + +#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))