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 2091FC4332F for ; Fri, 15 Apr 2022 06:32:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4EEC6B0071; Fri, 15 Apr 2022 02:32:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AFDE26B0074; Fri, 15 Apr 2022 02:32:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9C7C96B0075; Fri, 15 Apr 2022 02:32:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 8F59F6B0071 for ; Fri, 15 Apr 2022 02:32:57 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6C4AA2280F for ; Fri, 15 Apr 2022 06:32:57 +0000 (UTC) X-FDA: 79358145594.06.D06A004 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf13.hostedemail.com (Postfix) with ESMTP id CC4E020009 for ; Fri, 15 Apr 2022 06:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=uB3a3+iOsc4hcX22sdyRU/EflMs9pIkR11qeoFCVFz8=; b=vamvTJCHSRHthjO0sjJBLfqtyJ M6vl0HQAec4r130Y1TAoJgIEbrf6lZbL/cBEp9YDLKZgbKcBi2COKcTogCrWXLYKtl1UXJnKmaecX RE/0dwMGYiTvEZkvUpvhNIU/S7fPztEmyvDLLQ8BmuJuQs73BwcgG5NMhhycrRuOjXrS9lVGXF/lt XobrJoxkP9AwtIoTJFgEabM2yHamEe+NsRCGOnjhhhsiajxPDvOAYCXCtW844w1IhAiEvl48i1ODf 3x3Hsj6nMYDmbenOHN/fT+xSXnRwSG4VFTLVfmZRY14L7v891QqIuHDI8EjPTkYmznMWisgn5/YmW E8s0fk0Q==; Received: from hch by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nfFVm-00919W-JO; Fri, 15 Apr 2022 06:32:54 +0000 Date: Thu, 14 Apr 2022 23:32:54 -0700 From: Christoph Hellwig To: Song Liu Cc: bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, kernel-team@fb.com, akpm@linux-foundation.org, rick.p.edgecombe@intel.com, hch@infradead.org, imbrenda@linux.ibm.com, mcgrof@kernel.org Subject: Re: [PATCH v3 bpf RESEND 3/4] module: introduce module_alloc_huge Message-ID: References: <20220414195914.1648345-1-song@kernel.org> <20220414195914.1648345-4-song@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220414195914.1648345-4-song@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=vamvTJCH; dmarc=none; spf=none (imf13.hostedemail.com: domain of BATV+2d633663de0085320ac7+6809+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+2d633663de0085320ac7+6809+infradead.org+hch@bombadil.srs.infradead.org X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CC4E020009 X-Stat-Signature: x1rrtqtaifxuuqaxrwt4emdra8x4ah69 X-HE-Tag: 1650004376-53194 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 Thu, Apr 14, 2022 at 12:59:13PM -0700, Song Liu wrote: > Introduce module_alloc_huge, which allocates huge page backed memory in > module memory space. The primary user of this memory is bpf_prog_pack > (multiple BPF programs sharing a huge page). > > Signed-off-by: Song Liu > --- > arch/x86/kernel/module.c | 21 +++++++++++++++++++++ > include/linux/moduleloader.h | 5 +++++ > kernel/module.c | 5 +++++ > 3 files changed, 31 insertions(+) > > diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c > index b98ffcf4d250..63f6a16c70dc 100644 > --- a/arch/x86/kernel/module.c > +++ b/arch/x86/kernel/module.c > @@ -86,6 +86,27 @@ void *module_alloc(unsigned long size) > return p; > } > > +void *module_alloc_huge(unsigned long size) > +{ > + gfp_t gfp_mask = GFP_KERNEL; > + void *p; > + > + if (PAGE_ALIGN(size) > MODULES_LEN) > + return NULL; > + > + p = __vmalloc_node_range(size, MODULE_ALIGN, > + MODULES_VADDR + get_module_load_offset(), > + MODULES_END, gfp_mask, PAGE_KERNEL, > + VM_DEFER_KMEMLEAK | VM_ALLOW_HUGE_VMAP, > + NUMA_NO_NODE, __builtin_return_address(0)); > + if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) { > + vfree(p); > + return NULL; > + } > + > + return p; > +} > + > #ifdef CONFIG_X86_32 > int apply_relocate(Elf32_Shdr *sechdrs, > const char *strtab, > diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h > index 9e09d11ffe5b..d34743a88938 100644 > --- a/include/linux/moduleloader.h > +++ b/include/linux/moduleloader.h > @@ -26,6 +26,11 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section); > sections. Returns NULL on failure. */ > void *module_alloc(unsigned long size); > > +/* Allocator used for allocating memory in module memory space. If size is > + * greater than PMD_SIZE, allow using huge pages. Returns NULL on failure. > + */ > +void *module_alloc_huge(unsigned long size); > + > /* Free memory returned from module_alloc. */ > void module_memfree(void *module_region); > > diff --git a/kernel/module.c b/kernel/module.c > index 6cea788fd965..b2c6cb682a7d 100644 > --- a/kernel/module.c > +++ b/kernel/module.c > @@ -2839,6 +2839,11 @@ void * __weak module_alloc(unsigned long size) > NUMA_NO_NODE, __builtin_return_address(0)); > } > > +void * __weak module_alloc_huge(unsigned long size) > +{ > + return vmalloc_huge(size); > +} Umm. This should use the same parameters as module_alloc except for also passing the new huge page flag.