From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 556BE2DAFDE for ; Sun, 19 Jul 2026 08:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784448710; cv=none; b=ERkSNk6fnLhPXisjneI0Ycnit4qXIx5s6YCbAJYQN5714v6jgUN0+nsBCjUPUBNcpe/EJYqEDw3QZcde0NtTF/px+zK6NtoGE1CvxpZn+ohnXO+zon0Lajfo4J73/4mzCNImgnhHwfW4QxmWi3eJQMWXfdpdszVHDwGMrm3skOQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784448710; c=relaxed/simple; bh=1ioMkMzn4SCJmRf9ZepJNjCeUB/CiQ8Q1HDkDxiQtv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R9+6BiUzcTSW1duC5rlg84fqo3YPLUniPbtghfA5Bp5vF/jctmd8CQVrJzRCbatUucx3h5O43SBbOm5f1r+Fvf8Ci7uXx/WRaBEMH7gWM6uFYmq1zg238sHdA+UDiDgbKf2MC5LFY375puUYzhoGdnbfUH21OpsioaFRjBCwjKU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=XvtQPLCs; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="XvtQPLCs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=7u PGAuGCroD2PkKnEjROxwq4HpeTBaO4iXNgj+VVvB8=; b=XvtQPLCsfuyROmXbtI AD4kaLnURGzRRc9kY0LqIUqEWEahqeXdoB+Mnc5iUql4BK4FkY3Q4h/ux1TJ05id JvzlBaixey4yhFVukjzQGpmjV599mOucV9dOvEz83ZZ+EP5K7wt2sifqO1W5G1MI iSKmykrk5M8BNqyXx5p4NVXt0= Received: from Ubuntu.. (unknown []) by gzga-smtp-mtada-g0-1 (Coremail) with SMTP id _____wC3z6F9hlxq+TAUKA--.58193S4; Sun, 19 Jul 2026 16:10:39 +0800 (CST) From: Xiaofeng Yuan To: pjw@kernel.org Cc: palmer@dabbelt.com, aou@eecs.berkeley.edu, namcao@linutronix.de, alex@ghiti.fr, broonie@kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Xiaofeng Yuan Subject: [PATCH v2 2/2] riscv: patch: skip fixmap mapping when kernel text is already writable Date: Sun, 19 Jul 2026 08:10:36 +0000 Message-ID: <20260719081037.5749-3-xiaofengmian@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260719081037.5749-1-xiaofengmian@163.com> References: <20260719081037.5749-1-xiaofengmian@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_____wC3z6F9hlxq+TAUKA--.58193S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrtF17tFWrAw13KryfuF4kWFg_yoW3KrX_Cw s7JrW5WryUCFy293WUJw4fXr1Dt3yFqF95Cw1avFWkGasxXry0q390qF13Awn5Arn3KFy3 uasxG3savr1jqjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRlPflPUUUUU== X-CM-SenderInfo: p0ld0w5hqjzxldq6il2tof0z/xtbC5h9ydWpchn+LFgAA3s ... Signed-off-by: Xiaofeng Yuan --- arch/riscv/kernel/patch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c index 16b243376f..b6e8e1e83e 100644 --- a/arch/riscv/kernel/patch.c +++ b/arch/riscv/kernel/patch.c @@ -44,7 +44,8 @@ static __always_inline void *patch_map(void *addr, const unsigned int fixmap) uintptr_t uintaddr = (uintptr_t) addr; phys_addr_t phys; - if (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr)) { + if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && + (core_kernel_text(uintaddr) || is_kernel_exittext(uintaddr))) { phys = __pa_symbol(addr); } else if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) { struct page *page = vmalloc_to_page(addr); -- 2.43.0