# git rev-parse -q --verify 8a071b9c1325c6bfaf22508603b947ab75c1e9db^{commit} 8a071b9c1325c6bfaf22508603b947ab75c1e9db already have revision, skipping fetch # git checkout -q -f -B kisskb 8a071b9c1325c6bfaf22508603b947ab75c1e9db # git clean -qxdf # < git log -1 # commit 8a071b9c1325c6bfaf22508603b947ab75c1e9db # Merge: 9cf7e4647d90 b642e9e5f0dc # Author: Ingo Molnar # Date: Tue Mar 21 13:29:58 2023 +0100 # # Merge branch into tip/master: 'x86/shstk' # # * x86/shstk: # b642e9e5f0dc x86/shstk: Add ARCH_SHSTK_STATUS # d30299329def x86/shstk: Add ARCH_SHSTK_UNLOCK # d84e6ee122e5 x86: Add PTRACE interface for shadow stack # d2a302007b48 selftests/x86: Add shadow stack test # a7c17fd7d856 x86/shstk: Wire in shadow stack interface # 214b23e11864 x86: Expose thread features in /proc/$PID/status # 44600eec3f2b x86/shstk: Support WRSS for userspace # a9d48cbbcc40 x86/shstk: Introduce map_shadow_stack syscall # 48581dd7456d x86/shstk: Handle signals for shadow stack # da07286f0c9a x86/shstk: Introduce routines modifying shstk # 2445a5c30aea x86/shstk: Handle thread shadow stack # 2e30e0071423 x86/shstk: Add user-mode shadow stack support # c40a7569ad82 x86: Introduce userspace API for shadow stack # 6ad563c4b42f x86/mm: Warn if create Write=0,Dirty=1 with raw prot # 50f50f9c47c0 mm: Warn on shadow stack memory in wrong vma # 5dde71115fff x86/mm: Introduce MAP_ABOVE4G # 75818f575af6 mm: Don't allow write GUPs to shadow stack memory # 0cac1da5886c mm: Re-introduce vm_flags to do_mmap() # 4c8e07c3b6db mm/mmap: Add shadow stack pages to memory accounting # 2d4ef6672038 mm: Add guard pages around a shadow stack. # a1d44091f03e x86/mm: Teach pte_mkwrite() about stack memory # 3020efc57c33 x86/mm: Check shadow stack page fault errors # db31a5b7a897 mm: Introduce VM_SHADOW_STACK for shadow stack memory # 5b541538cd8c mm: Move VM_UFFD_MINOR_BIT from 37 to 38 # b349068fa10c x86/mm: Start actually marking _PAGE_SAVED_DIRTY # c169f96ab134 x86/mm: Update ptep/pmdp_set_wrprotect() for _PAGE_SAVED_DIRTY # dee76004d54e x86/mm: Introduce _PAGE_SAVED_DIRTY # 74fd30bd28e4 mm: Make pte_mkwrite() take a VMA # 8df0f3f28add s390/mm: Introduce pmd_mkwrite_kernel() # 2cdecd5f4a15 mm: Introduce pte_mkwrite_kernel() # d2b3a938b6be x86/mm: Move pmd_write(), pud_write() up in the file # 4cecb5493945 x86/mm: Remove _PAGE_DIRTY from kernel RO pages # ac591488436e x86/shstk: Add user control-protection fault handler # 0a3589d0e0ff x86/traps: Move control protection handler to separate file # f2f3528ea37d x86/fpu: Add helper for modifying xstate # 44a100d0b9ee x86/fpu/xstate: Introduce CET MSR and XSAVES supervisor states # d0d3e9a482a3 x86/cpufeatures: Enable CET CR4 bit for shadow stack # d1b5e84f943c x86/cpufeatures: Add CPU feature flags for shadow stacks # f7dabb27de62 x86/shstk: Add Kconfig option for shadow stack # 54759b257ead Documentation/x86: Add CET shadow stack description # # Signed-off-by: Ingo Molnar # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 8a071b9c1325c6bfaf22508603b947ab75c1e9db # < make -s -j 160 ARCH=x86_64 O=/kisskb/build/tip_x86_64-allnoconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux- allnoconfig # < make -s -j 160 ARCH=x86_64 O=/kisskb/build/tip_x86_64-allnoconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 160 ARCH=x86_64 O=/kisskb/build/tip_x86_64-allnoconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig # make -s -j 160 ARCH=x86_64 O=/kisskb/build/tip_x86_64-allnoconfig_x86_64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/tip_x86_64-allnoconfig_x86_64-gcc11 # Build took: 0:02:24.620548