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 86D21C6FD1F for ; Thu, 16 Mar 2023 10:44:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15DE7900005; Thu, 16 Mar 2023 06:44:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E7EA900002; Thu, 16 Mar 2023 06:44:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC8C7900005; Thu, 16 Mar 2023 06:44:55 -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 D7965900002 for ; Thu, 16 Mar 2023 06:44:55 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2B8BC1C63EC for ; Thu, 16 Mar 2023 10:44:55 +0000 (UTC) X-FDA: 80574428550.25.CBD601D Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by imf07.hostedemail.com (Postfix) with ESMTP id C765640012 for ; Thu, 16 Mar 2023 10:44:52 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b="lXgU/oLj"; spf=pass (imf07.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.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=1678963492; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=14GYDjYY4VNO6IiBgshsow5iP0Cizb5AZtr8wbZoB4Y=; b=8m6/kVjOj15RZqWiHCinbFuNVnkXzBJB/BVOyWGgpZL13Hf3U5wcOrEltijuvo1sJolnyk YSOhGv1Ncy0AlMiXnOGZft65rkaurxGLAEHnsexGBI0TxeFhRwqEe/4neNLKM6msmfq4OD coVftNgWQk0b4QAOg1nLqXgEo/l9Fp8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b="lXgU/oLj"; spf=pass (imf07.hostedemail.com: domain of quic_zhenhuah@quicinc.com designates 205.220.180.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=1678963493; a=rsa-sha256; cv=none; b=H5+7fTOnIeTfv9Yt0V7fm6WWrAcyH+f/iG31l65cqXkvURKOeEg0ETcf3osZLPPxaqp/iI BjFHDlrIOn/QkuDm005GVhmFuWV7dEgWeQE1+WfeSb/rPo6PXnebRMRdf8BbVPhkXk8Vrf VQPFJf1ro+yvo6Rr8H8yLw+FgoyDIig= 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 32G2n8Yk002031; Thu, 16 Mar 2023 10:44:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=qcppdkim1; bh=14GYDjYY4VNO6IiBgshsow5iP0Cizb5AZtr8wbZoB4Y=; b=lXgU/oLjXhItMvnMZXAy6vUpXFUxsI+xTIPxkZ5rWQ/xDC9g17rREnp67moXdDRtaxw0 DuCIDxMs7GDCJIrzV9lb//lr7UdxFwNGHTEybno6ugbD7u55+L+TlXvARXVIMlTr6MJm boEdo7bOMKVvHd/qwndXTOqH8Rc+7GPN9BqsETocLCBR4T854TsSL98YCu8ic6ICqXE8 rnqphJLTKAektsYnkQ3XNZbGNQDr13DYRYgAvz9TrRZnHW09SSTQgEWSMKLbH2oUJ1ak SiWCu0r0gJuOqFtycU06+MjrmfSZEidlvX3KvxJEWIaqWhqPRp7Ch6wxLHmAoKa5pRDh 8A== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pbpy9hgag-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Mar 2023 10:44:38 +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 32GAib2J028141 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Mar 2023 10:44:37 GMT Received: from [10.239.132.245] (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, 16 Mar 2023 03:44:23 -0700 Message-ID: Date: Thu, 16 Mar 2023 18:44:20 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v9] mm,kfence: decouple kfence from page granularity mapping judgement Content-Language: en-US To: Pavan Kondeti CC: , , , , , , , , , , , , , , , References: <1678956620-26103-1-git-send-email-quic_zhenhuah@quicinc.com> <20230316095812.GA1695912@hu-pkondeti-hyd.qualcomm.com> From: Zhenhua Huang In-Reply-To: <20230316095812.GA1695912@hu-pkondeti-hyd.qualcomm.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit 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-ORIG-GUID: jFXwG-C6V8Q8rFx153ri762FweDKjBJI X-Proofpoint-GUID: jFXwG-C6V8Q8rFx153ri762FweDKjBJI 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-16_07,2023-03-16_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 clxscore=1015 mlxlogscore=971 suspectscore=0 spamscore=0 malwarescore=0 mlxscore=0 priorityscore=1501 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303160090 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: C765640012 X-Stat-Signature: bd1as5p8dcwpyywqswiaiattfhjd1kfk X-HE-Tag: 1678963492-149617 X-HE-Meta: U2FsdGVkX19NZ9x8+hEzoQktpbez3qsIczEu1MBA+RNc5UsnrrGR8Nziijg+4g09dfZsi52QJklFFPkSTBLvIPwMyVy9yygP5SnXW9wbX8H76KtnY89xtEOIhOxrmSJlpjOsqSZJMoHS3DFNxHrakNNIKHoDkIUizO30zZYhSOl9+jZAvAOL/Xm9oNm3/PzH7EKT7qJkIWwnmBtrJFWoIu20C3YOzcH4aDQaPwDbrk9F66Dzje+8CFyQ5+IgSq1SN+PElMNLwuwVTZ89fTsajDmqt8hU7lTHeDFeeEjQWXg2F+/xo6DhCFwSuH28+s1/1pk72fQvqa7B8lB8JllTbwYcGPmLrllVYuEwTdUjzjogPw9eyI1BaDpXiMRyxTGhN13nLSizcgRn8pxg4FKKTLYnLqR87T5RqIJ94juxPB+4LvSxj8FsnhPXdOfimbz2CmGELvTtN8/S1VoOCkicraV4Fy8sT+d8f9hTYG6AZORPGgT0tuEdbodGl9tJmKtktEAS1Po1KhVY0dL77R487PNSH+N1NjcsPEK6rgGCm/d99/VYzNJxkW9QqtIFJee0TmB5sc2A/zrHHYNqoiCTV3etozCuUoEI/ew24DvOEXafq8b0BTlu7Ix9rXPApKjMOaEzBkvd4M8PZcoYfg/nd758hTFYxAx+CmhMTOqfIJRqzCQQ0ZDyXzTtarhDbOQxBcEwA6qGas1XSKJ16j9IMdCHgNHV6YQCcZlrE02kpbWfyTAqPo5ISOaiRrA4ADFZnuNhsJu89OTXhqtsYD8WWZJLUo4dMJBvNNLkKT55awCC/RwFAiJHpsb7v0wlxjsoDRSC7KVUyrmkU/wyhJ0igAjSGv+AV7gGA8cexYfwLlVgjnnV4Gywnlx2duwdKaMPE+3rL1rYnzEijkRM9qV/edK+kEQK6/IBjfDp5ZOQiCgW5lPHQwIPbTs8TNqizfO3ylm57pLjN4UeTRtXzPN kL77An9C c4SBcA1L5m8mIRXVJbCa4cxQNPsrIT6JLePFD1uXThA8UPCqN3QVfJul4FTq2Yf7Hwj8t68KT03aZJMlHOd8pm1NDcPRuw3y1QzHkTEmYOs+eJQPGi6tDRbyPqpqRf4QWfwO4wFQXNJLUBULpxgSasQzrG4SBKSmBBlcx0bz6Lgu8calUW6s5jYDqg78iv8Zvh8mgGxLdpuHssCa/CrBczZMmNxeWDXakCC7kfbph/5UqeDlp+95+4QlmRQt8O5mpV3hJ2XVEVxARiVnsfeNhSr1bGazbN0mQoKmmkqJ4wNZb2FUYCzaHJ4rVBtafSogTMZxCW5xI7n1gkzqKWR4XixmdqkuK+tsnGlZU+Ge8J4KcPJ0lapJbEdYXKPtQoExsKa01xaDWsh33Rr3hbZRbIS+ing== 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 2023/3/16 17:58, Pavan Kondeti wrote: > On Thu, Mar 16, 2023 at 04:50:20PM +0800, 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/include/asm/kfence.h | 16 +++++++++++ >> arch/arm64/mm/mmu.c | 59 +++++++++++++++++++++++++++++++++++++++++ >> arch/arm64/mm/pageattr.c | 9 +++++-- >> include/linux/kfence.h | 1 + >> mm/kfence/core.c | 4 +++ >> 5 files changed, 87 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm64/include/asm/kfence.h b/arch/arm64/include/asm/kfence.h >> index aa855c6..8143c91 100644 >> --- a/arch/arm64/include/asm/kfence.h >> +++ b/arch/arm64/include/asm/kfence.h >> @@ -10,6 +10,22 @@ >> >> #include >> >> +extern phys_addr_t early_kfence_pool; >> + >> +#ifdef CONFIG_KFENCE >> + >> +extern char *__kfence_pool; >> +static inline void kfence_set_pool(phys_addr_t addr) >> +{ >> + __kfence_pool = phys_to_virt(addr); >> +} >> + >> +#else >> + >> +static inline void kfence_set_pool(phys_addr_t addr) { } >> + >> +#endif >> + >> static inline bool arch_kfence_init_pool(void) { return true; } >> >> static inline bool kfence_protect_page(unsigned long addr, bool protect) >> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c >> index 6f9d889..61944c70 100644 >> --- a/arch/arm64/mm/mmu.c >> +++ b/arch/arm64/mm/mmu.c >> @@ -24,6 +24,7 @@ >> #include >> #include >> #include >> +#include >> >> #include >> #include >> @@ -38,6 +39,7 @@ >> #include >> #include >> #include >> +#include >> >> #define NO_BLOCK_MAPPINGS BIT(0) >> #define NO_CONT_MAPPINGS BIT(1) >> @@ -525,6 +527,48 @@ static int __init enable_crash_mem_map(char *arg) >> } >> early_param("crashkernel", enable_crash_mem_map); >> >> +#ifdef CONFIG_KFENCE >> + >> +static bool kfence_early_init __initdata = !!CONFIG_KFENCE_SAMPLE_INTERVAL; >> +/* >> + * early_param can be parsed before linear mapping >> + * set up >> + */ >> +static int __init parse_kfence_early_init(char *p) >> +{ >> + int val; >> + >> + if (get_option(&p, &val)) >> + kfence_early_init = !!val; >> + return 0; >> +} >> +early_param("kfence.sample_interval", parse_kfence_early_init); >> + >> +static phys_addr_t arm64_kfence_alloc_pool(void) >> +{ >> + phys_addr_t kfence_pool; >> + >> + if (!kfence_early_init) >> + 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 >> + >> +phys_addr_t early_kfence_pool; >> + >> static void __init map_mem(pgd_t *pgdp) >> { >> static const u64 direct_map_end = _PAGE_END(VA_BITS_MIN); >> @@ -543,6 +587,10 @@ static void __init map_mem(pgd_t *pgdp) >> */ >> BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end)); >> >> + early_kfence_pool = arm64_kfence_alloc_pool(); >> + if (early_kfence_pool) >> + memblock_mark_nomap(early_kfence_pool, KFENCE_POOL_SIZE); >> + >> if (can_set_direct_map()) >> flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; >> >> @@ -608,6 +656,17 @@ static void __init map_mem(pgd_t *pgdp) >> } >> } >> #endif >> + >> + /* Kfence pool needs page-level mapping */ >> + if (early_kfence_pool) { >> + __map_memblock(pgdp, early_kfence_pool, >> + early_kfence_pool + KFENCE_POOL_SIZE, >> + pgprot_tagged(PAGE_KERNEL), >> + NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS); >> + memblock_clear_nomap(early_kfence_pool, KFENCE_POOL_SIZE); >> + /* kfence_pool really mapped now */ >> + kfence_set_pool(early_kfence_pool); >> + } > > Why not wrap this under CONFIG_KFENCE ? early_kfence_pool can also go in > there? Because I didn't want to add CONFIG_KFENCE in function.. in the case of w/o CONFIG_KFENCE, early_kfence_pool should be always NULL. Thanks, Zhenhua > > Thanks, > Pavan