From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) (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 5BBCF4218AC for ; Wed, 1 Jul 2026 10:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782901752; cv=none; b=EAi0QzML+cytLTxQWJzbjGcKLUVZwJPVosZ/ypgq3Bcef/JaucT9b30Y+nURNX3AfXnFeno0r37yz/3XeiMKnwE3/c8BD2DxDN3CkfssRBuQQn+xLIRyHbyWQg3kjw76PWKSKHPrloK1GU8jGPDQ+AHNDCSD7DJFAenavVk9wRQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782901752; c=relaxed/simple; bh=OKTG3D4+WmNJeIrhcrziDpNYlPjTGuYd8VI8PAhhvNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZJG4vydV/8upGmn7mbwzw5ihxkxypj/Tj+psJDK9u+cWHvrPvHgiJGC1ooJh0riwEqaeAJ2fPW9Vm+iZM4PEQ4tkmaRM+83aiaUJ0kfnf2wQNts24eM0hQ56ZKGlg1A3nT3EXzEze5EoRDG7TFsfpKOjp4u6x667N9xjJuT9kVo= 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=DGg69Ooe; arc=none smtp.client-ip=220.197.31.4 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="DGg69Ooe" 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=Mb BT5bjBKldgVz9yhQSA+1XgKNkkTrf1SIHLbVsT2yE=; b=DGg69OoeAThhJ3YHx7 gERfiA0DTZp7X7off3nM40juq3H2ldXGdCKexYw7vNvjtbfYUV9IYYwxNBsKAIYF TmoReM6i+iRvkgi1Ca9BUBBNBqkBBNkh3PhOmaw0+9NekcppOAiM1IxbWdvaX8cT DrGo5clslIrZqcGl9uJ/N7O00= Received: from Ubuntu.. (unknown []) by gzga-smtp-mtada-g0-2 (Coremail) with SMTP id _____wD3V0jH60Rq_FlzGw--.4936S3; Wed, 01 Jul 2026 18:28:24 +0800 (CST) From: Xiaofeng Yuan To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Alexandre Ghiti , Mark Brown , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, xiaofengmian@163.com Subject: [PATCH 1/2] riscv: mm: make EXECMEM_KPROBES writable without ARCH_HAS_EXECMEM_ROX Date: Wed, 1 Jul 2026 10:28:21 +0000 Message-ID: <20260701102822.95459-2-xiaofengmian@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260701102822.95459-1-xiaofengmian@163.com> References: <20260701102822.95459-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:_____wD3V0jH60Rq_FlzGw--.4936S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7GF48KF1ftryxGF4UtFyDAwb_yoWkCFX_G3 WxWryfurWrWrZ29F4Sgrs3C3WIkasFkFyDGrn7Wryjgr17W3s8X3y3JF13Xw4rCr1IgF4f AayfXFW09rn2vjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7sRK89N5UUUUU== X-CM-SenderInfo: p0ld0w5hqjzxldq6il2tof0z/xtbC5QnY22pE68lXfwAA3L When CONFIG_ARCH_HAS_EXECMEM_ROX is not set, execmem cannot create temporary writable mappings for read-only executable pages. In this case, the execmem ranges must already have writable permissions. Currently EXECMEM_KPROBES unconditionally uses PAGE_KERNEL_READ_EXEC, which causes kprobe instruction slot writes to trigger page faults on systems where CONFIG_STRICT_MODULE_RWX is not enabled. Fix this by using PAGE_KERNEL_EXEC when CONFIG_ARCH_HAS_EXECMEM_ROX is not available. Signed-off-by: Xiaofeng Yuan --- arch/riscv/mm/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 5b1b3c88b..21794e7bb 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -1457,7 +1457,9 @@ struct execmem_info __init *execmem_arch_setup(void) [EXECMEM_KPROBES] = { .start = VMALLOC_START, .end = VMALLOC_END, - .pgprot = PAGE_KERNEL_READ_EXEC, + .pgprot = IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) ? + PAGE_KERNEL_READ_EXEC : + PAGE_KERNEL_EXEC, .alignment = 1, }, [EXECMEM_BPF] = { -- 2.43.0