# 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-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 137e0ec05aeb657472d2f84dbb3081016160334b # make -s -j 40 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- x86_64_defconfig # < make -s -j 40 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- help # make -s -j 40 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- olddefconfig # make -s -j 40 ARCH=x86 O=/kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/x86_64-linux/bin/x86_64-linux- Completed OK # rm -rf /kisskb/build/linus_x86_64_defconfig_x86_64-gcc8 # Build took: 0:01:32.744122