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 16C84C61D97 for ; Sun, 29 Jan 2023 02:44:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A3EB6B0072; Sat, 28 Jan 2023 21:44:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 62DF66B0073; Sat, 28 Jan 2023 21:44:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CD9F6B0074; Sat, 28 Jan 2023 21:44:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 38EFF6B0072 for ; Sat, 28 Jan 2023 21:44:42 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 132EEA0259 for ; Sun, 29 Jan 2023 02:44:42 +0000 (UTC) X-FDA: 80406293604.22.54BFD4B Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf07.hostedemail.com (Postfix) with ESMTP id 7BF084000E for ; Sun, 29 Jan 2023 02:44:38 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf07.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674960280; 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; bh=sZCaHpUwGp8lZgzogUbZ1PMGqW4A/97SrSG88lT+brc=; b=qOjWq6MyPphSloxlchRUVgraF1Wsm0vHlwt/rQqRh5uTvHiVr8sUkAS6kylp+M45JrroX5 XLVXqz/oaLglIjIhYuK+3uBRrXmDnz2eveJHk90ozVNufS9bgcQu/Uv27hxXVamPklfBXq rA0vCdMut3VvuCYFhy1oftxS7gNSzcI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf07.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674960280; a=rsa-sha256; cv=none; b=J5d5M4BBPuFA/+UyAegViCUt+OhOb0YXdZATjv2hi6gT1lMXrW9/qzR64PzTwM2PROfjGR Qs+mUUOyo8B4vWIH2ZV42RSWCpUp4vHm5G75lvxL4f35G7Jp0BFsSIVfLBw4t8TYX7/kYQ FQ//1hHY0QYs1igQBeBzO9S1aUk14E8= Received: from dggpemm100009.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4P4FwB22MDz16Lx0; Sun, 29 Jan 2023 10:42:34 +0800 (CST) Received: from [10.174.179.24] (10.174.179.24) by dggpemm100009.china.huawei.com (7.185.36.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Sun, 29 Jan 2023 10:44:31 +0800 Subject: Re: [PATCH RFC] arm64/vmalloc: use module region only for module_alloc() if CONFIG_RANDOMIZE_BASE is set To: Catalin Marinas , Will Deacon , Andrew Morton , Uladzislau Rezki , Christoph Hellwig References: <20221227092634.445212-1-liushixin2@huawei.com> CC: , , From: Liu Shixin Message-ID: Date: Sun, 29 Jan 2023 10:44:31 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20221227092634.445212-1-liushixin2@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.24] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm100009.china.huawei.com (7.185.36.113) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 7BF084000E X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: d6u6rtba1car9ejs44pkztard8uaqwyf X-HE-Tag: 1674960278-474121 X-HE-Meta: U2FsdGVkX18qkAc6otpgXKhyXZhUgokEOi8jRBMftRQPE5MsHH/v4KKo0/RupKpm7smtjQLpWcG+yYyb4ftSmn703rpnaannTd+ch66nJFEMfPjF2wkHUjNr6OaNmyHAIncC5LmeVkSzV9N+VHOX/CJ5r1N4o7A4xh4GKp48tajxCuTml6otfIgEmyCjhODql1IK2lp4mYQ812Py4ekfTmAGc7EP7agiKlk/9PTXlNVouO6WU0vJUMQI80mbzQaX7MKGsol4gxjOM12HuEBbnaUqJoEV4UJowCfWODpTAH+1SdAVOCufg37HKvjmbwKo8ZgdVswoOAtbp5x2h2bygDo+GaOs8O68Hr7FpWp04CkkBiZBttmTql4rL8llwLl/vdL9N/h2yirdOXY/doMAWksg5GK6vsf/wiQSnyDTCptEFBG+w4IBcMWgtX00pRBgaNUT7owQP1A0NZ9kGvAVBnqp29aNrcsoK0ZGLRi+5SHAFetfW7ACO6JsDm5Tf89nt6hoX0eR8MHXo4rh1i6u0cyZUinKQnRYTdI2SQqCcfNQgM3lPFTLdB3ZsWloGK8ps1pLx1k6S8BN0PbWZyCqAdlIrY7q0e2oKqz1a1vnmGTAeoazOgvP9kWmAv2/ppRIDVUUM6gLgrNPx5uH6pqSk4zqgtUSH3RiJA5ynK6hE6VRrnjeogEr3soH1C+v68Y73WUXWf9LGZX/XJu2kWpjlVou3dXUjrkkQ2hZSVpAhUVM0ivN4vOu15CjdgcB+OqgProW4jqcdf+DF56sbETHy687dHcKWCPGxo3c3Tyy7E2UJIHX/jR8vhir0e3bGn9hMf1XorotwaPG1//YVVVemde+Io9LA0RZYCHCvRpI7vEAHDhcsO/F7qiCBFlpeUt2zOhpB0VBUOEcEaRqRp8Rzd8pL15BFuaVqjMGISj0V4Z6LL43hXR0tjEyj6nzsU1xoxYP17Gw/dirRGSiLQm bHoGrel1 3SPUBitLst6nyiNxBJAXGDw/nmXr38mto47DkLsZons1ACVJj68ODNSQs4hFiOhZjnSzKyEaSrXLZNAakvrr1dwxq1RRJ8CIbLNmWqo0dQmZlgP3laYJ9Q4kG6d56whQeLkWRAYNnUstupM3yheHdZ7vnpE0emp40EIfZ+OhWyqrRuT6LiWCIxkHqxpAcrKm+4220S+E7TaZ4NWEKXSXzJukwxA== 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: Hi, This patch seems to have been lost in the corner. Recently I've meet this problem again on v6.1, so I would like to propose this patch again. Thanks, On 2022/12/27 17:26, Liu Shixin wrote: > After I add a 10GB pmem device, I got the following error message when > insert module: > > insmod: vmalloc error: size 16384, vm_struct allocation failed, > mode:0xcc0(GFP_KERNEL), nodemask=(null),cpuset=/,mems_allowed=0 > > If CONFIG_RANDOMIZE_BASE is set, the module region can be located in the > vmalloc region entirely. Although module_alloc() can fall back to a 2GB > window if ARM64_MODULE_PLTS is set, the module region is still easily > exhausted because the module region is located at bottom of vmalloc region > and the vmalloc region is allocated from bottom to top. > > Skip module region if not calling from module_alloc(). > > Signed-off-by: Liu Shixin > --- > arch/arm64/include/asm/vmalloc.h | 26 ++++++++++++++++++++++++++ > include/linux/vmalloc.h | 9 +++++++++ > mm/vmalloc.c | 4 ++++ > 3 files changed, 39 insertions(+) > > diff --git a/arch/arm64/include/asm/vmalloc.h b/arch/arm64/include/asm/vmalloc.h > index 38fafffe699f..4feff546b11b 100644 > --- a/arch/arm64/include/asm/vmalloc.h > +++ b/arch/arm64/include/asm/vmalloc.h > @@ -31,4 +31,30 @@ static inline pgprot_t arch_vmap_pgprot_tagged(pgprot_t prot) > return pgprot_tagged(prot); > } > > +#ifdef CONFIG_RANDOMIZE_BASE > +extern u64 module_alloc_base; > +#define arch_vmap_skip_module_region arch_vmap_skip_module_region > +static inline void arch_vmap_skip_module_region(unsigned long *addr, > + unsigned long vstart, > + unsigned long size, > + unsigned long align) > +{ > + u64 module_alloc_end = module_alloc_base + MODULES_VSIZE; > + > + if (vstart == module_alloc_base) > + return; > + > + if (IS_ENABLED(CONFIG_KASAN_GENERIC) || > + IS_ENABLED(CONFIG_KASAN_SW_TAGS)) > + /* don't exceed the static module region - see module_alloc() */ > + module_alloc_end = MODULES_END; > + > + if ((module_alloc_base >= *addr + size) || > + (module_alloc_end <= *addr)) > + return; > + > + *addr = ALIGN(module_alloc_end, align); > +} > +#endif > + > #endif /* _ASM_ARM64_VMALLOC_H */ > diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h > index 096d48aa3437..55ef97325b84 100644 > --- a/include/linux/vmalloc.h > +++ b/include/linux/vmalloc.h > @@ -122,6 +122,15 @@ static inline pgprot_t arch_vmap_pgprot_tagged(pgprot_t prot) > } > #endif > > +#ifndef arch_vmap_skip_module_region > +static inline void arch_vmap_skip_module_region(unsigned long *addr, > + unsigned long vstart, > + unsigned long size, > + unsigned long align) > +{ > +} > +#endif > + > /* > * Highlevel APIs for driver use > */ > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index ca71de7c9d77..c840d673052e 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -1236,6 +1236,8 @@ is_within_this_va(struct vmap_area *va, unsigned long size, > else > nva_start_addr = ALIGN(vstart, align); > > + arch_vmap_skip_module_region(&nva_start_addr, vstart, size, align); > + > /* Can be overflowed due to big size or alignment. */ > if (nva_start_addr + size < nva_start_addr || > nva_start_addr < vstart) > @@ -1523,6 +1525,8 @@ __alloc_vmap_area(struct rb_root *root, struct list_head *head, > else > nva_start_addr = ALIGN(vstart, align); > > + arch_vmap_skip_module_region(&nva_start_addr, vstart, size, align); > + > /* Check the "vend" restriction. */ > if (nva_start_addr + size > vend) > return vend;