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 A935FC83F17 for ; Sun, 13 Jul 2025 07:18:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E7136B009D; Sun, 13 Jul 2025 03:18:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C0126B009E; Sun, 13 Jul 2025 03:18:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D4BC6B009F; Sun, 13 Jul 2025 03:18:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1F1F56B009D for ; Sun, 13 Jul 2025 03:18:20 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id EC66B8036C for ; Sun, 13 Jul 2025 07:18:19 +0000 (UTC) X-FDA: 83658387918.07.A03AB36 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf12.hostedemail.com (Postfix) with ESMTP id 8D23E40003 for ; Sun, 13 Jul 2025 07:18:18 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qGwTKuxZ; spf=pass (imf12.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=1752391098; 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=dvEeWyTZoPmagEoSSantapD1WWg0uhXHJo6OgMPbidM=; b=I3qkoFjr8J/Ht8Ja6PAT83rdG1JVbB0qj5o/i5igYAUxhbyqoEuecBaZ5jkgA64QUzgVTo fij0MvUzMyrmOc2+7UFDBorwkwlqhmveyykDkk+eXSYj3qkAJzkBCxlsdMb0BYAA8O8DGj 1Vagp8/2LtoZLD3t8NPkZWM8eknB/no= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qGwTKuxZ; spf=pass (imf12.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=1752391098; a=rsa-sha256; cv=none; b=lseSaNfx9uQ7+4jhFsKoqtK52AVeAparaDX9a4VDcMckl+/NUvCIXjz1tvpm0uIxnhO9zU 1o/Oz/1PDUh6a4EkoStrKaWjJ0JGY08+8MgKB09ZbfCjZQmhVGWNWRs6Y0IZbnssFfjcQV xwFFDBQueBC4h6cjGWinpba4q5pMPl4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 07DE9A40AAB; Sun, 13 Jul 2025 07:18:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFA2BC4CEE3; Sun, 13 Jul 2025 07:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752391097; bh=bidj/q64QU+7yTnn+7Fdxeop4Ya6ZnjaNbOgpoV8vTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qGwTKuxZerSIN55A/xBAJe0q0FfGdCZ4FMRonrPNNRAH+1fDtxxN+n8bx18oax0Jz W6PY2ndfl+tJi7BbZRpVb8av8GGe/6IN1v6AVqmAz7UjuG1KPwJEDWVRKmviqdCoR6 RrVO+USneuiLQmildLfpCcrdN0tn9FNkTxdW4SazIX6PvmeAuzDazSlZgmLVlATSgp ORvnWAwza4lVpg5gdfH4pLaEK7ULljXB1jD/p5CXXifh0lC+6GHKq32WyUHhuXVIr6 IxCNtCwg3Rkk5/BG+KJffbYTVDmrr8A6gSrHhyPgj7wHgq12R+jG5ECaXJiQe9kbQx 1BrE2MPjlqa9w== 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 6/8] execmem: drop writable parameter from execmem_fill_trapping_insns() Date: Sun, 13 Jul 2025 10:17:28 +0300 Message-ID: <20250713071730.4117334-7-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-Stat-Signature: auhgz4gdeuerqnrtqf3tfhiuxf8wcg3d X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 8D23E40003 X-Rspam-User: X-HE-Tag: 1752391098-650355 X-HE-Meta: U2FsdGVkX1/Za6ROxkHnButxnvwPdlQTeI9+VVQy99G5bCB8kUWknKlPbgkBTYBGa6iMENs2MrMkDhhjiDr+h/jXbX+r211QMReszCPIaWZ1jXCalDRR5lLIOa8rl9q4u1LsX4N5+z1Fuxca+YJ+k7K31czdIoIf4pQ2kOfIy6PWyPIKW9F8nVja//8nYm4e16kQRqJweiCjY2w1WiAttx2p/E/vwvMMFzzKzT4owGXlq4aT4EJmgrLoPJ2bjUHjOGhuZVaoX5eby6dax6/8QA+IYW6Grmd4C/4CNV7a4dfsugEukbxit/mFD1RjSJDUweOoyxDk9OIx03UWUiHgsmMT4flHQga7hV5xaAmPTqIJXQ+zBX1Ay566ollF5io7H7nrTxUSktJ11sfocWu+p8XNfBTY1r8znjwKyNcPdsjct1H/BapFC7VgZxbqM1S7fUJYmXQNTWpaMsNRfsYPW/AzXcqHIky4sJaqRCqfeThZ9+oRwpp+avw6C5ItEFb9Yl1bk0LaB9aTG/fSIECEgG5Ry0gahi53lHhYa96PnKgioug42ZxohuIScSnOGlCN4XXi03hC0+bitGfXhXHbDkDbV98j37AKkuw3iDgr83TQ1BQjIAJiDxMzfiD5kyk3G+aXrKGKWUOpmrKwL6SpxUyQBUipSYuLC7aY+hDhjFi0rTAAS+4D/ByNxc6UugYzhCzz2TWpWNGjQoBQdZO2JiF9MHhOm6ci1poY9tQbZ/7MW8H6DJzn4enn1Th39ZF+T0iEzqvb5EuipGCPj+Ki3nn5gry3xo/V6XVUJjbrMM8WLgqvwr5llYNlsAXUYmxRk3JdU788y8tcZ5p/ACKwuVjJCm6tC77rItd9EQPhiLbYh6VXog9X4lRE3dZ6RWmEm2FXwAt/4PJTUgIgd590dgpZqI7oll3l3JanfGeOR/WJV/XdK6mrOHegTLTCcpuv9LoucSTTO9FT29ocvbJ EHu/SAOs G3Yq0ZZW5a5to267yvkWpae+KJk20KpgFYlmbvNnqIUjuaQhLKOODgi+wgd1mhGQTyTOAB+4WbaIn/TDxEW5oAtfpY2PiPJsAD4Hpciz7pyb67bGXz713NMa/8Q== 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)" After update of execmem_cache_free() that made memory writable before updating it, there is no need to update read only memory, so the writable parameter to execmem_fill_trapping_insns() is not needed. Drop it. Acked-by: Peter Zijlstra (Intel) Signed-off-by: Mike Rapoport (Microsoft) --- arch/x86/mm/init.c | 8 ++------ include/linux/execmem.h | 3 +-- mm/execmem.c | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 7456df985d96..dbc63f0d538f 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1063,13 +1063,9 @@ unsigned long arch_max_swapfile_size(void) static struct execmem_info execmem_info __ro_after_init; #ifdef CONFIG_ARCH_HAS_EXECMEM_ROX -void execmem_fill_trapping_insns(void *ptr, size_t size, bool writeable) +void execmem_fill_trapping_insns(void *ptr, size_t size) { - /* fill memory with INT3 instructions */ - if (writeable) - memset(ptr, INT3_INSN_OPCODE, size); - else - text_poke_set(ptr, INT3_INSN_OPCODE, size); + memset(ptr, INT3_INSN_OPCODE, size); } #endif diff --git a/include/linux/execmem.h b/include/linux/execmem.h index 8b61b05da7d5..7de229134e30 100644 --- a/include/linux/execmem.h +++ b/include/linux/execmem.h @@ -60,12 +60,11 @@ enum execmem_range_flags { * will trap * @ptr: pointer to memory to fill * @size: size of the range to fill - * @writable: is the memory poited by @ptr is writable or ROX * * A hook for architecures to fill execmem ranges with invalid instructions. * Architectures that use EXECMEM_ROX_CACHE must implement this. */ -void execmem_fill_trapping_insns(void *ptr, size_t size, bool writable); +void execmem_fill_trapping_insns(void *ptr, size_t size); /** * execmem_restore_rox - restore read-only-execute permissions diff --git a/mm/execmem.c b/mm/execmem.c index 04c35c3a9361..0822305413ec 100644 --- a/mm/execmem.c +++ b/mm/execmem.c @@ -304,7 +304,7 @@ static int execmem_cache_populate(struct execmem_range *range, size_t size) goto err_free_mem; /* fill memory with instructions that will trap */ - execmem_fill_trapping_insns(p, alloc_size, /* writable = */ true); + execmem_fill_trapping_insns(p, alloc_size); err = set_memory_rox((unsigned long)p, vm->nr_pages); if (err) @@ -363,7 +363,7 @@ static int __execmem_cache_free(struct ma_state *mas, void *ptr, gfp_t gfp_mask) if (err) return err; - execmem_fill_trapping_insns(ptr, size, /* writable = */ true); + execmem_fill_trapping_insns(ptr, size); execmem_restore_rox(ptr, size); err = execmem_cache_add_locked(ptr, size, gfp_mask); -- 2.47.2