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 98472C83F09 for ; Wed, 9 Jul 2025 13:50:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 35C0D6B00BD; Wed, 9 Jul 2025 09:50:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 30C346B0120; Wed, 9 Jul 2025 09:50:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FBA16B0122; Wed, 9 Jul 2025 09:50:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 088266B00BD for ; Wed, 9 Jul 2025 09:50:22 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id BB2D257902 for ; Wed, 9 Jul 2025 13:50:21 +0000 (UTC) X-FDA: 83644860642.29.6869714 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf27.hostedemail.com (Postfix) with ESMTP id 17B0E4000D for ; Wed, 9 Jul 2025 13:50:19 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qYISKbwu; spf=pass (imf27.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 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=1752069020; 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=Yll4cKCLH1otrnsRfiM/zMDWwBkJFpgEc4aSFcrbtWg=; b=Cu4pwTBN8kP7SQM4O4LTFqB0cUojQpTDRd+9s+nYE9mlGKGwLEl1Rmf0Hn3S8ynOR+c0+S 3VpY4n+vVXqi5uqWMaJBH5YE7+pD7A02cGvJoOf59vjSyqy4KDHZQf2s5FO1/+bbGf7Iht K72Mshw5dq+31CmnipuyxhHz07o0U9g= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qYISKbwu; spf=pass (imf27.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 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=1752069020; a=rsa-sha256; cv=none; b=BmlfWR0ymCnIX2BkueabTybS/jKtcWcBLnV2+Kla1pj/zLJ7nERyF46D2toqOBnri9FCcI tqmLfGITOaqHfS+pVTxhunEDNmatjhVVeVlYy9vNtOOkpNIusB3Wso51D8ISdO4Irtsr0p qJt22QHkPvqBM/g5xkZCvRlE0wLjCOo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id A1AE4614A7; Wed, 9 Jul 2025 13:50:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7F07C4CEF1; Wed, 9 Jul 2025 13:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752069019; bh=UfdU2NtfT5pyDIDyGKKERIvkXlmii1YDvliXyB4yGWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qYISKbwuNhcRxyV4eib/26x4sOL4iiYJhoPQsAjEOC9YExVxanq+lLb26komTBLZG cnB41wXbRuKCHz6C2QkMepppg0/HAHprTz8hplGJU5FEOlV48xUR6gdu67c0YC2i7X XSEhIXis+2pcTnebZIE9RTu6BcQu1CShtCmRvb218F/rTcmotsbHsoNo0YufFV0h5q zVvmNfuIvUHPix7Ht8okjY38iO6O2GjX0f7vhUf6CMK8XS7QKBJe4W/3T1gdn4Lyqf hQ6eWmqDBCz6DNjIamV0urMqjqPvBvaXZ2qbeq/ktYJR2pKNiL3x9BP9y5py2eRQqi gs3wVrRDc1s1w== 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 6/8] execmem: drop writable parameter from execmem_fill_trapping_insns() Date: Wed, 9 Jul 2025 16:49:31 +0300 Message-ID: <20250709134933.3848895-7-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-Rspam-User: X-Stat-Signature: w1aexakq5fm9ekwimms8uhkmgn9seees X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 17B0E4000D X-HE-Tag: 1752069019-684448 X-HE-Meta: U2FsdGVkX18sVGlZaAA2qBB2WuVPK3tADo6Q+KEC1HF81gRVy1Buz/OAmhLXs6gOoi0NVYfm2i8ycJYmTEWAgWY4pCje07SnbXOO7u3CNH0LKZD/yGdY2aJZHpFCgUeAchmoB8ocuoXx44KjD3rBei5DG7uynY5K0NMVhrWIamWOB9Cl7/olX2cg7wDuk2xPSa4ckXc437lEdOM80OE4SqEGfpV6xXh3KJIy/BRlCadeYY0b5DEyZJS/FI4cfCgtgJbFfwTooH3N3Dl1WBWOKCtVrBABg269J/NmRiiCULXSEmLcV52JQ4wN0Nial+Ty1MZRW5evEgoRnZLnLUmpeGybRPBsmvO/9pFmUrs8WAXAPQgrqiHy1LtcDeHtP4ohly5v63wou3MlkiJH+hjvn4GQQwtcqwdqW2fTmxSxIqoVKjM302XEQuS2Zca/qP61ExCNYSukvvVqIik88C20Kul2sTX1I2bVc8OAAc098QneoJWW546GX/RYnGvlDA2HFq5bQs7SV58U8xSFYw/SE6LZPqO7+qFLNh0wKBoAuC42x8aCTNfrXvakrONP+anmCaX/ynasU9sKvPwZxWkVU9f+8CYLqdAAMvSh7jb9KeqjoVqcgpsrTHVutcFBoM8EKKzIdoVdtnHS0nVJpgU8K4qMXVBrI9ObjQT0bpvZfeoEr1pqg66Inxj0UMpkOL0ry+EuBfq7TViJCCpW+Jkf7Xs6vP5/QpPcEbmFQnYa14SuJudUfjWlbEdAVdvlVrujOFsw75AbuGJ30YMO3dlOXxKQKUSN6YpC7WotEVU4pQ2vNmsStry79y6Myhj11IDql6s/cRb82aTNvwOOKAFNo7eM0zC6wgPiYN+dA7QfYgcnUbyM+H7eC+O99nIUQpYK94aWW0uCrR15Ki9lzv2VPNZvHOApUMGdJ2Ngz7VKyfMQSxomCYFFsLAzIXKI+E9KcKDgmQYQZeqeZR0mGXa wH+dycdD t4X7Hxlw3bxpY+9f4Q+ei2hW4mH0JhjBYc8bg/N2DJP2GscTpTfnTseHfCikM5rcfFJGDq5WNNRskmvwpxCLJWFe+1LrS5ZuMsfOvWsaEZfX+HCYJeH5EP9zWX3LykSRm4faoKTTlcUWvZlG9ZFMFBGWDVuSwU8+FrBl8iCzcG2L5zfsjeJM2FUloSOu7ev/bdyuKh4H06TrA+qB4DfReiMS7aPVWzIhH1ySkdl4w13+Jxo7I8jvseAciR9h3ZQM8iV4avfXnX15Wu4mnHPY3ryWYxpk5dsSFtvBdeJIX/7NV8GsA3Oyio/UiVWbgV1RcBSC0/+60LV7bt+JDq7nrB2mdfh9Z6cvXSwtuJK9wJ+UfUbVX64WzvnqJNitSGvb5Shud 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. 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 4e510d1c609c..fe367bdadc3e 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