From patchwork Tue Mar 26 01:21:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13603226 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE0C5C54E58 for ; Tue, 26 Mar 2024 01:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4/wvdu34oavw5Djx04G3SNAt5fjGpA7W+3ejM2wE3nE=; b=AtLs0uOlJ6xl2b w0Y2ezYflIqBxDaQ7z9vLAJW0alVtRuVcB7dXV4gv07wE3x8HkR4RWxqsMnVWdioA0lafiMlvSElz Ub/unygFrUjRaQTDpG8SuswUMsE7yIThgQo5iKWMAxdDtLQwRxRVmZE88m5IqB64kvW9XEVCA/ehR aSjwv2amylWeR9IHmiNiwIAUun/rmgrgnMD/z9l0SwxQHY0OvGq0PjmEHNnfkFmal9Rdazx6jqddI +0sMfFiIV/IEr/DAkY0qnhP0+xLU6BXd0Y9lsv3LbIpx7c2H/6B+AwRttfRBrvPyOtk1+iUy/uxJR 1XXFvyAygGLR02CkQnjA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rovV7-00000002cYJ-1njT; Tue, 26 Mar 2024 01:21:17 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rovV4-00000002cWF-0UoO for linux-riscv@lists.infradead.org; Tue, 26 Mar 2024 01:21:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 4D448CE1E01; Tue, 26 Mar 2024 01:21:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 576DAC433F1; Tue, 26 Mar 2024 01:21:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711416071; bh=oxc669xa4HArX18pe0zMZ3KIpnQmQJWwkeqzhcN8JkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VByYMOgnCP2iCf/wIvMGIWEZ4efp6NKR1i70mSvBsSMDbQX/BMpoSESqMLQLC+dCu Lttm79WU10PxVme+2sNIuUct8OAHnNjEAq/eg6C6/CBSLhAUQ7VqshB/vdVJdVFyZF OEY1sqJOQRV0KQ8XA462AGjzqXZa+p2s3roU9VwZOZ2H34LHiH8vtbBQcJlrYkGmH8 M4PKUXsTcaYDQCwCZxPhMT3g9b1AqE8+XTLQ7t/omtIYeje7yu6EpzGpLzLd6CsvPY 9LHe4AWYk0vXwKlhIaKm6P2VK14F47fMOXH03DiGDrI5nS/8J/7Qk9FvsWH2K25zWo GPL8moZhjgeJg== From: Jarkko Sakkinen To: linux-riscv@lists.infradead.org Cc: Jarkko Sakkinen , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-kernel@vger.kernel.org, Luis Chamberlain , linux-modules@vger.kernel.org, "Naveen N . Rao" , Anil S Keshavamurthy , "David S . Miller" , Masami Hiramatsu Subject: [PATCH v6 2/2] arch/riscv: Enable kprobes when CONFIG_MODULES=n Date: Tue, 26 Mar 2024 03:21:02 +0200 Message-ID: <20240326012102.27438-2-jarkko@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240326012102.27438-1-jarkko@kernel.org> References: <20240326012102.27438-1-jarkko@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240325_182114_635927_56C2E7C9 X-CRM114-Status: GOOD ( 15.60 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Tacing with kprobes while running a monolithic kernel is currently impossible due the kernel module allocator dependency. Address the issue by implementing textmem API for RISC-V. Link: https://www.sochub.fi # for power on testing new SoC's with a minimal stack Link: https://lore.kernel.org/all/20220608000014.3054333-1-jarkko@profian.com/ # continuation Signed-off-by: Jarkko Sakkinen --- v4: - Include linux/execmem.h. v3: - Architecture independent parts have been split to separate patches. - Do not change arch/riscv/kernel/module.c as it is out of scope for this patch set now. v2: - Better late than never right? :-) - Focus only to RISC-V for now to make the patch more digestable. This is the arch where I use the patch on a daily basis to help with QA. - Introduce HAVE_KPROBES_ALLOC flag to help with more gradual migration. --- arch/riscv/Kconfig | 1 + arch/riscv/kernel/Makefile | 3 +++ arch/riscv/kernel/execmem.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 arch/riscv/kernel/execmem.c diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index e3142ce531a0..499512fb17ff 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -132,6 +132,7 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL + select HAVE_ALLOC_EXECMEM if !XIP_KERNEL # https://github.com/ClangBuiltLinux/linux/issues/1881 select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if !LD_IS_LLD select HAVE_MOVE_PMD diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 604d6bf7e476..337797f10d3e 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -73,6 +73,9 @@ obj-$(CONFIG_SMP) += cpu_ops.o obj-$(CONFIG_RISCV_BOOT_SPINWAIT) += cpu_ops_spinwait.o obj-$(CONFIG_MODULES) += module.o +ifeq ($(CONFIG_ALLOC_EXECMEM),y) +obj-y += execmem.o +endif obj-$(CONFIG_MODULE_SECTIONS) += module-sections.o obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o diff --git a/arch/riscv/kernel/execmem.c b/arch/riscv/kernel/execmem.c new file mode 100644 index 000000000000..3e52522ead32 --- /dev/null +++ b/arch/riscv/kernel/execmem.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include + +void *alloc_execmem(unsigned long size, gfp_t /* gfp */) +{ + return __vmalloc_node_range(size, 1, MODULES_VADDR, + MODULES_END, GFP_KERNEL, + PAGE_KERNEL, 0, NUMA_NO_NODE, + __builtin_return_address(0)); +} + +void free_execmem(void *region) +{ + if (in_interrupt()) + pr_warn("In interrupt context: vmalloc may not work.\n"); + + vfree(region); +}