Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86: shstk: use the new common vm_mmap_shadow_stack() helper

Replace part of the x86 alloc_shstk() content with a call to
vm_mmap_shadow_stack(). There is no functional change.

Link: https://lkml.kernel.org/r/20260225161404.3157851-5-catalin.marinas@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Tested-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: David Hildenbrand (Arm) <david@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Deepak Gupta <debug@rivosinc.com>
Cc: "Liam R. Howlett" <Liam.Howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Catalin Marinas and committed by
Andrew Morton
a515ffc9 fecd446f

+2 -10
+2 -10
arch/x86/kernel/shstk.c
··· 100 100 static unsigned long alloc_shstk(unsigned long addr, unsigned long size, 101 101 unsigned long token_offset, bool set_res_tok) 102 102 { 103 - int flags = MAP_ANONYMOUS | MAP_PRIVATE | MAP_ABOVE4G; 104 - struct mm_struct *mm = current->mm; 105 - unsigned long mapped_addr, unused; 103 + unsigned long mapped_addr; 106 104 107 - if (addr) 108 - flags |= MAP_FIXED_NOREPLACE; 109 - 110 - mmap_write_lock(mm); 111 - mapped_addr = do_mmap(NULL, addr, size, PROT_READ, flags, 112 - VM_SHADOW_STACK | VM_WRITE, 0, &unused, NULL); 113 - mmap_write_unlock(mm); 105 + mapped_addr = vm_mmap_shadow_stack(addr, size, MAP_ABOVE4G); 114 106 115 107 if (!set_res_tok || IS_ERR_VALUE(mapped_addr)) 116 108 goto out;