# git rev-parse -q --verify 137e0ec05aeb657472d2f84dbb3081016160334b^{commit} 137e0ec05aeb657472d2f84dbb3081016160334b already have revision, skipping fetch # git checkout -q -f -B kisskb 137e0ec05aeb657472d2f84dbb3081016160334b # git clean -qxdf # < git log -1 # commit 137e0ec05aeb657472d2f84dbb3081016160334b # Merge: 005f6f34bd47 5abf6dceb066 # Author: Linus Torvalds # Date: Sun Mar 10 09:27:39 2024 -0700 # # Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm # # Pull kvm fixes from Paolo Bonzini: # "KVM GUEST_MEMFD fixes for 6.8: # # - Make KVM_MEM_GUEST_MEMFD mutually exclusive with KVM_MEM_READONLY # to avoid creating an inconsistent ABI (KVM_MEM_GUEST_MEMFD is not # writable from userspace, so there would be no way to write to a # read-only guest_memfd). # # - Update documentation for KVM_SW_PROTECTED_VM to make it abundantly # clear that such VMs are purely for development and testing. # # - Limit KVM_SW_PROTECTED_VM guests to the TDP MMU, as the long term # plan is to support confidential VMs with deterministic private # memory (SNP and TDX) only in the TDP MMU. # # - Fix a bug in a GUEST_MEMFD dirty logging test that caused false # passes. # # x86 fixes: # # - Fix missing marking of a guest page as dirty when emulating an # atomic access. # # - Check for mmu_notifier invalidation events before faulting in the # pfn, and before acquiring mmu_lock, to avoid unnecessary work and # lock contention with preemptible kernels (including # CONFIG_PREEMPT_DYNAMIC in non-preemptible mode). # # - Disable AMD DebugSwap by default, it breaks VMSA signing and will # be re-enabled with a better VM creation API in 6.10. # # - Do the cache flush of converted pages in svm_register_enc_region() # before dropping kvm->lock, to avoid a race with unregistering of # the same region and the consequent use-after-free issue" # # * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: # SEV: disable SEV-ES DebugSwap by default # KVM: x86/mmu: Retry fault before acquiring mmu_lock if mapping is changing # KVM: SVM: Flush pages under kvm->lock to fix UAF in svm_register_enc_region() # KVM: selftests: Add a testcase to verify GUEST_MEMFD and READONLY are exclusive # KVM: selftests: Create GUEST_MEMFD for relevant invalid flags testcases # KVM: x86/mmu: Restrict KVM_SW_PROTECTED_VM to the TDP MMU # KVM: x86: Update KVM_SW_PROTECTED_VM docs to make it clear they're a WIP # KVM: Make KVM_MEM_GUEST_MEMFD mutually exclusive with KVM_MEM_READONLY # KVM: x86: Mark target gfn of emulated atomic instruction as dirty # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 137e0ec05aeb657472d2f84dbb3081016160334b # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc13 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-13.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/mm/cache-sh2.c:85:13: warning: no previous prototype for 'sh2_cache_init' [-Wmissing-prototypes] 85 | void __init sh2_cache_init(void) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:76:13: warning: no previous prototype for 'kmap_coherent_init' [-Wmissing-prototypes] 76 | void __init kmap_coherent_init(void) | ^~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:80:7: warning: no previous prototype for 'kmap_coherent' [-Wmissing-prototypes] 80 | void *kmap_coherent(struct page *page, unsigned long addr) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/mm/nommu.c:86:6: warning: no previous prototype for 'kunmap_coherent' [-Wmissing-prototypes] 86 | void kunmap_coherent(void *kvaddr) | ^~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/init.c:99:29: warning: no previous prototype for 'l2_cache_init' [-Wmissing-prototypes] 99 | void __attribute__ ((weak)) l2_cache_init(void) | ^~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/return_address.c:49:7: warning: no previous prototype for 'return_address' [-Wmissing-prototypes] 49 | void *return_address(unsigned int depth) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/sys_sh.c:58:16: warning: no previous prototype for 'sys_cacheflush' [-Wmissing-prototypes] 58 | asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op) | ^~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/traps_32.c:735:6: warning: no previous prototype for 'per_cpu_trap_init' [-Wmissing-prototypes] 735 | void per_cpu_trap_init(void) | ^~~~~~~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/hw_breakpoint.c:135:5: warning: no previous prototype for 'arch_bp_generic_fields' [-Wmissing-prototypes] 135 | int arch_bp_generic_fields(int sh_len, int sh_type, | ^~~~~~~~~~~~~~~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc13 # Build took: 0:00:20.757837