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 7E7BAC83F03 for ; Fri, 4 Jul 2025 13:50:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BCF16B804E; Fri, 4 Jul 2025 09:50:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 146006B803F; Fri, 4 Jul 2025 09:50:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00DE56B804E; Fri, 4 Jul 2025 09:50:28 -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 E0EDD6B803F for ; Fri, 4 Jul 2025 09:50:28 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 70256583E9 for ; Fri, 4 Jul 2025 13:50:28 +0000 (UTC) X-FDA: 83626716936.24.17449E3 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf05.hostedemail.com (Postfix) with ESMTP id 83698100012 for ; Fri, 4 Jul 2025 13:50:26 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=s5SHeyJO; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 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=1751637026; 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=60J1NWzWqU3grvGbu3IdCFEzU/Wt4OB4S367hT66fUw=; b=R/EKsZ+BplTZERUOJCXj/kMQ1jhIblS0SVY9t+eo6gJ6sCtoKpx+3+gNMrTGQ4w4xKYvfU rlXJ1fUWQ1yrj+8reQj7WwbcoGOBMmazi+RSafwSe3xeZn9SL4/4Pk539uuLZ4oy78dEHa YTT4SDNluPvrBk+093BukqWvUglGRRo= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=s5SHeyJO; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 172.234.252.31 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=1751637026; a=rsa-sha256; cv=none; b=ol1/lBGLkxrezDAXeYQZEVCwx/1Hu3GsTV9KSCAmnJLIsAGPHfZTJ0loMzTBsBnak5bG21 dGR+jbl+d1TVEVPb+keYBAUowGPfyKmdVqg3PFiwOiNjStBam1MUFd7IOgXEM5ZExelF49 eOwVNkPlDGuBC8QOvq9XrzL7011Qmgk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 8F5BF432C1; Fri, 4 Jul 2025 13:50:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B78EC4CEEB; Fri, 4 Jul 2025 13:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751637025; bh=LpVdGb6KRirZdT05J73u+j0sDks+bcZOsNalMSCnv6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s5SHeyJO0YmS+UuFO30EnLCBY1/QU2m9p5YinIlB6hYFx/7N+5Zczxfo6UkAgJTRA WPfC2UqtpDJL2APhGa1UNLRSRS9OOb4WF33Ne0GkvfxgrdLlkmRF+fz/tn1DOjhxaH ZNXVObc8wxGuh5WXTX8tG1MlYhnlJYNYYFpCzKRL3SD9NhUh0pZ6bQng2tV1eDpuKS 3ytPqvu9imp/jqF5ouyR4oLHgVOblK8w9E61NmvtLIkYen43S0ji2NvtzhxSOdoSyD Pkqx2YAZgFt3yLIvkH+5ePwHgQzZuYoH/vGDe8npvULS4kvQ9I3m3AUOwierxO74ZX LD9maYY9v7vxA== From: Mike Rapoport To: Andrew Morton Cc: Andy Lutomirski , Borislav Petkov , Daniel Gomez , Dave Hansen , Ingo Molnar , Luis Chamberlain , Mark Rutland , Masami Hiramatsu , Mike Rapoport , "H. Peter Anvin" , Peter Zijlstra , Petr Pavlu , Sami Tolvanen , Steven Rostedt , Thomas Gleixner , 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 6/8] execmem: drop writable parameter from execmem_fill_trapping_insns() Date: Fri, 4 Jul 2025 16:49:41 +0300 Message-ID: <20250704134943.3524829-7-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250704134943.3524829-1-rppt@kernel.org> References: <20250704134943.3524829-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 83698100012 X-Stat-Signature: 7bbzsy693j3khbyc1ho9oq4zjpwekotk X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1751637026-788676 X-HE-Meta: U2FsdGVkX18ANFr4eSs6Q/sKTxiu66o1je/nSdkKdMalGXKIgesZnz8t1eM4KrS4VrjAdMicxFP+1vJw9p2fl+G4cORTcz+A9V5KTPnJqRhbczUnKah0+yanZMB7GcukLmEk6d8evtVjbt0bx7mAdiqKkRujh2O5b8Bj87VPoBAF39bhQVqCbcO1vB2/q0FkXRVz8+yV+sv+VSj7Xg8pGWZC+VRUNy/vNNi8LUJWLeFqDua05EZU3QVSuv0LAgVZJ/1XsR9Tre+dijYz5rF18lsQb2Ci8QDU1Op55mSGDioyjU1bGcFlKp7WHEdcQp+SRER7HVF+Qp2Q4zGUNc09M4p1mwpzEzONfJ68jBszk9yrhZTMYae14buuXWx58cpuCsJNZavIL9fEjFAA9P+VXWvS685hTYkNuX/Rw2iUT1L+6QFFMTOCZP/XMlENRTdRuOcZtVKzbY1l6BJt7N2nR2rqEaEkd++BMwDrT5zv+q7UbzIKLwWi1Na97IzAR4qAzEwG0En6LVrY+Rsd3XY2gf3bPYkAPFYeM8PgCpbOS4F8hMLFzFkj2HJdTaK/mMVixmaFOkrE3UJP8Mv7AHW4pXhan/iG4b/7r1955wAkm1tRQQDF6T7MDpCjxkSIdzHConuYiGsFVMkBGBr6oopeaZcKdwlNQ3LnZGVTsex4UQQ4j4pwgegNGsJBJQEZDbHUDI3NWaWEyTJTdE0XjlYpV7mINBeXQCDyoD7cb2rsOB09H72fnLc9DBIvzjIADZ3AuPBcDkQk9QwhAbxyZ9iAUD/mqlDyFSs3q+M6jqcMsNmQEtfNiJMEpJP2yqc8VWrineSI/8hN7k6OG0/s52OlcAQWioHgH0IZBbCRkFNCb7Fdk+PLBbrkBmmnBJrGNMdwGxX7cnHL818aev9lMcA3a+GkcOAEqZYJQGLySwLskAUHt6Y7o92emxu5vOV1v4yAJCXnj7quSEh6fzmpACk XX17Q5fF uIdK1zAyNoqswTciLiIkWe5fr7XTZd2BSbi1yc/ppVuHciIFrXA1o3alS/gtRVdgu8lc0p4HLMfEtUT0sJqvUUXRt7Kev3ifjIKVGRs8756mRxFXAfoIWnVRU8A2jqVruoKVivL6b/Lv3rWFMBlZMSKI2dqLt8pOJFz/SnjG6Xs5zAaawqZUBLguznZ7DPHxft1Yv9Jf19Sr2KSv7DtkmH8X9EMP/MOPdZto+ZRwp6AWnmFB0gvk0OPZSKQMVeMsly1kOw9IKUjOJzIJGZirj/5r7Td8cgblmp7GQqQ260rGCv/MiCVy537glXCP3BWtRY1RR 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 ec2a6aab143b..398e60c1002f 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