From patchwork Thu Mar 9 08:05:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenhua Huang X-Patchwork-Id: 13166932 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73F7CC64EC4 for ; Thu, 9 Mar 2023 08:06:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=RWFtKEAO1/DFj2Y1854oSLKdanY6kuxmIxn5PXaYVmc=; b=pfP2QSYgszURK3 J5/sLfoYT5vkjBlCF50PbWIdd0SnchP+07w8jeDDuFK2cvdQUR+7P35gnQ16Qw7zwp5BvjHRQd5nq WsHRn91hu9XVXz/QJdMykmFQNC4dn4M51uOnMz5ZqUGId8U6kd/0LQm92UKzbo6QAC6UnEr88F/kv KdOKRCqtkHwHnko36WF1Ov/yPPjBPNYbrP28fYg5Xvy0k/6kjmzVjCto99XbHjygNCu0r+pV+Mmha DAIIYoPJxQf9S08NEzoA07Q0oUhiYN48elz7+6LKRd15qgRu291l2PsiqTW2mvZr3HoEg0HX+5gRe aQ/KW1aHE2bgli6mfJvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1paBHi-008QgD-JG; Thu, 09 Mar 2023 08:05:58 +0000 Received: from mx0b-0031df01.pphosted.com ([205.220.180.131]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1paBHe-008QeF-P1 for linux-arm-kernel@lists.infradead.org; Thu, 09 Mar 2023 08:05:56 +0000 Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3296emE5012141; Thu, 9 Mar 2023 08:05:39 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=hj4k34mDfJP5T6OkXp8mvrbJlfZkyElc+T7D5t+IZr4=; b=nscrAZx+LjTzJ1GKWvSGlq/R5BHVXvUj16yc3q6EeMrTbQVBlQ7qyV1XdECxDYxYixst JG5wCcMfdUL59UJUOhLhmgb35WTa9787b0JhOj/7MopIzaApO4zmnAZP64wpzRkHJ3sl dHFa/Fr/rlDK09cSWCUQ1zf6UUHs5SLzIqPrMVYNVwbzKLDRDctsvCouYGRcP+mjoFgM ohuCCuHslEwLKUM0VYqXcPWsrdcMjOgR/RcFLUPyhEZ75d6hLBQbLp7+tIlCFZS8XqOe 4A1RQyiFdqvFBGCmQzvS04VEk9P4Z66dI3gx2s+gQp4icS1WcWJY4giQYCgBhtCp4IYZ fQ== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p76vurpfb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Mar 2023 08:05:39 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32985cxW006790 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 9 Mar 2023 08:05:38 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; Thu, 9 Mar 2023 00:05:34 -0800 From: Zhenhua Huang To: , , , , , , , , , CC: Zhenhua Huang , , , , , , Subject: [PATCH] mm,kfence: decouple kfence from page granularity mapping judgement Date: Thu, 9 Mar 2023 16:05:22 +0800 Message-ID: <1678349122-19279-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 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-ORIG-GUID: PFhVf1SZgPqhxlqmii-9SMq9h5EgKF2l X-Proofpoint-GUID: PFhVf1SZgPqhxlqmii-9SMq9h5EgKF2l 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-09_04,2023-03-08_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 mlxscore=0 suspectscore=0 phishscore=0 mlxlogscore=986 lowpriorityscore=0 bulkscore=0 clxscore=1011 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303090062 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230309_000554_964618_66F6F80F X-CRM114-Status: GOOD ( 23.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Kfence only needs its pool to be mapped as page granularity, previous judgement was a bit over protected. Decouple it from judgement and do page granularity mapping for kfence pool only [1]. To implement this, also relocate the kfence pool allocation before the linear mapping setting up, 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/1675750519-1064-1-git-send-email-quic_zhenhuah@quicinc.com/T/ Suggested-by: Mark Rutland Signed-off-by: Zhenhua Huang --- arch/arm64/mm/mmu.c | 24 ++++++++++++++++++++++++ arch/arm64/mm/pageattr.c | 5 ++--- include/linux/kfence.h | 10 ++++++++-- init/main.c | 1 - mm/kfence/core.c | 18 ++++++++++++++---- 5 files changed, 48 insertions(+), 10 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 6f9d889..bd79691 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -532,6 +533,9 @@ 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; +#ifdef CONFIG_KFENCE + phys_addr_t kfence_pool = 0; +#endif u64 i; /* @@ -564,6 +568,12 @@ static void __init map_mem(pgd_t *pgdp) } #endif +#ifdef CONFIG_KFENCE + kfence_pool = kfence_alloc_pool(); + if (kfence_pool) + memblock_mark_nomap(kfence_pool, KFENCE_POOL_SIZE); +#endif + /* map all the memory banks */ for_each_mem_range(i, &start, &end) { if (start >= end) @@ -608,6 +618,20 @@ static void __init map_mem(pgd_t *pgdp) } } #endif + + /* Kfence pool needs page-level mapping */ +#ifdef CONFIG_KFENCE + 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); + } +#endif + } 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..0252e74 100644 --- a/include/linux/kfence.h +++ b/include/linux/kfence.h @@ -61,7 +61,12 @@ static __always_inline bool is_kfence_address(const void *addr) /** * kfence_alloc_pool() - allocate the KFENCE pool via memblock */ -void __init kfence_alloc_pool(void); +phys_addr_t __init kfence_alloc_pool(void); + +/** + * kfence_set_pool() - KFENCE pool mapped and can be used + */ +void __init kfence_set_pool(phys_addr_t addr); /** * kfence_init() - perform KFENCE initialization at boot time @@ -223,7 +228,8 @@ bool __kfence_obj_info(struct kmem_obj_info *kpp, void *object, struct slab *sla #else /* CONFIG_KFENCE */ static inline bool is_kfence_address(const void *addr) { return false; } -static inline void kfence_alloc_pool(void) { } +static inline phys_addr_t kfence_alloc_pool(void) { return (phys_addr_t)NULL; } +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/init/main.c b/init/main.c index 4425d17..9aaf217 100644 --- a/init/main.c +++ b/init/main.c @@ -839,7 +839,6 @@ static void __init mm_init(void) */ page_ext_init_flatmem(); init_mem_debugging_and_hardening(); - kfence_alloc_pool(); report_meminit(); kmsan_init_shadow(); stack_depot_early_init(); diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 5349c37..dd5cdd5 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -809,15 +809,25 @@ static void toggle_allocation_gate(struct work_struct *work) /* === Public interface ===================================================== */ -void __init kfence_alloc_pool(void) +phys_addr_t __init kfence_alloc_pool(void) { + phys_addr_t kfence_pool; if (!kfence_sample_interval) - return; + return 0; - __kfence_pool = memblock_alloc(KFENCE_POOL_SIZE, PAGE_SIZE); + kfence_pool = memblock_phys_alloc(KFENCE_POOL_SIZE, PAGE_SIZE); - if (!__kfence_pool) + if (!kfence_pool) { pr_err("failed to allocate pool\n"); + return 0; + } + + return kfence_pool; +} + +void __init kfence_set_pool(phys_addr_t addr) +{ + __kfence_pool = phys_to_virt(addr); } static void kfence_init_enable(void)