# 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-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 137e0ec05aeb657472d2f84dbb3081016160334b # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 40 ARCH=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] cc1: warning: unrecognized command line option '-Wno-shift-negative-value' cc1: warning: unrecognized command line option '-Wno-stringop-overflow' /kisskb/src/arch/sparc/vdso/vma.c:246:12: error: no previous prototype for 'init_vdso_image' [-Werror=missing-prototypes] int __init init_vdso_image(const struct vdso_image *image, ^ /kisskb/src/arch/sparc/power/hibernate.c:22:5: error: no previous prototype for 'pfn_is_nosave' [-Werror=missing-prototypes] int pfn_is_nosave(unsigned long pfn) ^ /kisskb/src/arch/sparc/power/hibernate.c:30:6: error: no previous prototype for 'save_processor_state' [-Werror=missing-prototypes] void save_processor_state(void) ^ /kisskb/src/arch/sparc/power/hibernate.c:35:6: error: no previous prototype for 'restore_processor_state' [-Werror=missing-prototypes] void restore_processor_state(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/power/hibernate.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/power] Error 2 make[3]: *** Waiting for unfinished jobs.... cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/vdso/vma.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/vdso] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/kernel/traps_64.c:253:6: error: no previous prototype for 'is_no_fault_exception' [-Werror=missing-prototypes] bool is_no_fault_exception(struct pt_regs *regs) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2035:6: error: no previous prototype for 'do_mcd_err' [-Werror=missing-prototypes] void do_mcd_err(struct pt_regs *regs, struct sun4v_error_entry ent) ^ /kisskb/src/arch/sparc/kernel/traps_64.c:2153:6: error: no previous prototype for 'sun4v_nonresum_error_user_handled' [-Werror=missing-prototypes] bool sun4v_nonresum_error_user_handled(struct pt_regs *regs, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/kernel/traps_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/kernel] Error 2 /kisskb/src/arch/sparc/prom/misc_64.c:165:5: error: no previous prototype for 'prom_get_mmu_ihandle' [-Werror=missing-prototypes] int prom_get_mmu_ihandle(void) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/prom/misc_64.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/prom] Error 2 /kisskb/src/arch/sparc/mm/init_64.c:2644:6: error: no previous prototype for 'vmemmap_free' [-Werror=missing-prototypes] void vmemmap_free(unsigned long start, unsigned long end, ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: arch/sparc/mm/init_64.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc/mm] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:481: arch/sparc] Error 2 In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:200:13: error: no previous prototype for 'sparc_floppy_irq' [-Werror=missing-prototypes] irqreturn_t sparc_floppy_irq(int irq, void *dev_cookie) ^ In file included from /kisskb/src/arch/sparc/include/asm/floppy.h:5:0, from /kisskb/src/drivers/block/floppy.c:250: /kisskb/src/arch/sparc/include/asm/floppy_64.h:437:6: error: no previous prototype for 'sun_pci_fd_dma_callback' [-Werror=missing-prototypes] void sun_pci_fd_dma_callback(struct ebus_dma_info *p, int event, void *cookie) ^ cc1: error: unrecognized command line option '-Wno-shift-negative-value' [-Werror] cc1: error: unrecognized command line option '-Wno-stringop-overflow' [-Werror] cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:243: drivers/block/floppy.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:481: drivers/block] 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=sparc64 O=/kisskb/build/linus_allmodconfig_sparc64-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_sparc64-gcc5 # Build took: 0:03:48.595703