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 2F9BFC4167D for ; Mon, 28 Nov 2022 19:03:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D44B6B007B; Mon, 28 Nov 2022 14:03:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C1336B007E; Mon, 28 Nov 2022 14:03:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22ECE6B007D; Mon, 28 Nov 2022 14:03:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0F95C6B0078 for ; Mon, 28 Nov 2022 14:03:17 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CD4F2160E31 for ; Mon, 28 Nov 2022 19:03:16 +0000 (UTC) X-FDA: 80183773992.23.2E1418E Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf11.hostedemail.com (Postfix) with ESMTP id 26AE640014 for ; Mon, 28 Nov 2022 19:03:15 +0000 (UTC) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2ASI0kpJ000379 for ; Mon, 28 Nov 2022 11:03:14 -0800 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m4xqaahsx-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 28 Nov 2022 11:03:13 -0800 Received: from twshared16963.27.frc3.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 28 Nov 2022 11:03:09 -0800 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id 6133E109803A8; Mon, 28 Nov 2022 11:03:03 -0800 (PST) From: Song Liu To: , CC: , , , , , , , Song Liu Subject: [PATCH bpf-next v5 5/6] vmalloc: introduce register_text_tail_vm() Date: Mon, 28 Nov 2022 11:02:44 -0800 Message-ID: <20221128190245.2337461-6-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128190245.2337461-1-song@kernel.org> References: <20221128190245.2337461-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: P96_9QsbjjUrUieNuJ0g7x8IqMKkciZP X-Proofpoint-GUID: P96_9QsbjjUrUieNuJ0g7x8IqMKkciZP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-28_17,2022-11-28_02,2022-06-22_01 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669662196; a=rsa-sha256; cv=none; b=RoKvnNLiQRqUUFoEyodmLTX8SC2Sfn3/Z0DuKvW7t27v11oGzYPGWrJLTJI0PW1CNm/C/C cG9mgkGQJN55KvXBUoF4NPNUZvjKh1I+KKThc07BMHyOhz1yDClGiuqwT8pRv0tVBD3vkE p9SiTxMWTIBqkNScGqSkl0xMLO4yZ5o= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf11.hostedemail.com: domain of "prvs=3331966363=songliubraving@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3331966363=songliubraving@meta.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669662196; 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=z5eqtNpCOCsi5rGS7HBoIcfI97iruXoD4KnM+JKZjeE=; b=F45jYBcgvguDrBG/qiW8BwBGS59ugWvh0wBpohrqCfntvzj3Cb8it4mjtFMH4Qu6f2aM0o yY5Cp2D1zpaGFx3ZREx3Uzno4FOPG7+2Dfvb6RVkxgzad8zZDLKMtTHaM3OcNpsYLM6qR4 TVq4J7oLml4yqfVhqFOWIYSBfgUejns= X-Rspamd-Queue-Id: 26AE640014 Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf11.hostedemail.com: domain of "prvs=3331966363=songliubraving@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3331966363=songliubraving@meta.com" X-Rspamd-Server: rspam12 X-Rspam-User: X-Stat-Signature: j5acdupug8thdej79hr717rsgj34qnse X-HE-Tag: 1669662195-700424 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: Allow arch code to register some memory to be used by execmem_alloc(). One possible use case is to allocate PMD pages for kernl text up to PMD_ALIGN(_etext), and use (_etext, PMD_ALIGN(_etext)) for execmem_alloc. Currently, only one such region is supported. Signed-off-by: Song Liu --- include/linux/vmalloc.h | 4 ++++ mm/vmalloc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 30aa8c187d40..2babbe3031a5 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -132,11 +132,15 @@ extern void vm_unmap_aliases(void); #ifdef CONFIG_MMU extern void __init vmalloc_init(void); extern unsigned long vmalloc_nr_pages(void); +void register_text_tail_vm(unsigned long start, unsigned long end); #else static inline void vmalloc_init(void) { } static inline unsigned long vmalloc_nr_pages(void) { return 0; } +void register_text_tail_vm(unsigned long start, unsigned long end) +{ +} #endif =20 extern void *vmalloc(unsigned long size) __alloc_size(1); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 95ee8282b66c..fe5c8e5a5ec7 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -77,6 +77,9 @@ static const bool vmap_allow_huge =3D false; #endif #define PMD_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PMD_SIZE) =20 +static struct vm_struct text_tail_vm; +static struct vmap_area text_tail_va; + bool is_vmalloc_addr(const void *x) { unsigned long addr =3D (unsigned long)kasan_reset_tag(x); @@ -655,6 +658,8 @@ int is_vmalloc_or_module_addr(const void *x) unsigned long addr =3D (unsigned long)kasan_reset_tag(x); if (addr >=3D MODULES_VADDR && addr < MODULES_END) return 1; + if (addr >=3D text_tail_va.va_start && addr < text_tail_va.va_end) + return 1; #endif return is_vmalloc_addr(x); } @@ -2439,6 +2444,35 @@ static void vmap_init_free_space(void) } } =20 +/* + * register_text_tail_vm() allows arch code to register memory regions + * for execmem_alloc. Unlike regular memory regions used by execmem_allo= c, + * this region is never freed by vfree_exec. + * + * One possible use case is to allocate PMD pages for kernl text up to + * PMD_ALIGN(_etext), and use (_etext, PMD_ALIGN(_etext)) for + * execmem_alloc. + */ +void register_text_tail_vm(unsigned long start, unsigned long end) +{ + struct vmap_area *va; + + /* only support one region */ + if (WARN_ON_ONCE(text_tail_vm.addr)) + return; + + va =3D kmem_cache_zalloc(vmap_area_cachep, GFP_NOWAIT); + if (WARN_ON_ONCE(!va)) + return; + text_tail_vm.addr =3D (void *)start; + text_tail_vm.size =3D end - start; + text_tail_va.va_start =3D start; + text_tail_va.va_end =3D end; + text_tail_va.vm =3D &text_tail_vm; + memcpy(va, &text_tail_va, sizeof(*va)); + insert_vmap_area_augment(va, NULL, &free_text_area_root, &free_text_are= a_list); +} + void __init vmalloc_init(void) { struct vmap_area *va; --=20 2.30.2