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 4C56FC4332F for ; Mon, 7 Nov 2022 22:42:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD6736B0071; Mon, 7 Nov 2022 17:42:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D86296B0073; Mon, 7 Nov 2022 17:42:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C76176B0074; Mon, 7 Nov 2022 17:42:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id B82396B0071 for ; Mon, 7 Nov 2022 17:42:32 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 951371A0177 for ; Mon, 7 Nov 2022 22:42:32 +0000 (UTC) X-FDA: 80108121744.28.A1054E9 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf02.hostedemail.com (Postfix) with ESMTP id 2EB2880009 for ; Mon, 7 Nov 2022 22:42:31 +0000 (UTC) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A7LKpC9010043 for ; Mon, 7 Nov 2022 14:42:31 -0800 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3knq54u3n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 07 Nov 2022 14:42:31 -0800 Received: from twshared13940.35.frc1.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 7 Nov 2022 14:42:30 -0800 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id B57EFF6B3711; Mon, 7 Nov 2022 14:39:33 -0800 (PST) From: Song Liu To: , CC: , , , , , , , , Song Liu Subject: [PATCH bpf-next v2 5/5] x86: use register_text_tail_vm Date: Mon, 7 Nov 2022 14:39:21 -0800 Message-ID: <20221107223921.3451913-6-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107223921.3451913-1-song@kernel.org> References: <20221107223921.3451913-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: -gTz1Z0sTlSWJ3IgPaidOm8r0keFcAKA X-Proofpoint-GUID: -gTz1Z0sTlSWJ3IgPaidOm8r0keFcAKA 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-07_11,2022-11-07_02,2022-06-22_01 ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf02.hostedemail.com: domain of "prvs=2310266901=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=2310266901=songliubraving@meta.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667860952; a=rsa-sha256; cv=none; b=LehkugxCZ3RhYGFnYRcri3Ost27jRCRFiljnFzKtoPl10ZubdEnScE6bstHC7OlAr93aWw QClZWtRQECm+uwf7Q3bDzoLCXwNYUO1goY3zSSXvWj8TI5+Y1WZAp2Xf3DlopsUr2cr42z vaVqYQxhnZb+em2lTRW4rQCo6+1P9IE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667860952; 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=cJnZo9s8Apkhzx50SGLfQrMWl6ZEmnOKtjycuCLafF8=; b=YLzCmtJhVEL4z0DWWCqYtGt8hKUpljTWxnPnh8VQgo5Ztl41CJOgtjTQi3mjpA3XxONnxx /URBPwwYwy11mI3VVyhcdkXdz4k2T+FzqJ3uOl/fe7MPSlUY8MuqsOcVakbTBStirxEEcz 4d7ubvcs4nV/KnW1og09k2pKh77BncU= X-Rspam-User: Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf02.hostedemail.com: domain of "prvs=2310266901=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=2310266901=songliubraving@meta.com" X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2EB2880009 X-Stat-Signature: snxf63931jkhdju31xfsqkzqo89resc5 X-HE-Tag: 1667860951-82903 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 +++- 2 files changed, 4 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) --=20 2.30.2