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 E6D8CC83F03 for ; Fri, 4 Jul 2025 13:50:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 790036B804F; Fri, 4 Jul 2025 09:50:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 739B46B803F; Fri, 4 Jul 2025 09:50:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 628366B804F; Fri, 4 Jul 2025 09:50:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BDC196B803F for ; Fri, 4 Jul 2025 09:50:33 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 87DD51A02AE for ; Fri, 4 Jul 2025 13:50:33 +0000 (UTC) X-FDA: 83626717146.06.D2DCCDC Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf24.hostedemail.com (Postfix) with ESMTP id E033D180008 for ; Fri, 4 Jul 2025 13:50:31 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OHM1CWKR; spf=pass (imf24.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751637031; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pd5IsJ67DXP7vv77f0BUKAQ+oBrzCS1zYbV4tHdL1j0=; b=SU0LatCTxObiwj4M3AibWZE4RsG2rwjVI+TaJrkqQpd9Wfpxq/cpIJidsp3rZa/84GaA8h HTAUnMoZuw5RRMlfGqfzV9bxHaMVBv8mTq+mla83uolveatIhNUOnyrr4phkQLPOjaSgVL 6s2HGADmMQfjbvoRbaQMmLOjqngCdQo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=OHM1CWKR; spf=pass (imf24.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751637031; a=rsa-sha256; cv=none; b=FnczmCz72mYQZDxCQlZ6doysefy71RX84MYJThBK+nBx23uDYsxR+DzbTvxwBF92Y2G+PG JzFuQIri0aS0sv7N7+eoPC6GBuzuXbhLVSjFkWP33a/1yU35gjvc0BtrZNW6+sLPn8jMbm RSOw7VYHwTSaqmoYTG6V5McEmoCbW0g= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 54DB2A53C5C; Fri, 4 Jul 2025 13:50:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF94DC4CEE3; Fri, 4 Jul 2025 13:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751637030; bh=SO2FNTrKQArpvSkS2JHAbwQoeech8iUoJBHVmLqUzb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHM1CWKRIwGWZdUruYiyIKa0OUcRBfg3/yYHwoPDkppKqzNudoUVAbFLF/tRhKr0S CaHDLw94VcjhEZXPkjkaNKBhLod6IRa8FAO3dyQmsIOXgqwY/Xt4jRLLQCtY3PiGvT +stoNpdu2LMmJ485ccLCwoaFcWU2EFmdafhIThmRHqPi85Uo98iaE3bgWRw/rW/Kt4 ETSjNnyi+t6NIn+uKzrK0QblgxieZnPffy+mg6WdJwc4Kbd5ayK0nhOVyZ79vPgxdt nZUQT9Gf/EDIu5E88uuIkxvOULPIUuYGOf0TCxcYW3e9DEO2I//MjRqMtLQQ9iV3E+ M/sEU5hEqCVqQ== From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Borislav Petkov , Daniel Gomez , Dave Hansen , Ingo Molnar , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Mike Rapoport , "H. Peter Anvin" , Peter Zijlstra , Petr Pavlu , Sami Tolvanen , Steven Rostedt , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH 7/8] x86/kprobes: enable EXECMEM_ROX_CACHE for kprobes allocations Date: Fri, 4 Jul 2025 16:49:42 +0300 Message-ID: <20250704134943.3524829-8-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250704134943.3524829-1-rppt@kernel.org> References: <20250704134943.3524829-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: E033D180008 X-Rspamd-Server: rspam09 X-Stat-Signature: 9zmoay7ztbpfhthfhqt643bpra8zatg4 X-HE-Tag: 1751637031-987452 X-HE-Meta: U2FsdGVkX1+E+ou+iA8jRScmGwp0YQVBspUQhzEnM1n4U80wDACW4LSHgyzV5D1fLkKi192Vjm+vhilOZZ+TaMeEuC6JwI4GFV8P2Ncq5LzpZswPxrg9si6GHcnErin5Vw5cjsBr4ghe2S4xtUO4+dtZX1Mq3g4shGtOi3Ayl8yyRz7xEoG5aHuiDEUFsJQFNa1PepHvKaFqpM1xBb02FEsKsnkb17NGUFEsDCdZOT/3wmm/EciswyvlnLsjwVp6xVlIyWpt8XHwRF1YOSb8x2Ah7f3VHsZW8UXD5a7uuBH29cxt0fN2/VZaOP9RqU1QI4kFv+pz3eM3+vuBB1FsZmnr0y4u2Uyri5gMdUtgq+hS6PvvOsQRz89UU0MyLvOg230GaonV+/4h8oqyz/OvqnyyyZWDtuGCZpenej1DHcJg4xYvCuyyV0QZdB8Ln74TZpnYiT5UAwHjOR8VTo50bk/ZlxtPdlKcF2Iwl20SyjJBoz8KNRAx9rVqOUBlijS1kdtkQ9DXntNkfqQ8dMNhlMrZ1VMiYy1Hd5+eAmRtOqfTpQ8L+gK3Iv0nhKOqhRWmeoDHYA6b1PH/XO17f9F1riM+ZQZKdHlcI6jpLipfiqbe/dfaZOVfXFHtgZ4AlUjqMEF5TSOPewGoCX51uV63qcnmJxFlNuYxgNMFM1ruo20BqWoo5jDYTg0cYMQhFnLbCUFrHnDVCVlNik3X5o/WFPdoIsrzVyfVigU+RgcQKbOMBWXJ3NrJHNmRLz36nlZY/l2SRhB6TSCXn7nzMfpw4C4zdjPB2DTcNk4QVNuzy0Ti1eZKwOA6di2QDdiCIK6M0bcgyOqMnhrvUpxTbg9+A/GH65XFTU5hjR9dFCLhDBY4CY304susV1ecbkeJr5LweDoKyOpt+Nkl6b++hqKUCYG/6vHq7nTUl8BpK67tdgT7z2FSkF9GHwnsow9h5VQN3FjUbOrJNqKIxVWL9wV IGau0Vmw IqI+lX7a0MVW42qTln6jsJ1axcqPUxsjs0cyQgh+eAgcJZoMle/wZNPaLrEXy+CYoJUudhWsDv2B3ZWqAB2NA6adRunAgVWZwnFJQMq6JT4vUk0Vgm9s6FkNYOQG/Aa+eLuS5Idor0AayJXr69haPKMgqEeWlAnQFyG04ZpECLRiagGF83JbJaUMvUE2WyEJjZHzKtPj5og7ue4MYFreFFWaGIzBEwnReNmEX5ixP0SOmXFeoAZwryRrzuAka6Rs32q8c8ntF64FWdmGBK7NYpBwM+g== 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: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" x86::alloc_insn_page() always allocates ROX memory. Instead of overriding this method, add EXECMEM_KPROBES entry in execmem_info with pgprot set to PAGE_KERNEL_ROX and use ROX cache when configuration and CPU features allow it. Signed-off-by: Mike Rapoport (Microsoft) --- arch/x86/kernel/kprobes/core.c | 18 ------------------ arch/x86/mm/init.c | 9 ++++++++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 47cb8eb138ba..6079d15dab8c 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -481,24 +481,6 @@ static int prepare_singlestep(kprobe_opcode_t *buf, struct kprobe *p, return len; } -/* Make page to RO mode when allocate it */ -void *alloc_insn_page(void) -{ - void *page; - - page = execmem_alloc(EXECMEM_KPROBES, PAGE_SIZE); - if (!page) - return NULL; - - /* - * TODO: Once additional kernel code protection mechanisms are set, ensure - * that the page was not maliciously altered and it is still zeroed. - */ - set_memory_rox((unsigned long)page, 1); - - return page; -} - /* Kprobe x86 instruction emulation - only regs->ip or IF flag modifiers */ static void kprobe_emulate_ifmodifiers(struct kprobe *p, struct pt_regs *regs) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index dbc63f0d538f..442fafd8ff52 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1098,7 +1098,14 @@ struct execmem_info __init *execmem_arch_setup(void) .pgprot = pgprot, .alignment = MODULE_ALIGN, }, - [EXECMEM_KPROBES ... EXECMEM_BPF] = { + [EXECMEM_KPROBES] = { + .flags = flags, + .start = start, + .end = MODULES_END, + .pgprot = PAGE_KERNEL_ROX, + .alignment = MODULE_ALIGN, + }, + [EXECMEM_FTRACE ... EXECMEM_BPF] = { .flags = EXECMEM_KASAN_SHADOW, .start = start, .end = MODULES_END, -- 2.47.2