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 046CEECAAA1 for ; Mon, 31 Oct 2022 22:09:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BDDA6B0072; Mon, 31 Oct 2022 18:09:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96DF66B0073; Mon, 31 Oct 2022 18:09:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8846C6B0074; Mon, 31 Oct 2022 18:09:44 -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 7730E6B0072 for ; Mon, 31 Oct 2022 18:09:44 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4BD35401D2 for ; Mon, 31 Oct 2022 22:09:44 +0000 (UTC) X-FDA: 80082637488.10.5020A9B Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf23.hostedemail.com (Postfix) with ESMTP id EB709140008 for ; Mon, 31 Oct 2022 22:09:42 +0000 (UTC) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29VLsoIX032204 for ; Mon, 31 Oct 2022 15:09:42 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kjfyrmn40-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 31 Oct 2022 15:09:42 -0700 Received: from twshared13940.35.frc1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) 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:09:41 -0700 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id A5224F0C88A0; Mon, 31 Oct 2022 14:58:42 -0700 (PDT) From: Song Liu To: , CC: , , , , , , , , , Song Liu Subject: [PATCH bpf-next v1 5/5] x86: use register_text_tail_vm Date: Mon, 31 Oct 2022 14:58:34 -0700 Message-ID: <20221031215834.1615596-6-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221031215834.1615596-1-song@kernel.org> References: <20221031215834.1615596-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: 5Iil3PyR-zKUNwVjFyjcCzdqrsHmcA31 X-Proofpoint-GUID: 5Iil3PyR-zKUNwVjFyjcCzdqrsHmcA31 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667254183; a=rsa-sha256; cv=none; b=IQQz6yvfXVGugbV3xhumIXjFHjweVMrH1IElO3YDML6LvAldIAINwjoBQNx2pev2C2Tdni BWbMk/JukMmO/uraTqTvtY7wz2nnIBgfC7dKHHh7fNhGYtSK18rbLYVOnWRHaDWpZ8rVFF 03aYJlirNu/f4L3VKwdHNpttnVIc9N4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf23.hostedemail.com: domain of "prvs=2303bf8861=songliubraving@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=2303bf8861=songliubraving@meta.com" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667254183; 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=omE+zG+vjYJGN4/mSCchK3i4EgV63TFghVHMLql9mng=; b=6r6gL31azquGGJRbrLiApfCWHRaaiZ30eTJgtT7lOOZT32HR/RZsJr89kIZNUdMbizK5WJ rXZFse/rsJ5wADDA/zAYB4e8qetjY7P9ii3msvaF948/5+Ct8spVsXeTy8WTsXBO+kuqQ7 NowjcpRDRMBa/1sIyZecGKwLJbrtLsU= X-Rspam-User: Authentication-Results: imf23.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf23.hostedemail.com: domain of "prvs=2303bf8861=songliubraving@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=2303bf8861=songliubraving@meta.com" X-Stat-Signature: ipx8ncurd6eckja68z5br8wzusrgug11 X-Rspamd-Queue-Id: EB709140008 X-Rspamd-Server: rspam06 X-HE-Tag: 1667254182-717742 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: Allocate 2MB pages up to round_up(_etext, 2MB), and register memory [round_up(_etext, 4kb), round_up(_etext, 2MB)] with register_text_tail_vm so that we can use this part of memory for dynamic kernel text (BPF programs, etc.). Here is an example: [root@eth50-1 ~]# grep _etext /proc/kallsyms ffffffff82202a08 T _etext [root@eth50-1 ~]# grep bpf_prog_ /proc/kallsyms | tail -n 3 ffffffff8220f920 t bpf_prog_cc61a5364ac11d93_handle__sched_wakeup [= bpf] ffffffff8220fa28 t bpf_prog_cc61a5364ac11d93_handle__sched_wakeup_new [= bpf] ffffffff8220fad4 t bpf_prog_3bf73fa16f5e3d92_handle__sched_switch [= bpf] [root@eth50-1 ~]# grep 0xffffffff82200000 /sys/kernel/debug/page_tables/= kernel 0xffffffff82200000-0xffffffff82400000 2M ro PSE x pmd ffffffff82200000-ffffffff82400000 is a 2MB page, serving kernel text, and bpf programs. Signed-off-by: Song Liu --- arch/x86/include/asm/pgtable_64_types.h | 1 + arch/x86/mm/init_64.c | 4 +++- include/linux/vmalloc.h | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/a= sm/pgtable_64_types.h index 04f36063ad54..c0f9cceb109a 100644 --- a/arch/x86/include/asm/pgtable_64_types.h +++ b/arch/x86/include/asm/pgtable_64_types.h @@ -101,6 +101,7 @@ extern unsigned int ptrs_per_p4d; #define PUD_MASK (~(PUD_SIZE - 1)) #define PGDIR_SIZE (_AC(1, UL) << PGDIR_SHIFT) #define PGDIR_MASK (~(PGDIR_SIZE - 1)) +#define PMD_ALIGN(x) (((unsigned long)(x) + (PMD_SIZE - 1)) & PMD_MASK) =20 /* * See Documentation/x86/x86_64/mm.rst for a description of the memory m= ap. diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 3f040c6e5d13..5b42fc0c6099 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -1373,7 +1373,7 @@ void mark_rodata_ro(void) unsigned long start =3D PFN_ALIGN(_text); unsigned long rodata_start =3D PFN_ALIGN(__start_rodata); unsigned long end =3D (unsigned long)__end_rodata_hpage_align; - unsigned long text_end =3D PFN_ALIGN(_etext); + unsigned long text_end =3D PMD_ALIGN(_etext); unsigned long rodata_end =3D PFN_ALIGN(__end_rodata); unsigned long all_end; =20 @@ -1414,6 +1414,8 @@ void mark_rodata_ro(void) (void *)rodata_end, (void *)_sdata); =20 debug_checkwx(); + register_text_tail_vm(PFN_ALIGN((unsigned long)_etext), + PMD_ALIGN((unsigned long)_etext)); } =20 int kern_addr_valid(unsigned long addr) diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 9b2042313c12..7365cf9c4e7f 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); --=20 2.30.2