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 19C98C4321E for ; Thu, 17 Nov 2022 20:23:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E5A16B007E; Thu, 17 Nov 2022 15:23:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B40F8E0001; Thu, 17 Nov 2022 15:23:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48DEF6B0081; Thu, 17 Nov 2022 15:23:45 -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 153A16B0080 for ; Thu, 17 Nov 2022 15:23:45 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DA133AB117 for ; Thu, 17 Nov 2022 20:23:44 +0000 (UTC) X-FDA: 80144059968.27.4190B4C Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf27.hostedemail.com (Postfix) with ESMTP id 5F24940011 for ; Thu, 17 Nov 2022 20:23:44 +0000 (UTC) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AHGgn2u013414 for ; Thu, 17 Nov 2022 12:23:43 -0800 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kwqbnamy1-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 17 Nov 2022 12:23:43 -0800 Received: from twshared13940.35.frc1.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 12:23:41 -0800 Received: by devbig932.frc1.facebook.com (Postfix, from userid 4523) id A3641FF17605; Thu, 17 Nov 2022 12:23:36 -0800 (PST) From: Song Liu To: , CC: , , , , , , , Song Liu Subject: [PATCH bpf-next v4 6/6] x86: use register_text_tail_vm Date: Thu, 17 Nov 2022 12:23:22 -0800 Message-ID: <20221117202322.944661-7-song@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221117202322.944661-1-song@kernel.org> References: <20221117202322.944661-1-song@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: RmI0l1ooUrMukgG8fLTffbmU_-bC9H8G X-Proofpoint-ORIG-GUID: RmI0l1ooUrMukgG8fLTffbmU_-bC9H8G 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-17_06,2022-11-17_01,2022-06-22_01 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668716624; 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=9EFJ58r9sBaqUXDYF0WOWP9QVaoJCj4kNjNSNp44LzQ=; b=XDme4XVdFJ8kMalAfVcULWDTxds1YcdKwdx91J826hPqcnZ3T210/pdXoRGgsjZY9EyBq2 yQdQP4D+pNmVsgzkbIZ/weZQpG84lkBFzoMt1TPXNGK+x1No6n/tPRNAYrvSFMIT9rmDmS 8VZaxbB2bmFq6zEN1g+DXkp7hG1GvfY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf27.hostedemail.com: domain of "prvs=232048c045=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=232048c045=songliubraving@meta.com" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668716624; a=rsa-sha256; cv=none; b=8B/uEf7brYJVO1uunpQY6Xy7cnEoKRgNV9kIvheMNDzsKYpxFaBpCJNWdlml1DGRbMZpwY 0MUsloecGg4K/ggIP52a5qmqli0uRZ68HMz8e5U9PSgwHlf/SY+Fv/VV6g+x8/NnJ4bLI7 R9yQah2pzNTeWjLu/6IcxzOkdFR1Wdg= X-Rspam-User: X-Stat-Signature: btgieszd8hxdryhnjecwo1zcpdx5r5j4 X-Rspamd-Queue-Id: 5F24940011 Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=kernel.org (policy=none); spf=pass (imf27.hostedemail.com: domain of "prvs=232048c045=songliubraving@meta.com" designates 67.231.145.42 as permitted sender) smtp.mailfrom="prvs=232048c045=songliubraving@meta.com" X-Rspamd-Server: rspam07 X-HE-Tag: 1668716624-619762 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. Also update Documentation/x86/x86_64/mm.rst to show execmem can be mapped to kernel text addresses. Signed-off-by: Song Liu --- Documentation/x86/x86_64/mm.rst | 4 ++-- arch/x86/include/asm/pgtable_64_types.h | 1 + arch/x86/mm/init_64.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/x86/x86_64/mm.rst b/Documentation/x86/x86_64/m= m.rst index 9798676bb0bf..6ee95e5fa7e9 100644 --- a/Documentation/x86/x86_64/mm.rst +++ b/Documentation/x86/x86_64/mm.rst @@ -62,7 +62,7 @@ Complete virtual memory map with 4-level page tables ffffff8000000000 | -512 GB | ffffffeeffffffff | 444 GB | ... unus= ed hole ffffffef00000000 | -68 GB | fffffffeffffffff | 64 GB | EFI regi= on mapping space ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | ... unus= ed hole - ffffffff80000000 | -2 GB | ffffffff9fffffff | 512 MB | kernel t= ext mapping, mapped to physical address 0 + ffffffff80000000 | -2 GB | ffffffff9fffffff | 512 MB | kernel t= ext mapping and execmem, mapped to physical address 0 ffffffff80000000 |-2048 MB | | | ffffffffa0000000 |-1536 MB | fffffffffeffffff | 1520 MB | module m= apping space ffffffffff000000 | -16 MB | | | @@ -121,7 +121,7 @@ Complete virtual memory map with 5-level page tables ffffff8000000000 | -512 GB | ffffffeeffffffff | 444 GB | ... unus= ed hole ffffffef00000000 | -68 GB | fffffffeffffffff | 64 GB | EFI regi= on mapping space ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | ... unus= ed hole - ffffffff80000000 | -2 GB | ffffffff9fffffff | 512 MB | kernel t= ext mapping, mapped to physical address 0 + ffffffff80000000 | -2 GB | ffffffff9fffffff | 512 MB | kernel t= ext mapping and execmem, mapped to physical address 0 ffffffff80000000 |-2048 MB | | | ffffffffa0000000 |-1536 MB | fffffffffeffffff | 1520 MB | module m= apping space ffffffffff000000 | -16 MB | | | 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