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 D1540ECAAA1 for ; Mon, 31 Oct 2022 22:26:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CEB26B007E; Mon, 31 Oct 2022 18:26:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 852B46B0080; Mon, 31 Oct 2022 18:26:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A9536B0082; Mon, 31 Oct 2022 18:26:10 -0400 (EDT) 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 3A94B6B007E for ; Mon, 31 Oct 2022 18:26:10 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 06E36A0EC7 for ; Mon, 31 Oct 2022 22:26:10 +0000 (UTC) X-FDA: 80082678900.28.1708D35 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf08.hostedemail.com (Postfix) with ESMTP id 9DE3116000E for ; Mon, 31 Oct 2022 22:26:09 +0000 (UTC) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29VMPHJv031006 for ; Mon, 31 Oct 2022 15:26:08 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kjn3f90xs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 31 Oct 2022 15:26:08 -0700 Received: from twshared24004.14.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 15:26:01 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id 7C938F0CC5C9; Mon, 31 Oct 2022 15:25:55 -0700 (PDT) From: Song Liu To: , CC: , , , , , , , Song Liu Subject: [PATCH bpf-next v1 RESEND 4/5] vmalloc: introduce register_text_tail_vm() Date: Mon, 31 Oct 2022 15:25:40 -0700 Message-ID: <20221031222541.1773452-5-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031222541.1773452-1-song@kernel.org> References: <20221031222541.1773452-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: KDj7rs6dEnLwXb2wihDTLonXN-LuAF1N X-Proofpoint-GUID: KDj7rs6dEnLwXb2wihDTLonXN-LuAF1N X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-31_21,2022-10-31_01,2022-06-22_01 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667255169; 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=PaKyuC6mjPRP1zrPDDfsZ1Cn6aHkp+I6H48WoQst8bw=; b=Y+2O9bJ3FhGzNBL2rwcrBkXBpA9CDyT46WF0VR2q726QnWxgRzx8XwjZDAzkRXV06XCuXI 2/eDfMVr6IB848+MPN2/oV6sbqwTQRnbBjgWwtODRHEUynIYHtRTeRgsuNjMbanOf2tTY9 KyNTlICLLoV+FqRzqyDQWdXBpnaporM= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of "prvs=2303bf8861=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=2303bf8861=songliubraving@meta.com"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667255169; a=rsa-sha256; cv=none; b=6+76erwIfAjea+YD4pNYskULsdamY6e46NRy6YadpmEBTqGNyH5P/HUFrGrJFXsbfnDeT/ uM+CzN5hepFETa6QiLSX5IsyinuqWlmelyaCnVufMf6XofaPlWh93SalRdUcfZGUUuBI6J dPH7s3tY/7bcOasDw8JqrbxHe/8r1s8= X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9DE3116000E Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of "prvs=2303bf8861=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=2303bf8861=songliubraving@meta.com"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none) X-Stat-Signature: it5gqswsauj6jnkqi4i951n4qf6up1b4 X-HE-Tag: 1667255169-810146 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 vmalloc_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 vmalloc_exec. Currently, only one such region is supported. Signed-off-by: Song Liu --- mm/vmalloc.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 6f4c73e67191..46f2b7e56670 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -75,6 +75,9 @@ static const bool vmap_allow_huge =3D false; #define PMD_ALIGN(addr) ALIGN(addr, PMD_SIZE) #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); @@ -653,6 +656,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); } @@ -2437,6 +2442,34 @@ static void vmap_init_free_space(void) } } =20 +/* + * register_text_tail_vm() allows arch code to register memory regions + * for vmalloc_exec. Unlike regular memory regions used by vmalloc_exec, + * 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 vmalloc_ex= ec. + */ +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