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 1F38CC83F09 for ; Wed, 9 Jul 2025 13:50:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B72536B0120; Wed, 9 Jul 2025 09:50:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B49EE6B0123; Wed, 9 Jul 2025 09:50:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A86F76B0124; Wed, 9 Jul 2025 09:50:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 979546B0120 for ; Wed, 9 Jul 2025 09:50:28 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4F749578B5 for ; Wed, 9 Jul 2025 13:50:28 +0000 (UTC) X-FDA: 83644860936.28.C534087 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf13.hostedemail.com (Postfix) with ESMTP id 6DD7120015 for ; Wed, 9 Jul 2025 13:50:26 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Uqq9DIDz; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752069026; a=rsa-sha256; cv=none; b=79Zfg6kkFVbG8foJy+ZopZcHhbk/6YZYdflEp7SOo86flBfi7J+ueFl/pUUI5EZ/tlkqfJ 8nglkz3ZGJNSNlouj0tNwp9+mFj45t6mwzqtNfuir4rnYa5xTHn8daTVh/IkaPgjkJYGs4 R620jZACsmXfgAWIU6/1srmuwvGG1BY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Uqq9DIDz; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752069026; 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=dCuwEeKG3T4vaPU1cGDMKRDnCZNsVAdH+1b01xF9GoNRhdwjw3d79Thiw9ZnX0A5NfJ8aD mNLEWkGKGMvrxxxWm+g51r/YpAQtIv0Vd0hUdoJ8hvohd7tarDq3LedGkuKzL/5s4EmySR cDttNg1Nh0D/HctCxqxCXqE4mpXT++c= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 837D34502B; Wed, 9 Jul 2025 13:50:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE1BAC4CEEF; Wed, 9 Jul 2025 13:50:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752069025; bh=SO2FNTrKQArpvSkS2JHAbwQoeech8iUoJBHVmLqUzb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uqq9DIDz+u5Gldw6wG7ZfI5XM1w4kUYiculSQ3INMiGyieKvwEh9cIXiCTgI9TFDS UfWy69dNPRBBsnLd/CEh8u5VjaJEPnEK8ftNLes5Kn6TWBQDVTU7Sdvo/1V8uU84QD 822WJtfCeFCn3SoVBSeTfWifNHrMd1COtMCVrvhtjfV+uLISYf+v38Q1SDEjtl8Bns ZCZAjH6aI+3GjNS8w2eOH4HjgL4Lc11IigT2vA2/c13/GNHT/Al6w1vfeI4T7iKCpL u36mcswSdiJU1B9TcboHT9zTshz5jGq/VQsYRs/rTTJrLioExSmdcdKcfJAE2LztRJ dTcf4vXe7ZEdA== From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Borislav Petkov , Christophe Leroy , Daniel Gomez , Dave Hansen , Ingo Molnar , "Liam R. Howlett" , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Mike Rapoport , "H. Peter Anvin" , Peter Zijlstra , Petr Pavlu , Sami Tolvanen , Steven Rostedt , Thomas Gleixner , Yann Ylavic , 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 v2 7/8] x86/kprobes: enable EXECMEM_ROX_CACHE for kprobes allocations Date: Wed, 9 Jul 2025 16:49:32 +0300 Message-ID: <20250709134933.3848895-8-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250709134933.3848895-1-rppt@kernel.org> References: <20250709134933.3848895-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6DD7120015 X-Stat-Signature: y6ifxrz5zobjwuwtmrtsmmo8nwu6r986 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1752069026-739004 X-HE-Meta: U2FsdGVkX18GJyDqVEBy+JfcogDKadjp8/UeXrodvzWnu26q5o7BLcvLdYwmY35DpElXC5o5AaZ2ScwmYjkwYqUB6SDN1+NCtnbl/9+kGEpr0tYYD2Aa2XauDDyG9Kw1gEqpbDt1cUaOzXyAz+3z5GDDYVXjB2YIsrMTgFl2LoJ9+64qVZL/DKsJmhL7I7PyyBSDcS1+f8q6A8rKJ4UF42AZn+FWNPLeeih/qlQc8MUcoliFV3XSnIIvhn9aoWnYYDjuA5K+lf3NE3zVWYB4t2Lnzu0qbDK3Z4B3GLhi30scvyfZvnOrX5nSnOUztghXO+cLjbg4VwvPtADHn2dB0PmYLRTyWsLmmMwgJRDEXYWbDaAExs4NJDnOcDiepvjLCYnLozJv1hdFGmXSJ7pISpFASxPpxEvq7NtKmBkrNmKEIQOAHHrplYlimQduij0igH8W1OOeX7oUKDAOa3wQxNmMu6bM6oo5tTU8ZyJJtnILM6tWZk4eDqgeFcXzafIAqCcX1f1ztHWOxjqyKT+JRcrmNvIQuOiy2bS1IelfCL7NV28qA8HhtYEmAh26uMdmBv0oD/v+f31aLCXieK2A4qI9L/zYDxaGpcn3OeGDF/AnBsh/abDohuya6JlT5KPRPxPUO4Czrh4oNfXvbcOdZqzVXfZUhTfbDYHGqubAvW+6ZklscPyTyouYlSNE8cCoBeyzcmPe3gZJpkAYh1RxwrRYo+mpHLNWr0YjwBBiK9pafsqT4k4jP9XKiU963d00NKMVJND18jtFt/hP5fkZebe5LSAzj0goXgmG7b7Cvz+SiolIvTrG7KbTgKVcs2SlvR7peFWZy5Fg/qi5z9hth5GAriY5d/vGHUY54gB6Tlt7JGtUA+QSr4W5dG0Gx4U1DFBtr6ztDN6nd6KazmDGpDmYMhtHs30tsyJuWKlcLF+e7j5KHi0qWmT58edBt/Jz0tSVV2tigfeQB5u/YFh wxZKtw8Q YtMa5F2gcYkxAoHnHYqt/0jyH8IV+YqqA8XdmwJXdL38vpM0/8DDS3MxR4SB5BWVqoXW8bvfP5Ptuks9pKJvpeNzijQAyMcwIALGw2LShW+Ac8vaRelSvz0OqE9pLJ4vByoBPDaksj5eSrHMhbt1FhkiyvGqkjbMUqi+d5SHqQV/vf/6qSf6Rkt7hxfmoGRa0EHlIffdVe0pdv4vNmJwTayzGkv33HKHQmkC17lbd7XVn7S2N67k0ek8u9FtAL8lKhFCbbJwDy43d886DzJuSTrzLW/J7z2so3qIvf55meBuu91v1Gw/Nw6JDfpZPPBi6IEX95SusNlDzRio/cL9A3/6Ivf0HaHkyng9D 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