From: Deepak Gupta via B4 Relay <devnull+debug.rivosinc.com@kernel.org>
To: "Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Lorenzo Stoakes" <lorenzo.stoakes@oracle.com>,
"Paul Walmsley" <paul.walmsley@sifive.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Conor Dooley" <conor@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Arnd Bergmann" <arnd@arndb.de>,
"Christian Brauner" <brauner@kernel.org>,
"Peter Zijlstra" <peterz@infradead.org>,
"Oleg Nesterov" <oleg@redhat.com>,
"Eric Biederman" <ebiederm@xmission.com>,
"Kees Cook" <kees@kernel.org>, "Jonathan Corbet" <corbet@lwn.net>,
"Shuah Khan" <shuah@kernel.org>, "Jann Horn" <jannh@google.com>,
"Conor Dooley" <conor+dt@kernel.org>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Benno Lossin" <lossin@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-riscv@lists.infradead.org,
devicetree@vger.kernel.org, linux-arch@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
alistair.francis@wdc.com, richard.henderson@linaro.org,
jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com,
charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com,
cleger@rivosinc.com, alexghiti@rivosinc.com,
samitolvanen@google.com, broonie@kernel.org,
rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org,
Zong Li <zong.li@sifive.com>, Deepak Gupta <debug@rivosinc.com>
Subject: [PATCH v22 09/28] riscv/mm: write protect and shadow stack
Date: Thu, 23 Oct 2025 09:51:14 -0700 [thread overview]
Message-ID: <20251023-v5_user_cfi_series-v22-9-1935270f7636@rivosinc.com> (raw)
In-Reply-To: <20251023-v5_user_cfi_series-v22-0-1935270f7636@rivosinc.com>
From: Deepak Gupta <debug@rivosinc.com>
`fork` implements copy on write (COW) by making pages readonly in child
and parent both.
ptep_set_wrprotect and pte_wrprotect clears _PAGE_WRITE in PTE.
Assumption is that page is readable and on fault copy on write happens.
To implement COW on shadow stack pages, clearing up W bit makes them XWR =
000. This will result in wrong PTE setting which says no perms but V=1 and
PFN field pointing to final page. Instead desired behavior is to turn it
into a readable page, take an access (load/store) fault on sspush/sspop
(shadow stack) and then perform COW on such pages. This way regular reads
would still be allowed and not lead to COW maintaining current behavior
of COW on non-shadow stack but writeable memory.
On the other hand it doesn't interfere with existing COW for read-write
memory. Assumption is always that _PAGE_READ must have been set and thus
setting _PAGE_READ is harmless.
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Zong Li <zong.li@sifive.com>
Signed-off-by: Deepak Gupta <debug@rivosinc.com>
---
arch/riscv/include/asm/pgtable.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index b03e8f85221f..df4a04b64944 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -415,7 +415,7 @@ static inline int pte_special(pte_t pte)
static inline pte_t pte_wrprotect(pte_t pte)
{
- return __pte(pte_val(pte) & ~(_PAGE_WRITE));
+ return __pte((pte_val(pte) & ~(_PAGE_WRITE)) | (_PAGE_READ));
}
/* static inline pte_t pte_mkread(pte_t pte) */
@@ -611,7 +611,15 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
static inline void ptep_set_wrprotect(struct mm_struct *mm,
unsigned long address, pte_t *ptep)
{
- atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep);
+ pte_t read_pte = READ_ONCE(*ptep);
+ /*
+ * ptep_set_wrprotect can be called for shadow stack ranges too.
+ * shadow stack memory is XWR = 010 and thus clearing _PAGE_WRITE will lead to
+ * encoding 000b which is wrong encoding with V = 1. This should lead to page fault
+ * but we dont want this wrong configuration to be set in page tables.
+ */
+ atomic_long_set((atomic_long_t *)ptep,
+ ((pte_val(read_pte) & ~(unsigned long)_PAGE_WRITE) | _PAGE_READ));
}
#define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
--
2.43.0
next prev parent reply other threads:[~2025-10-23 16:51 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-23 16:51 [PATCH v22 00/28] riscv control-flow integrity for usermode Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 01/28] mm: VM_SHADOW_STACK definition for riscv Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 02/28] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 03/28] riscv: zicfiss / zicfilp enumeration Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 04/28] riscv: zicfiss / zicfilp extension csr and bit definitions Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 05/28] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 06/28] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 07/28] riscv/mm: manufacture shadow stack pte Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 08/28] riscv/mm: teach pte_mkwrite to manufacture shadow stack PTEs Deepak Gupta via B4 Relay
2025-10-23 16:51 ` Deepak Gupta via B4 Relay [this message]
2025-10-23 16:51 ` [PATCH v22 10/28] riscv/mm: Implement map_shadow_stack() syscall Deepak Gupta via B4 Relay
2025-10-31 19:48 ` Paul Walmsley
2025-11-02 23:51 ` Maciej W. Rozycki
2025-10-23 16:51 ` [PATCH v22 11/28] riscv/shstk: If needed allocate a new shadow stack on clone Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 12/28] riscv: Implements arch agnostic shadow stack prctls Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 13/28] prctl: arch-agnostic prctl for indirect branch tracking Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 14/28] riscv: Implements arch agnostic indirect branch tracking prctls Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 15/28] riscv/traps: Introduce software check exception and uprobe handling Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 16/28] riscv: signal: abstract header saving for setup_sigcontext Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 17/28] riscv/signal: save and restore of shadow stack for signal Deepak Gupta via B4 Relay
2025-10-31 20:07 ` Paul Walmsley
2025-10-31 22:10 ` Randy Dunlap
2025-11-04 7:52 ` Paul Walmsley
2025-10-23 16:51 ` [PATCH v22 18/28] riscv/kernel: update __show_regs to print shadow stack register Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 19/28] riscv/ptrace: riscv cfi status and state via ptrace and in core files Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 20/28] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 21/28] riscv: kernel command line option to opt out of user cfi Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 22/28] riscv: enable kernel access to shadow stack memory via FWFT sbi call Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 23/28] arch/riscv: compile vdso with landing pad and shadow stack note Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 24/28] arch/riscv: dual vdso creation logic and select vdso based on hw Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 25/28] riscv: create a config for shadow stack and landing pad instr support Deepak Gupta via B4 Relay
2025-11-11 5:58 ` Zong Li
2025-11-11 18:22 ` Deepak Gupta
2025-11-12 2:19 ` Zong Li
2025-10-23 16:51 ` [PATCH v22 26/28] riscv: Documentation for landing pad / indirect branch tracking Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 27/28] riscv: Documentation for shadow stack on riscv Deepak Gupta via B4 Relay
2025-10-23 16:51 ` [PATCH v22 28/28] kselftest/riscv: kselftest for user mode cfi Deepak Gupta via B4 Relay
2025-10-23 23:20 ` [PATCH v22 00/28] riscv control-flow integrity for usermode Deepak Gupta
-- strict thread matches above, loose matches on Subject: below --
2025-10-23 13:25 Deepak Gupta
2025-10-23 13:25 ` [PATCH v22 09/28] riscv/mm: write protect and shadow stack Deepak Gupta
2025-10-22 23:29 [PATCH v22 00/28] riscv control-flow integrity for usermode Deepak Gupta
2025-10-22 23:29 ` [PATCH v22 09/28] riscv/mm: write protect and shadow stack Deepak Gupta
2025-10-20 20:53 [PATCH v22 00/28] riscv control-flow integrity for usermode Deepak Gupta
2025-10-20 20:53 ` [PATCH v22 09/28] riscv/mm: write protect and shadow stack Deepak Gupta
2025-10-20 20:22 [PATCH v22 00/28] riscv control-flow integrity for usermode Deepak Gupta
2025-10-20 20:22 ` [PATCH v22 09/28] riscv/mm: write protect and shadow stack Deepak Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251023-v5_user_cfi_series-v22-9-1935270f7636@rivosinc.com \
--to=devnull+debug.rivosinc.com@kernel.org \
--cc=Liam.Howlett@oracle.com \
--cc=a.hindborg@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alex.gaynor@gmail.com \
--cc=alexghiti@rivosinc.com \
--cc=aliceryhl@google.com \
--cc=alistair.francis@wdc.com \
--cc=andybnac@gmail.com \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=atishp@rivosinc.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=bp@alien8.de \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=charlie@rivosinc.com \
--cc=cleger@rivosinc.com \
--cc=conor+dt@kernel.org \
--cc=conor@kernel.org \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=debug@rivosinc.com \
--cc=devicetree@vger.kernel.org \
--cc=ebiederm@xmission.com \
--cc=evan@rivosinc.com \
--cc=gary@garyguo.net \
--cc=hpa@zytor.com \
--cc=jannh@google.com \
--cc=jim.shu@sifive.com \
--cc=kees@kernel.org \
--cc=kito.cheng@sifive.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=lossin@kernel.org \
--cc=mingo@redhat.com \
--cc=ojeda@kernel.org \
--cc=oleg@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=richard.henderson@linaro.org \
--cc=rick.p.edgecombe@intel.com \
--cc=robh@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=samitolvanen@google.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=tmgross@umich.edu \
--cc=vbabka@suse.cz \
--cc=x86@kernel.org \
--cc=zong.li@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox