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 E7304CD13DA for ; Mon, 18 Sep 2023 16:09:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229595AbjIRQJ5 (ORCPT ); Mon, 18 Sep 2023 12:09:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbjIRQJM (ORCPT ); Mon, 18 Sep 2023 12:09:12 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58B2249D4 for ; Mon, 18 Sep 2023 09:07:50 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8318EC116AF; Mon, 18 Sep 2023 15:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1695052350; bh=PLDTlYRJOVAZO7bTU0w7rVenWETrtI+PeSS/3AvbpAw=; h=Date:To:From:Subject:From; b=lv1ggNArFFX0YPKKZE9zOL2U8rqid4GuB2lWypk8Nc879HlHMPuIv4QD6Eikx42I/ jDug9SjTqSVDXJnM243PgnOrUv1K3RaiZOeiIyfsWMWAG+wI8owXkzoiM2YtgAyQiw jjLVHHUbnEyuZkF0Pfsen3tFxGuuz1MkiXrCbXKE= Date: Mon, 18 Sep 2023 08:52:29 -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: + x86-ftrace-enable-dynamic-ftrace-without-config_modules.patch added to mm-unstable branch Message-Id: <20230918155230.8318EC116AF@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: x86/ftrace: enable dynamic ftrace without CONFIG_MODULES has been added to the -mm mm-unstable branch. Its filename is x86-ftrace-enable-dynamic-ftrace-without-config_modules.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/x86-ftrace-enable-dynamic-ftrace-without-config_modules.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: x86/ftrace: enable dynamic ftrace without CONFIG_MODULES Date: Mon, 18 Sep 2023 10:29:53 +0300 Dynamic ftrace must allocate memory for code and this was impossible without CONFIG_MODULES. With execmem separated from the modules code, execmem_text_alloc() is available regardless of CONFIG_MODULES. Remove dependency of dynamic ftrace on CONFIG_MODULES and make CONFIG_DYNAMIC_FTRACE select CONFIG_EXECMEM in Kconfig. Link: https://lkml.kernel.org/r/20230918072955.2507221-12-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/x86/Kconfig | 1 + arch/x86/kernel/ftrace.c | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) --- a/arch/x86/Kconfig~x86-ftrace-enable-dynamic-ftrace-without-config_modules +++ a/arch/x86/Kconfig @@ -35,6 +35,7 @@ config X86_64 select SWIOTLB select ARCH_HAS_ELFCORE_COMPAT select ZONE_DMA32 + select EXECMEM if DYNAMIC_FTRACE config FORCE_DYNAMIC_FTRACE def_bool y --- a/arch/x86/kernel/ftrace.c~x86-ftrace-enable-dynamic-ftrace-without-config_modules +++ a/arch/x86/kernel/ftrace.c @@ -261,8 +261,6 @@ void arch_ftrace_update_code(int command /* Currently only x86_64 supports dynamic trampolines */ #ifdef CONFIG_X86_64 -#ifdef CONFIG_MODULES -/* Module allocation simplifies allocating memory for code */ static inline void *alloc_tramp(unsigned long size) { return execmem_text_alloc(EXECMEM_FTRACE, size); @@ -271,14 +269,6 @@ static inline void tramp_free(void *tram { execmem_free(tramp); } -#else -/* Trampolines can only be created if modules are supported */ -static inline void *alloc_tramp(unsigned long size) -{ - return NULL; -} -static inline void tramp_free(void *tramp) { } -#endif /* Defined as markers to the end of the ftrace default trampolines */ extern void ftrace_regs_caller_end(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