From: Deepak Gupta <debug@rivosinc.com>
To: Vlastimil Babka <vbabka@suse.cz>
Cc: 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>,
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>,
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
Subject: Re: [PATCH v9 01/26] mm: helper `is_shadow_stack_vma` to check shadow stack vma
Date: Fri, 7 Feb 2025 15:44:27 -0800 [thread overview]
Message-ID: <Z6aa24/5M5Xdhe/A@debug.ba.rivosinc.com> (raw)
In-Reply-To: <6543c6b6-da86-4c10-9b8c-e5fe6f6f7da9@suse.cz>
On Fri, Feb 07, 2025 at 10:27:10AM +0100, Vlastimil Babka wrote:
>On 2/5/25 02:21, Deepak Gupta wrote:
>> VM_SHADOW_STACK (alias to VM_HIGH_ARCH_5) is used to encode shadow stack
>
>I see that arm GCS uses VM_HIGH_ARCH_6.
>
>> VMA on three architectures (x86 shadow stack, arm GCS and RISC-V shadow
>
>And RISC-V doesn't define it at all, not even in this patchset, or did I
>miss it somewhere?
>
hmm...
Something wrong in my workflow and rebasing.
Thanks for catching this.
>> stack). In case architecture doesn't implement shadow stack, it's VM_NONE
>> Introducing a helper `is_shadow_stack_vma` to determine shadow stack vma
>> or not.
>
>This looks like an unfinished sentence. As if it was to continue with "...
>will allow us to ..." what?
>
>I'm not against a helper but this changelog is rather confusing and also
>code in arch/x86 and arch/arm64 isn't converted to the helper but testing
>VM_SHADOW_STACK still.
>
>> Signed-off-by: Deepak Gupta <debug@rivosinc.com>
>> Reviewed-by: Mark Brown <broonie@kernel.org>
>> ---
>> mm/gup.c | 2 +-
>> mm/mmap.c | 2 +-
>> mm/vma.h | 10 +++++++---
>> 3 files changed, 9 insertions(+), 5 deletions(-)
>>
>> diff --git a/mm/gup.c b/mm/gup.c
>> index 3883b307780e..8c64f3ff34ab 100644
>> --- a/mm/gup.c
>> +++ b/mm/gup.c
>> @@ -1291,7 +1291,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags)
>> !writable_file_mapping_allowed(vma, gup_flags))
>> return -EFAULT;
>>
>> - if (!(vm_flags & VM_WRITE) || (vm_flags & VM_SHADOW_STACK)) {
>> + if (!(vm_flags & VM_WRITE) || is_shadow_stack_vma(vm_flags)) {
>> if (!(gup_flags & FOLL_FORCE))
>> return -EFAULT;
>> /*
>> diff --git a/mm/mmap.c b/mm/mmap.c
>> index cda01071c7b1..7b6be4eec35d 100644
>> --- a/mm/mmap.c
>> +++ b/mm/mmap.c
>> @@ -648,7 +648,7 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
>> */
>> static inline unsigned long stack_guard_placement(vm_flags_t vm_flags)
>> {
>> - if (vm_flags & VM_SHADOW_STACK)
>> + if (is_shadow_stack_vma(vm_flags))
>> return PAGE_SIZE;
>>
>> return 0;
>> diff --git a/mm/vma.h b/mm/vma.h
>> index a2e8710b8c47..47482a25f5c3 100644
>> --- a/mm/vma.h
>> +++ b/mm/vma.h
>> @@ -278,7 +278,7 @@ static inline struct vm_area_struct *vma_prev_limit(struct vma_iterator *vmi,
>> }
>>
>> /*
>> - * These three helpers classifies VMAs for virtual memory accounting.
>> + * These four helpers classifies VMAs for virtual memory accounting.
>> */
>>
>> /*
>> @@ -289,6 +289,11 @@ static inline bool is_exec_mapping(vm_flags_t flags)
>> return (flags & (VM_EXEC | VM_WRITE | VM_STACK)) == VM_EXEC;
>> }
>>
>> +static inline bool is_shadow_stack_vma(vm_flags_t vm_flags)
>> +{
>> + return !!(vm_flags & VM_SHADOW_STACK);
>> +}
>> +
>> /*
>> * Stack area (including shadow stacks)
>> *
>> @@ -297,7 +302,7 @@ static inline bool is_exec_mapping(vm_flags_t flags)
>> */
>> static inline bool is_stack_mapping(vm_flags_t flags)
>> {
>> - return ((flags & VM_STACK) == VM_STACK) || (flags & VM_SHADOW_STACK);
>> + return ((flags & VM_STACK) == VM_STACK) || is_shadow_stack_vma(flags);
>> }
>>
>> /*
>> @@ -308,7 +313,6 @@ static inline bool is_data_mapping(vm_flags_t flags)
>> return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
>> }
>>
>> -
>> static inline void vma_iter_config(struct vma_iterator *vmi,
>> unsigned long index, unsigned long last)
>> {
>>
>
next prev parent reply other threads:[~2025-02-07 23:44 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 1:21 [PATCH v9 00/26] riscv control-flow integrity for usermode Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 01/26] mm: helper `is_shadow_stack_vma` to check shadow stack vma Deepak Gupta
2025-02-07 9:27 ` Vlastimil Babka
2025-02-07 20:06 ` Mark Brown
2025-02-07 22:44 ` Deepak Gupta
2025-02-07 22:44 ` Deepak Gupta
2025-02-07 23:44 ` Deepak Gupta [this message]
2025-02-07 23:52 ` Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 02/26] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 03/26] riscv: zicfiss / zicfilp enumeration Deepak Gupta
2025-02-06 13:50 ` Clément Léger
2025-02-07 23:25 ` Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 04/26] riscv: zicfiss / zicfilp extension csr and bit definitions Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 05/26] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 06/26] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 07/26] riscv mm: manufacture shadow stack pte Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 08/26] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 09/26] riscv mmu: write protect and shadow stack Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 10/26] riscv/mm: Implement map_shadow_stack() syscall Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 11/26] riscv/shstk: If needed allocate a new shadow stack on clone Deepak Gupta
2025-02-05 1:21 ` [PATCH v9 12/26] riscv: Implements arch agnostic shadow stack prctls Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 13/26] prctl: arch-agnostic prctl for indirect branch tracking Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 14/26] riscv/traps: Introduce software check exception Deepak Gupta
2025-02-06 13:49 ` Clément Léger
2025-02-07 21:26 ` Deepak Gupta
2025-02-10 7:42 ` Clément Léger
2025-02-05 1:22 ` [PATCH v9 15/26] riscv: signal: abstract header saving for setup_sigcontext Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 16/26] riscv/signal: save and restore of shadow stack for signal Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 17/26] riscv/kernel: update __show_regs to print shadow stack register Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 18/26] riscv/ptrace: riscv cfi status and state via ptrace and in core files Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 19/26] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 20/26] riscv: Add Firmware Feature SBI extensions definitions Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 21/26] riscv: enable kernel access to shadow stack memory via FWFT sbi call Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 22/26] riscv: kernel command line option to opt out of user cfi Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 23/26] riscv: create a config for shadow stack and landing pad instr support Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 24/26] riscv: Documentation for landing pad / indirect branch tracking Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 25/26] riscv: Documentation for shadow stack on riscv Deepak Gupta
2025-02-05 1:22 ` [PATCH v9 26/26] kselftest/riscv: kselftest for user mode cfi 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=Z6aa24/5M5Xdhe/A@debug.ba.rivosinc.com \
--to=debug@rivosinc.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=alexghiti@rivosinc.com \
--cc=alistair.francis@wdc.com \
--cc=andybnac@gmail.com \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=atishp@rivosinc.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=devicetree@vger.kernel.org \
--cc=ebiederm@xmission.com \
--cc=evan@rivosinc.com \
--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=mingo@redhat.com \
--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=samitolvanen@google.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).