From patchwork Thu Mar 9 15:37:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenhua Huang X-Patchwork-Id: 13167748 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 2FEE4C64EC4 for ; Thu, 9 Mar 2023 15:38:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C53986B0072; Thu, 9 Mar 2023 10:38:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C02D1280002; Thu, 9 Mar 2023 10:38:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ACBC1280001; Thu, 9 Mar 2023 10:38:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 990A46B0072 for ; Thu, 9 Mar 2023 10:38:24 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4D2314037D for ; Thu, 9 Mar 2023 15:38:24 +0000 (UTC) X-FDA: 80549766528.03.473A142 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by imf06.hostedemail.com (Postfix) with ESMTP id EF4DF180015 for ; Thu, 9 Mar 2023 15:38:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=dd+ssvgd; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf06.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.168.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=1678376300; 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=BE74Oyq1lIbrbQ6rK7ltWUaDz+KLE2Idl+KU4pR1QCs=; b=a6NJw2rwmsgKdoQX2sVebqDBC1w9B8QS0iRHSt4zoIR+U7TNx0hm/alvq7VT9K3dJdvwXA sjIuszMnm2ap2Iyd6MyOJ1aGGQH7VZhY58kBZcZntgpdy1fMetvjpgYbyIwuh8kKErwDtI i+eF/RhV8la25DQm6q6FOEKXD8M9i84= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=dd+ssvgd; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf06.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=quic_zhenhuah@quicinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678376300; a=rsa-sha256; cv=none; b=gh1ncaQqVKXmvP+f/UtUbmzyJJPnbVQ+L7MLOkFwDh+3dUK3CGmpXZP6dXQAXqqLsF9l5F WmOfT1rRvs+Ua0Revx1qTkG57dnBPiDyyyUe9YEpi2n/cf+LfPE6t8VbL8gsSM/Yj7KIC7 5BnyOm8tiLDOBsXLL9ev0hc0eAKun7E= Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 329CJNVP022185; Thu, 9 Mar 2023 15:38:10 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=BE74Oyq1lIbrbQ6rK7ltWUaDz+KLE2Idl+KU4pR1QCs=; b=dd+ssvgdpgUc13i6kp7yOUQtLlCsvBPwq8gt/JRIPLciE04GukwrNfzDZiiEreb3050I nTSMHLYgc4tRWMim/kn1ox57YDFXowfkB6XqZVUfKIkQGOFLgBYf3SMoToBdZd7bvJTU aoJNTHt8oHlQiL+ED59V8C84JMpmzlSaCKqWTSbfBB+BuB5N2eYcKnvmUr/tNfeelItm 5L8EEPY7XqboKmMwsN9nqGNx+BMZSsfWQ9gSqtD8O0Fq54zgPTo2Lu5Lls/wXFU6PU8X f/jHEySNKd9SgZGO6KwTxtnJtqlO4Tx20iArGzF58V5Bo1bqSacaZQnsuxNA1sHI4cSZ cA== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3p6vnakdmm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 09 Mar 2023 15:38:09 +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 329Fc9X2022664 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 9 Mar 2023 15:38:09 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 07:38:05 -0800 From: Zhenhua Huang To: , , , , , , , , , CC: Zhenhua Huang , , , , , , Subject: [PATCH v2] mm,kfence: decouple kfence from page granularity mapping judgement Date: Thu, 9 Mar 2023 23:37:53 +0800 Message-ID: <1678376273-7030-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-GUID: vm6nGviRVIoJS1M2bwWOC0TeX6rhGGyI X-Proofpoint-ORIG-GUID: vm6nGviRVIoJS1M2bwWOC0TeX6rhGGyI 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_08,2023-03-09_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 spamscore=0 clxscore=1015 mlxlogscore=945 impostorscore=0 mlxscore=0 phishscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303090123 X-Rspamd-Queue-Id: EF4DF180015 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: y3jmy3jr3n3tt46fqwym8rxwzeirz9u9 X-HE-Tag: 1678376299-410324 X-HE-Meta: U2FsdGVkX1+znxNhG5LFJZ76TbvRup5a+QVoGaTYqbvnLvtFzAEA7jFsovHbVPFxggC/FcvAZvGyS4jeUHSaypW9xMUyDhqrSJL/vHAYVnCbbsNW+p81186Zuz6CeQLrlZg9O+R4K2mRrJuvti8kiaaSZLZ4SN9HUt8h+oUIizhdQWiRG5LScVzwlWGGfYX23uDSZdAR1B3p7Ej/sVHzrTUM0M3OjE5DmGGHCiVHMpBqmEwqy5b4//Q7TtjT02oHgOQdaT8zvHAn6xrf68biEdcgzTn4d4XFRnZ39QDrqBH6EMKFZa6pVgoFHfoyU6DhDCa1NRe/h+UKBnUYisGAUJuBxSwO/JKpQ1QTMOD7KPFyYK2rRtIDHoiFW0pcrxmxBrUM5ayjyBQMFyOhh4Mrq4JDCAGbh6knVEYpGHLI04sDWqKPm9M8oWYc9YGPvNAihLYtaA5PfAijt8MnvRlQJlQJsTtYEsJAn8rdttpO/ssJYVk4ucW0XAWbCwg1Sx4DkZnDJrsvftcBMUvoohHzklRDOdmCJo6tUXt3GT5ovzBG5C8nJ/i5aqknQDJUE82LyMxF4U+JfUJaPAcRnEMHrICmvIw6as3YB/+Uca7+oxAw14MqV1lMv0N7U52gD+/107uC9LQkoSQbfOYeCnr3IE1Q+UvIox3uQuG/idlrJSup2xBKdhoE48Odkg5v+PErPXoq/da8IopTzdCpH9Djb/ooAbqfqAs5BS2rWzoih197KnFX3mxBzLsLaSxKB1Df5aLJIXoNjiY95S1f2SfKo7PtIE1qNqNsjFvhEXjHh19ON9F2lok2b11tXaB2QsyejcGRxpNmZyCk+yAmFROBkp9juP1fDgTTRHEaGCnbio8MxjfdcKVL3/fwHf/0mQmgoxWxUf47TdViqAW94juNAX4eE9Jb4+eZB+YCfcDAHIv/ySwxpeY95StvdesIVHhXNYAa0+2jnkkZbdOS4Ju OZJoShdH sYtjNTHAbiP9g5lePfjhbgVcBejPr/ojGPYl26STRnbVcwjRRk5YqN8+/n6iWdser9m41c5sfm37KYc65oTCuii1SXr73aL4T7qNkBb1aQPoLKyP37rc9TAnUaQwEORJgcJOYGMzd+t37UxyPDJS6CyCsbtv+TsZ9swen/P6uATRfQALWQFSGcs3Cp6RNtER2hEItvwuzZDVHH/PUc0R9OZLt4CpDlrU/SUzP+vS75z43pWkb8gJ9wGmHvahyBC68nTwltytMwyZEoDFVZAsilk449aIoipJIkfMmtaDTRNUXqJCCcCV3bo6Sk+VRrd8mpMynM+xWe35Da05ltDT99c3ofz4w3Wy8D1Uh 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. 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, 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/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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/arm64/mm/pageattr.c | 5 ++--- include/linux/kfence.h | 7 +++++++ mm/kfence/core.c | 9 +++++++++ 4 files changed, 62 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 6f9d889..46afe3f 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,33 @@ 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 = 0; + + 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 0; + } + + return kfence_pool; +} + +#else + +static phys_addr_t arm64_kfence_alloc_pool(void) +{ + return (phys_addr_t)NULL; +} + +#endif + static void __init map_mem(pgd_t *pgdp) { static const u64 direct_map_end = _PAGE_END(VA_BITS_MIN); @@ -532,6 +560,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 = 0; u64 i; /* @@ -564,6 +593,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 +641,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..d982ac2 100644 --- a/include/linux/kfence.h +++ b/include/linux/kfence.h @@ -64,6 +64,11 @@ static __always_inline bool is_kfence_address(const void *addr) void __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 * * Requires that kfence_alloc_pool() was called before. This sets up the @@ -222,8 +227,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..a17c20c2 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 __kfence_pool already initialized in some arch, abort */ + 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))