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 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 6E90EC38142 for ; Sun, 29 Jan 2023 02:45:54 +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:In-Reply-To:MIME-Version:Date: Message-ID:From:CC:References:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=dRbToVgtHZiiKUYLA6hOBMWJMhmVAbGEVLUhHQIN8MI=; b=yNVkHIafIn8D9eua9ozeTJwKIf dll6gGEfRlWd1LB7XEmTrgfxGDFkqkFQLfo39hwI2837fVjsAJHAkPhLpOjX9cq1E1Lu/iWoEeAO/ UBVnoeOSprrxVKwJQCPlpiSoUjlp1fTVjQne0cku+vYA93G3XCimNxrKjUqJrtReAtP/7kvxEV16p faxfosS6RrbwbV64xmhTTWI78yjn7YBp8TfSIc/dz9wmZPE6tv9FCCYlNxZ4E0XwwQuJAc9DaKdW8 Y0YjiD766bEnXW6ORlr7ag7WCROxCIfWuGzPMtHq+jo5JxZme7fWJsbJbgvPi55ttxTQPaVVDVPDn M9c/x4GQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLxgT-000vtu-AB; Sun, 29 Jan 2023 02:44:45 +0000 Received: from szxga08-in.huawei.com ([45.249.212.255]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pLxgO-000vr0-7d for linux-arm-kernel@lists.infradead.org; Sun, 29 Jan 2023 02:44:42 +0000 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> 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230128_184440_785568_D2DEEBC8 X-CRM114-Status: GOOD ( 24.78 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel