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 86EAFC83F1D for ; Sun, 13 Jul 2025 07:18:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19D416B009F; Sun, 13 Jul 2025 03:18:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 14D926B00A0; Sun, 13 Jul 2025 03:18:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 08B116B00A1; Sun, 13 Jul 2025 03:18:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EE5556B009F for ; Sun, 13 Jul 2025 03:18:26 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C1A871A0311 for ; Sun, 13 Jul 2025 07:18:26 +0000 (UTC) X-FDA: 83658388212.04.B4DA172 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id 2447540002 for ; Sun, 13 Jul 2025 07:18:24 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KamgB060; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1752391105; a=rsa-sha256; cv=none; b=syNCSnhCwT4FM2IXAAHk6rPmbo5q/V/7RENJ+/+no1fet9mGq52gP+byzsmchTNycxBn0h Kd1wfQFVIwHt89LsoMubHeG2XucPc3AMSexXUsh93pS1q1gS25vtEwuE5dpNOZSxuPE9IY Ol9lAUBJlBmGFUrQ0JbMXb+liGsj4O8= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KamgB060; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 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=1752391105; 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=0TO0EsT+fA/HIdZAUIDdIUsDYwN12Oi/VWZjrTTrZfY=; b=1GKjvhExIcQD1oJqx7WniBe64SA8YzXIrRxapmJzc8Lw9tc/tOUXbBdWNwFgMhpgMAxE3x 9W0CVp1jDKmyNc44i8y234OREvCzqJQg48FHCJvIA/pCs0iYqZTCBTyrydArvZvqdrpaqu Nc05Zgyk/1yYj6eJCMxcYOsFbBt9s8M= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 420045C5631; Sun, 13 Jul 2025 07:18:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38D6FC4CEF1; Sun, 13 Jul 2025 07:18:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752391103; bh=9YZfDECqQGQ531UjogQBUu7pWagY+AKXs1wDqpr/qhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KamgB060Bvsoix98TZWks50/I13lZhrhFcsv9XHufF9YHPir24VlIQe5VkT51CH4Z AeUD3eAP+47gTJeIkA3ABhZ7bbzEsShNDKHcGpJPq55trM7HD7fWewlpUaw5bFpAzO zT/Ld6lcfyFAOc4uWlHlzn1rHlCVB6vsTk6gxwhCu3dfSJHU2LYsHLfSBraWFIFaCr xGRjaCyOt4iwAE7pLT/gIFx9WUkXhIZLigZNwfxL1nMdOC+N+2Qym6UAyA2UJcrsTf xsdpneO8e3DVCZI9ht9+RQ2V63FSsOrr2amroBsSJKgkIU3wWO4ekDAQ2kUkCfpuA9 tAcv5E/0mTyJg== 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 v3 7/8] x86/kprobes: enable EXECMEM_ROX_CACHE for kprobes allocations Date: Sun, 13 Jul 2025 10:17:29 +0300 Message-ID: <20250713071730.4117334-8-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250713071730.4117334-1-rppt@kernel.org> References: <20250713071730.4117334-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2447540002 X-Stat-Signature: 1den7x9gxko9k61ig4j9zrqnx8hgdsht X-HE-Tag: 1752391104-114374 X-HE-Meta: U2FsdGVkX19Ci/9OGtIc2aqQJLED09ZGC3h4QFAi+0K0dhOW5P8mGp3Kdu2NAfKAVlvc/4sVcqp5T5RxcvtUwCzccEhhoJiF03sZepQuUnwi4+bbsgs0X6Z6OKsPz1GDS5uUTIRAoENrFKQevjDorgnW9JiTVgsZVVbyGcbHK71FIlC9J856l7a4BJm4+aW4gTcBlbX4Ah8haMEWWKWFiVIQgKT8MpMKmKE5AW2gdR668k12MoUE0gLFnp/SxYt/2wZX/gISxT3FWJt+AAyuDlN8onAuKRyV79HTCwHu0TnfJsH2Zk/K5RZH5v01+hjm1vVZn8VwNUZHGrRVwFmjpMLqvHROT6UDYrVTwPyyNYPBaKL5nXGf55XXWt1vZ8jR+QbGyXf4HrrCA8H9A8yNHvK08LLAXlopCQl2iO9XN0l5buS3QUpqv52Ltycc2nA8lW9XiFFZv+0DKslMopXsXkBi5PrAJxoqhSsfZjsmk1tasuGHJKs6K30y03Svm88ibGnGxO0NTAmp/GVGHzf8eZKp3HXcSqa+NYQIR46Yr3tYCG0Xpyl4QMUt5/ZLQXOsW6/EdpykuTse2lGBcOeIF8VR7N9sSKOAiQCkX0yBQWPDnj/LarXtfGM8J1NAQUEPzGvTP/5nnj/J40gPrRMwCh7Irb8bbOlOJh2bYRP9v8PjyqpnypGQPkJ4/sfoTHRlvCnAvU0jSEz3CSIIo5oBhHgKsJBj9oc1hfmbOVPCXUWTRUfuT/KcvliDGubrre7iM9iBWT8q8t4qziJUx7OCDKVH08sh3N8AnsZTXTTKc2OJSfMyfQYpO0+MfizRMkzap+nI/BToO5toPNDcCLrDwEjcny5dij8ZFqcvsFg7+RacpMpg9+RY9z+CfnbrB34QrKsv9o0d4jlZ0MnTXolhzGnJWySAcqmhp8qh0NOieyhNlOj3zyHfMoJw2lOas7YYl8ZVUqNkZzS+7zjWA+E LTFYrzAB et8DuiFIst0+h2ZqeiKKbk5Sk4BQM9xQS5XLAjMEZb0MZO0NWKEu9n1MJB+YIfNI+10dAD+a7ZWOFD/a0v2BwTftIjNd8FIgg6MlAc/nHs5yfupTPaCr3lKTmDVgf+yxmWJVtO34UGe+ZBg6CiOnk9Rxd8DPm8v+PbS3PDntqv2/N3aAbYFgTOKjGJPDdpxakBs41UM04BdQdQsc+0MRpnHPRKC12fnQI8GVgYNxQAyVHjBf/5478aoN8up8kB+IbtKPPCZ6SC/lLEfMoDuHC2BNi4+2qEfM6T2bQtbWJpNh9zcSKWYItjJhVpXOQ5M56xZDhZkKVdhivtx2+xw1UmSNHk+H+VOo9mmR18/18GDU2kTkxKs1BnDxmAtHCFgxEWhtuKJfl1cKIVrdPFv3WIB0PpOWm5gWdptaz 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. 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