From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (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 40A3F39446B for ; Mon, 20 Jul 2026 03:23:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517839; cv=none; b=A0QDeLGF74THmHllMc+iOHxpq+f5N+o6mnqtU9ZWD8k3RJASNpjnSB4Y5DT5ntFLp9V9ln9BdCbbpTmofyaCxoP11RUHH2E9J2u4dd5a1qQi4L4HNERGVLNaLVixh7Ycu4cCIrQGdT4RedA+d9cy+cT6QbbF7KxCqW181HxJzvg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784517839; c=relaxed/simple; bh=0FStFLpRem1qEC/2/F+ynKkdHaKvyc/nHKBpxtlWsAo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n4lrquOrGThjnQxkxOK11BPr0tu1bKJvf1h8nnIeVKa/gdMHCTjAbxdo/4/VFBvdLBj1i1BS0keVmap+3grq6QEz0Q1pW+TFow2m6BKNp6SzFbiJidpseymUB058B7cvGmZ10NhQ4jsRiyktz/vV+4XoDEqGPFr+5f7Wjc5QLe0= 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=J2Mzkjz/; arc=none smtp.client-ip=220.197.31.5 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="J2Mzkjz/" 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=CQ bEMG8C6NQudrZtH6JGNGhbxssqV+FTapBCimwsn+Q=; b=J2Mzkjz/31UW6MGAf0 5uv8veLaUDyDenbNUovT/xUqMzwiYoIqg1EnK5N96yV1GZbYWBJc/y7VO1GtvZfy NmkTGPIWEE4IZKCsUW9ypTudj881tdAj+OcSOPkhxvLqGz55psvWJqBJ0dHeoRQN i+s1wFnPOtoXryP7b45XnpTTM= Received: from Ubuntu.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgBH+wKTlF1qrd2XIg--.2654S3; Mon, 20 Jul 2026 11:23:01 +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, xiaofengmian@163.com Subject: [PATCH v4 1/2] riscv: mm: make EXECMEM_KPROBES writable without CONFIG_STRICT_MODULE_RWX Date: Mon, 20 Jul 2026 03:22:56 +0000 Message-ID: <20260720032258.5188-2-xiaofengmian@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260720032258.5188-1-xiaofengmian@163.com> References: <20260720032258.5188-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:PigvCgBH+wKTlF1qrd2XIg--.2654S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Xw43Cw1DJF43uF15XrWrZrb_yoW8JrW5pr ZrAr45ZFZ7Xr4Yk3y7u3y8ur4DAanIya13Jw1jyryYq3yjy390qr95Zr1xXry8WF1Uuayx ZFna9r93Aayjka7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pi7UUUUUUUU= X-CM-SenderInfo: p0ld0w5hqjzxldq6il2tof0z/xtbDARU8P2pdlJU6HwAA3E 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) v3: add commit description v4: fix indent alignment (per Nam Cao's review) diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 5b1b3c88b4..7951d72a12 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