# git rev-parse -q --verify 79e06c4c4950be2abd8ca5d2428a8c915aa62c24^{commit} 79e06c4c4950be2abd8ca5d2428a8c915aa62c24 already have revision, skipping fetch # git checkout -q -f -B kisskb 79e06c4c4950be2abd8ca5d2428a8c915aa62c24 # git clean -qxdf # < git log -1 # commit 79e06c4c4950be2abd8ca5d2428a8c915aa62c24 # Merge: cb3f09f9afe5 c862dcd19975 # Author: Linus Torvalds # Date: Sun Jan 16 16:15:14 2022 +0200 # # Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm # # Pull kvm updates from Paolo Bonzini: # "RISCV: # # - Use common KVM implementation of MMU memory caches # # - SBI v0.2 support for Guest # # - Initial KVM selftests support # # - Fix to avoid spurious virtual interrupts after clearing hideleg CSR # # - Update email address for Anup and Atish # # ARM: # # - Simplification of the 'vcpu first run' by integrating it into KVM's # 'pid change' flow # # - Refactoring of the FP and SVE state tracking, also leading to a # simpler state and less shared data between EL1 and EL2 in the nVHE # case # # - Tidy up the header file usage for the nvhe hyp object # # - New HYP unsharing mechanism, finally allowing pages to be unmapped # from the Stage-1 EL2 page-tables # # - Various pKVM cleanups around refcounting and sharing # # - A couple of vgic fixes for bugs that would trigger once the vcpu # xarray rework is merged, but not sooner # # - Add minimal support for ARMv8.7's PMU extension # # - Rework kvm_pgtable initialisation ahead of the NV work # # - New selftest for IRQ injection # # - Teach selftests about the lack of default IPA space and page sizes # # - Expand sysreg selftest to deal with Pointer Authentication # # - The usual bunch of cleanups and doc update # # s390: # # - fix sigp sense/start/stop/inconsistency # # - cleanups # # x86: # # - Clean up some function prototypes more # # - improved gfn_to_pfn_cache with proper invalidation, used by Xen # emulation # # - add KVM_IRQ_ROUTING_XEN_EVTCHN and event channel delivery # # - completely remove potential TOC/TOU races in nested SVM consistency # checks # # - update some PMCs on emulated instructions # # - Intel AMX support (joint work between Thomas and Intel) # # - large MMU cleanups # # - module parameter to disable PMU virtualization # # - cleanup register cache # # - first part of halt handling cleanups # # - Hyper-V enlightened MSR bitmap support for nested hypervisors # # Generic: # # - clean up Makefiles # # - introduce CONFIG_HAVE_KVM_DIRTY_RING # # - optimize memslot lookup using a tree # # - optimize vCPU array usage by converting to xarray" # # * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (268 commits) # x86/fpu: Fix inline prefix warnings # selftest: kvm: Add amx selftest # selftest: kvm: Move struct kvm_x86_state to header # selftest: kvm: Reorder vcpu_load_state steps for AMX # kvm: x86: Disable interception for IA32_XFD on demand # x86/fpu: Provide fpu_sync_guest_vmexit_xfd_state() # kvm: selftests: Add support for KVM_CAP_XSAVE2 # kvm: x86: Add support for getting/setting expanded xstate buffer # x86/fpu: Add uabi_size to guest_fpu # kvm: x86: Add CPUID support for Intel AMX # kvm: x86: Add XCR0 support for Intel AMX # kvm: x86: Disable RDMSR interception of IA32_XFD_ERR # kvm: x86: Emulate IA32_XFD_ERR for guest # kvm: x86: Intercept #NM for saving IA32_XFD_ERR # x86/fpu: Prepare xfd_err in struct fpu_guest # kvm: x86: Add emulation for IA32_XFD # x86/fpu: Provide fpu_update_guest_xfd() for IA32_XFD emulation # kvm: x86: Enable dynamic xfeatures at KVM_SET_CPUID2 # x86/fpu: Provide fpu_enable_guest_xfd_features() for KVM # x86/fpu: Add guest support to xfd_enable_feature() # ... # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 79e06c4c4950be2abd8ca5d2428a8c915aa62c24 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:11983:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11986:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11988:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11990:warning: override: reassigning to symbol UML_NET_SLIP .config:11993:warning: override: reassigning to symbol UML_NET_MCAST .config:11995:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/kernel/sysctl.c:125:12: error: 'one_thousand' defined but not used [-Werror=unused-variable] static int one_thousand = 1000; ^ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:289: kernel/sysctl.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/arch/x86/um/asm/processor.h:41:0, from /kisskb/src/include/linux/mutex.h:19, from /kisskb/src/include/linux/kernfs.h:11, from /kisskb/src/include/linux/sysfs.h:16, from /kisskb/src/include/linux/kobject.h:20, from /kisskb/src/include/linux/pci.h:35, from /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:25: /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c: In function 'kfd_cpumask_to_apic_id': /kisskb/src/arch/um/include/asm/processor-generic.h:103:18: error: called object is not a function or function pointer #define cpu_data (&boot_cpu_data) ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1556:9: note: in expansion of macro 'cpu_data' return cpu_data(first_cpu_of_numa_node).apicid; ^ /kisskb/src/drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.c:1560:1: error: control reaches end of non-void function [-Werror=return-type] } ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_topology.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm/amd/amdgpu] Error 2 make[4]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c: In function 'vfio_pci_vga_rw': /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:11: error: implicit declaration of function 'ioport_map' [-Werror=implicit-function-declaration] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:317:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3b0, 0x3bb - 0x3b0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:324:9: error: assignment makes pointer from integer without a cast [-Werror=int-conversion] iomem = ioport_map(0x3c0, 0x3df - 0x3c0 + 1); ^ /kisskb/src/drivers/vfio/pci/vfio_pci_rdwr.c:338:15: error: implicit declaration of function 'ioport_unmap' [-Werror=implicit-function-declaration] is_ioport ? ioport_unmap(iomem) : iounmap(iomem); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/vfio/pci/vfio_pci_rdwr.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio/pci] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/vfio] Error 2 make[2]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/gpu] Error 2 make[1]: *** [/kisskb/src/Makefile:1840: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:13:21.144755