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 249B8C83F17 for ; Tue, 15 Jul 2025 00:21:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 505116B007B; Mon, 14 Jul 2025 20:21:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4B5FF6B0089; Mon, 14 Jul 2025 20:21:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CBC16B008A; Mon, 14 Jul 2025 20:21:38 -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 2CB806B007B for ; Mon, 14 Jul 2025 20:21:38 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A4D311D98EA for ; Tue, 15 Jul 2025 00:21:37 +0000 (UTC) X-FDA: 83664595434.02.16415C8 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf19.hostedemail.com (Postfix) with ESMTP id 035DF1A0009 for ; Tue, 15 Jul 2025 00:21:35 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cbwfmwSy; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of mhiramat@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=mhiramat@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752538896; a=rsa-sha256; cv=none; b=q14mdNFjUEowIzO3w/CLx9l/Ov0HfhycPFHLuTxu7x+MMH6lmsj9H+KK3/KwVVwVSbJj9O /sKgWKnvOEr8oJF4V1/1sOilzRkZxletFSv13OU3yDKQiETTLb5KbsWsm0dZGhv56Rv+1n ORuR4EyAlhiv2qhD7ZuXX1vvUMV/myQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cbwfmwSy; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of mhiramat@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=mhiramat@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752538896; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OXvUxF8NTJEAI+VAOjga8tyv7PLNGy8kIRWQJ6aJ0RY=; b=Rwy+s+KaI0w3m6Qi6Etju27GiJJPfdbJHR2+L48WfTgq9hH2nt/1100zEFjEPq3q0htFSW 3YnYW1MA5MEbLSdQ5m+jaXncGi6P+KW63g15Rwq8xyO+/ruUMmfTTgR2zF5SB3Np1GUkMV hHsHWSIcow+WuKjSpn4jFz7rATYW3Ck= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 1CEC561480; Tue, 15 Jul 2025 00:21:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DF290C4CEED; Tue, 15 Jul 2025 00:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752538894; bh=ggcEC9bbWrHlmXqb/IZkagM/1dITGxzsZ7d7NZy45XA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=cbwfmwSy95HmlSWI4uiy/mtiUWFaeu/uH7ad9AQ4TACV7HMBT0oaevtd6abttH333 Le8jxJFr/1McYBGAH3q9PI6W0fxrP4PIOl8fA49YokMeLF4ahnaXk0n8tnE5khdFXl FSPnuQDjOpQgn00x8nn0TLS5ydHbfc69JXWsYVeiZBp6r22sqyxTFHkBvksFKwc1yA 4Q/1jX8bf32gzrSR6LZTEbe0cYIoonR8H2wvCdxrdzbZixmXOfOAAJWX7zCvyHiytS J5k8Q3FR46+0gtrqVv8VxFGTOEaYy6vKEX9gs/HYrkj0SFvg7uxl5ZBvYOUDBA/v0T dANMPu5y9fwzQ== Date: Tue, 15 Jul 2025 09:21:30 +0900 From: Masami Hiramatsu (Google) To: Mike Rapoport Cc: Andrew Morton , Andy Lutomirski , Borislav Petkov , Christophe Leroy , Daniel Gomez , Dave Hansen , Ingo Molnar , "Liam R. Howlett" , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , "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: Re: [PATCH v3 7/8] x86/kprobes: enable EXECMEM_ROX_CACHE for kprobes allocations Message-Id: <20250715092130.0b4eda67c5db02e815e478b2@kernel.org> In-Reply-To: <20250713071730.4117334-8-rppt@kernel.org> References: <20250713071730.4117334-1-rppt@kernel.org> <20250713071730.4117334-8-rppt@kernel.org> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 035DF1A0009 X-Stat-Signature: qtki7tyyq34uysk711p859x4bf3nnocg X-HE-Tag: 1752538895-374495 X-HE-Meta: U2FsdGVkX1/hzVN9XMcJCoCoRBxhbYrPDyqZrLsvytfpdHd71OHFZqJPEhDu1/hlBRXzpo7cSnxirQNQLNyvCjMAmRnAtlCZ9xiECdsgr2hjgwb/AMMeJFeh8XpLVMv4BAhhIFwe88Zqd5shhdu9yLhDsivT3AIIxAyBd853NXnl1OtKytMLa7vDVB307SoJ/rlJbs7pzY8In2ozKYgagKrp7rQxN06djv/AIf8MNLSpFrgAtN4I/upLhsKDVvg2L2BtJ8exhKWpF2gbVkWpQUPojuNu+TSh0KTLsngQBCCo6tS0hS4iIrVzaGjiJzs/7htOHNhkUn8MhxmfG/fWRhRV4nU0TMgG4N3dTbtYJ4ZFqkB0YSQVnReF0/NCpp78IL3Hd0kuAjrevg/nK1uwD6ZZ7vtdia8QG3/jLW9Nqp/TD9sNwp2+ui3e8Gy5nSEwS0YT4UFNp6fbvMSqx04Z46+U+D4DAFwUODxS19zdK3FjZMtsm2QfsguEMQemp/FyYc2gBN95Coq/nz8u2Zv0JaQ5v6owuW5l2QO7YdwiORfwRy/xaU0u6nDLOhbBXMccRtU9egugrdO+GqoSHYkuDDpgQsRQYk/TvwbjycGPaFueU0UPDxYVS2rOqJyiQwh47Y4bj2eWkpAdg/XYf4NfF014Bq6UAExeMokWj5QeugBKe0lI2BiM9GqvkMckUGnEwca2mEc24pMkapi/elPejTKHqH5Cup9YsdwLaO2LANNWas0krTET32cu4QRh908SQK5blP0MDp0k7Oa4KYO3vWAoXIkzsNlEl5xOPOK4hGoeyhXNIU1H5sYRkqqNnQuqP+N1XWCsxOev2iax8Yc0ybik926mFiT4LP6JAU0fQITgISAZZRHLmg0cs23ns4ZIBVP2WZFcRMx+rdOSSwsl46B5ka/CaYzMiGvsFE79lVSnpAQajKwvAy1nnq/epf6T0TUpRn/YFMFAKimxOPO LdIaRULw Lt330MnkUesT85bVLQsyjY6oBUluugoOZZaAsHmaTyxEGxF6H9GPSOxOnWE8+0NDG77Jm1cC4Zes6eqJ3hxNZolFSIg+30BB5XDqGhsY4+JulxNNNgxU3hgPXGseVYL37f6ZdSbVFL7AdlEBeokzzvqyKCJyj6qS+cUFmeL2/ewJ68Zn76jbPj3jOq6bCjJNq84PLym78FQqqGw+A0zKwnaQD7I3VF9CcR5r1bmVcw+uB48klOK78UFxz/j9Dhiyb5VB/ubSzi6qtq08n1YJ9sc85dIQ+iAcgNf99Nk62F7NWtbdKCufjFHtaI+rMs0p3Rtq21BqkkmQMJNjbqvRuBrVA5k3neH61EZ32POnT2EmFSExcjeIGouYvZvCs7CBSqe/3dVSLg4DFRHc6a21CHSz37wfA3jQn7ioSrs8aRi/x9q8+Ouon4OflENymsKihKwAg 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: On Sun, 13 Jul 2025 10:17:29 +0300 Mike Rapoport wrote: > 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. > Looks good to me. Acked-by: Masami Hiramatsu (Google) Thanks! > Acked-by: Peter Zijlstra (Intel) > 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 > -- Masami Hiramatsu (Google)