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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11A8ACD37B0 for ; Mon, 18 Sep 2023 16:09:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230125AbjIRQJY (ORCPT ); Mon, 18 Sep 2023 12:09:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbjIRQJH (ORCPT ); Mon, 18 Sep 2023 12:09:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68D1D46A3 for ; Mon, 18 Sep 2023 09:07:32 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A098C116AB; Mon, 18 Sep 2023 15:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1695052334; bh=D9ktlfMKZPOhdTMkzc8mSs+sO5qVbVnMbkov+JH7Brk=; h=Date:To:From:Subject:From; b=vxN381JSpS8CqZVHmVfE8EoI3QQw23+mdkMWOKA+qhjtRDgwSvvNI5ctceN/jNRGn 0DtpDsjIMd6lmmNOJi2d5Ne0F/0MBB7eVG4oMg00XZJVw3qGD1vMARqHuECOOv9Brk 91bWj5iKOcaI2Js1gGYQcMUGFXNBnzlLu/c84b2M= Date: Mon, 18 Sep 2023 08:52:13 -0700 To: mm-commits@vger.kernel.org, will@kernel.org, tsbogend@alpha.franken.de, tglx@linutronix.de, song@kernel.org, rostedt@goodmis.org, rick.p.edgecombe@intel.com, puranjay12@gmail.com, palmer@dabbelt.com, naveen.n.rao@linux.ibm.com, nadav.amit@gmail.com, mpe@ellerman.id.au, mcgrof@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, kent.overstreet@linux.dev, hca@linux.ibm.com, dinguyen@kernel.org, deller@gmx.de, davem@davemloft.net, christophe.leroy@csgroup.eu, chenhuacai@kernel.org, catalin.marinas@arm.com, bjorn@kernel.org, rppt@kernel.org, akpm@linux-foundation.org From: Andrew Morton Subject: + arm64-execmem-extend-execmem_params-for-generated-code-allocations.patch added to mm-unstable branch Message-Id: <20230918155214.3A098C116AB@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: arm64, execmem: extend execmem_params for generated code allocations has been added to the -mm mm-unstable branch. Its filename is arm64-execmem-extend-execmem_params-for-generated-code-allocations.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/arm64-execmem-extend-execmem_params-for-generated-code-allocations.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: "Mike Rapoport (IBM)" Subject: arm64, execmem: extend execmem_params for generated code allocations Date: Mon, 18 Sep 2023 10:29:49 +0300 The memory allocations for kprobes and BPF on arm64 can be placed anywhere in vmalloc address space and currently this is implemented with overrides of alloc_insn_page() and bpf_jit_alloc_exec() in arm64. Define EXECMEM_KPROBES and EXECMEM_BPF ranges in arm64::execmem_params and drop overrides of alloc_insn_page() and bpf_jit_alloc_exec(). Link: https://lkml.kernel.org/r/20230918072955.2507221-8-rppt@kernel.org Signed-off-by: Mike Rapoport (IBM) Cc: Björn Töpel Cc: Catalin Marinas Cc: Christophe Leroy Cc: David S. Miller Cc: Dinh Nguyen Cc: Heiko Carstens Cc: Helge Deller Cc: Huacai Chen Cc: Kent Overstreet Cc: Luis Chamberlain Cc: Mark Rutland Cc: Michael Ellerman Cc: Nadav Amit Cc: "Naveen N. Rao" Cc: Palmer Dabbelt Cc: Puranjay Mohan Cc: Rick Edgecombe Cc: Russell King (Oracle) Cc: Song Liu Cc: Steven Rostedt (Google) Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Cc: Will Deacon Signed-off-by: Andrew Morton --- arch/arm64/kernel/module.c | 13 +++++++++++++ arch/arm64/kernel/probes/kprobes.c | 7 ------- arch/arm64/net/bpf_jit_comp.c | 11 ----------- 3 files changed, 13 insertions(+), 18 deletions(-) --- a/arch/arm64/kernel/module.c~arm64-execmem-extend-execmem_params-for-generated-code-allocations +++ a/arch/arm64/kernel/module.c @@ -116,6 +116,16 @@ static struct execmem_params execmem_par .flags = EXECMEM_KASAN_SHADOW, .alignment = MODULE_ALIGN, }, + [EXECMEM_KPROBES] = { + .start = VMALLOC_START, + .end = VMALLOC_END, + .alignment = 1, + }, + [EXECMEM_BPF] = { + .start = VMALLOC_START, + .end = VMALLOC_END, + .alignment = 1, + }, }, }; @@ -140,6 +150,9 @@ struct execmem_params __init *execmem_ar r->end = module_plt_base + SZ_2G; } + execmem_params.ranges[EXECMEM_KPROBES].pgprot = PAGE_KERNEL_ROX; + execmem_params.ranges[EXECMEM_BPF].pgprot = PAGE_KERNEL; + return &execmem_params; } --- a/arch/arm64/kernel/probes/kprobes.c~arm64-execmem-extend-execmem_params-for-generated-code-allocations +++ a/arch/arm64/kernel/probes/kprobes.c @@ -129,13 +129,6 @@ int __kprobes arch_prepare_kprobe(struct return 0; } -void *alloc_insn_page(void) -{ - return __vmalloc_node_range(PAGE_SIZE, 1, VMALLOC_START, VMALLOC_END, - GFP_KERNEL, PAGE_KERNEL_ROX, VM_FLUSH_RESET_PERMS, - NUMA_NO_NODE, __builtin_return_address(0)); -} - /* arm kprobe: install breakpoint in text */ void __kprobes arch_arm_kprobe(struct kprobe *p) { --- a/arch/arm64/net/bpf_jit_comp.c~arm64-execmem-extend-execmem_params-for-generated-code-allocations +++ a/arch/arm64/net/bpf_jit_comp.c @@ -1687,17 +1687,6 @@ u64 bpf_jit_alloc_exec_limit(void) return VMALLOC_END - VMALLOC_START; } -void *bpf_jit_alloc_exec(unsigned long size) -{ - /* Memory is intended to be executable, reset the pointer tag. */ - return kasan_reset_tag(vmalloc(size)); -} - -void bpf_jit_free_exec(void *addr) -{ - return vfree(addr); -} - /* Indicate the JIT backend supports mixing bpf2bpf and tailcalls. */ bool bpf_jit_supports_subprog_tailcalls(void) { _ Patches currently in -mm which might be from rppt@kernel.org are nios2-define-virtual-address-space-for-modules.patch mm-introduce-execmem_text_alloc-and-execmem_free.patch mm-execmem-arch-convert-simple-overrides-of-module_alloc-to-execmem.patch mm-execmem-arch-convert-remaining-overrides-of-module_alloc-to-execmem.patch modules-execmem-drop-module_alloc.patch mm-execmem-introduce-execmem_data_alloc.patch arm64-execmem-extend-execmem_params-for-generated-code-allocations.patch riscv-extend-execmem_params-for-generated-code-allocations.patch powerpc-extend-execmem_params-for-kprobes-allocations.patch arch-make-execmem-setup-available-regardless-of-config_modules.patch x86-ftrace-enable-dynamic-ftrace-without-config_modules.patch kprobes-remove-dependency-on-config_modules.patch bpf-remove-config_bpf_jit-dependency-on-config_modules-of.patch