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 777261A9F97 for ; Sun, 19 Jul 2026 09:31:21 +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=1784453485; cv=none; b=Q/kQz9evfSPL3KhT1scI7lOrPqKKROkpU01s/Ywff4c9h7BcKlZP12drYMfkdsljnVfU2pLKcLRNAxzOSAMP+aJohRFrKXybzNIp44UNhrft0Yh+zGNRmuHk9PMRfjGV1hwEsmI/LUFR5SRRu4P3mPFsH2C2w6jwUf9zUkniUck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784453485; c=relaxed/simple; bh=7cXKkNkoR+stoMJK/w86pYpVQnRPewJU3aLnslEXxQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RKCkrCKxmCpfc7FFWPRy0IVxX2FBH1I/hSm3p0VfOZ8giaETbomMKaDNUTwbjCBkzppt+DvLUCY0GdRgoncsjQMQIItO+rdlfW1idGMqB0utP6cLoev8aIwP46BIcfYZeKqpIv3cJYoYFgiwiMaErw5r2uSQT7rjhmAElQV9YF0= 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=cvNWvo2+; 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="cvNWvo2+" 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=MR 1em4uw38DdLU279Tm9E4dNiS95LkceEmY7y3H4yaA=; b=cvNWvo2+HHlc8/5vsF UFqnRKBSg6KvqdT4Apkl93UR9ddCNjqdRoTI+G7yyiXnOcwfdi9nPGTTIS3TLJeF 2YNJZ925PShUT3gZzKsn1rbyuAwAeoEdHum5HpjhKNqtLV16RAjQGbhwWTsuizgs liRKAqr97GaDR7J09E0H+jdxE= Received: from Ubuntu.. (unknown []) by gzsmtp4 (Coremail) with SMTP id PygvCgCnTyswmVxqbA0SIA--.60699S3; Sun, 19 Jul 2026 17:30:25 +0800 (CST) From: Xiaofeng Yuan To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: Alexandre Ghiti , Nam Cao , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/2] riscv: mm: make EXECMEM_KPROBES writable without CONFIG_STRICT_MODULE_RWX Date: Sun, 19 Jul 2026 09:30:23 +0000 Message-ID: <20260719093024.33351-2-xiaofengmian@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260719093024.33351-1-xiaofengmian@163.com> References: <20260719093024.33351-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:PygvCgCnTyswmVxqbA0SIA--.60699S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Xw43Cw1DJF43uF15XrWrZrb_yoW8JrWxpr ZrCr45uFZ3Wr4Yy39ruw48ur4DAanIya17tw1jkry3t3yjyr90qrn8Xr17Xry8WF4Uua1x ZFn3uryfCayjka7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uuv35UUUUU= X-CM-SenderInfo: p0ld0w5hqjzxldq6il2tof0z/xtbDAREkJ2pcmTH-EAAA3i When CONFIG_STRICT_MODULE_RWX 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_STRICT_MODULE_RWX is not available. Signed-off-by: Xiaofeng Yuan --- v2: use CONFIG_STRICT_MODULE_RWX instead of CONFIG_ARCH_HAS_EXECMEM_ROX (per Nam Cao's review) 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 5b1b3c88b4..c3367ff35b 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_STRICT_MODULE_RWX) ? + PAGE_KERNEL_READ_EXEC : + PAGE_KERNEL_EXEC, .alignment = 1, }, [EXECMEM_BPF] = { -- 2.43.0