# 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/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 137e0ec05aeb657472d2f84dbb3081016160334b # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:14884:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/include/linux/string.h:292, from /kisskb/src/include/linux/bitmap.h:12, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/smp.h:13, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:67, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:60, from /kisskb/src/include/linux/jiffies.h:10, from /kisskb/src/include/linux/ktime.h:25, from /kisskb/src/include/linux/iopoll.h:11, from /kisskb/src/drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.c:3: In function 'fortify_memcpy_chk', inlined from 'adf_gen4_init_thd2arb_map' at /kisskb/src/drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.c:401:3: /kisskb/src/include/linux/fortify-string.h:528:4: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror] __write_overflow_field(p_size_field, size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/fortify-string.h:537:4: error: call to '__read_overflow2_field' declared with attribute warning: detected read beyond size of field (2nd parameter); maybe use struct_group()? [-Werror] __read_overflow2_field(q_size_field, size); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[8]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/crypto/intel/qat/qat_common/adf_gen4_hw_data.o] Error 1 make[7]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/crypto/intel/qat/qat_common] Error 2 make[6]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/crypto/intel/qat] Error 2 make[5]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/crypto/intel] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/crypto] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:481: drivers] Error 2 make[2]: *** [/kisskb/src/Makefile:1921: .] Error 2 make[1]: *** [/kisskb/src/Makefile:240: __sub-make] Error 2 make: *** [Makefile:240: __sub-make] Error 2 Command 'make -s -j 40 ARCH=mips O=/kisskb/build/linus_allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_mips-gcc8 # Build took: 0:08:35.667930