# git rev-parse -q --verify 24625f7d91fb86b91e14749633a7f022f5866116^{commit} 24625f7d91fb86b91e14749633a7f022f5866116 already have revision, skipping fetch # git checkout -q -f -B kisskb 24625f7d91fb86b91e14749633a7f022f5866116 # git clean -qxdf # < git log -1 # commit 24625f7d91fb86b91e14749633a7f022f5866116 # Merge: 8e8afafb0b55 e0f3f46e4206 # Author: Linus Torvalds # Date: Tue Jun 14 07:57:18 2022 -0700 # # Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm # # Pull kvm fixes from Paolo Bonzini: # "While last week's pull request contained miscellaneous fixes for x86, # this one covers other architectures, selftests changes, and a bigger # series for APIC virtualization bugs that were discovered during 5.20 # development. The idea is to base 5.20 development for KVM on top of # this tag. # # ARM64: # # - Properly reset the SVE/SME flags on vcpu load # # - Fix a vgic-v2 regression regarding accessing the pending state of a # HW interrupt from userspace (and make the code common with vgic-v3) # # - Fix access to the idreg range for protected guests # # - Ignore 'kvm-arm.mode=protected' when using VHE # # - Return an error from kvm_arch_init_vm() on allocation failure # # - A bunch of small cleanups (comments, annotations, indentation) # # RISC-V: # # - Typo fix in arch/riscv/kvm/vmid.c # # - Remove broken reference pattern from MAINTAINERS entry # # x86-64: # # - Fix error in page tables with MKTME enabled # # - Dirty page tracking performance test extended to running a nested # guest # # - Disable APICv/AVIC in cases that it cannot implement correctly" # # [ This merge also fixes a misplaced end parenthesis bug introduced in # commit 3743c2f02517 ("KVM: x86: inhibit APICv/AVIC on changes to APIC # ID or APIC base") pointed out by Sean Christopherson ] # # Link: https://lore.kernel.org/all/20220610191813.371682-1-seanjc@google.com/ # # * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (34 commits) # KVM: selftests: Restrict test region to 48-bit physical addresses when using nested # KVM: selftests: Add option to run dirty_log_perf_test vCPUs in L2 # KVM: selftests: Clean up LIBKVM files in Makefile # KVM: selftests: Link selftests directly with lib object files # KVM: selftests: Drop unnecessary rule for STATIC_LIBS # KVM: selftests: Add a helper to check EPT/VPID capabilities # KVM: selftests: Move VMX_EPT_VPID_CAP_AD_BITS to vmx.h # KVM: selftests: Refactor nested_map() to specify target level # KVM: selftests: Drop stale function parameter comment for nested_map() # KVM: selftests: Add option to create 2M and 1G EPT mappings # KVM: selftests: Replace x86_page_size with PG_LEVEL_XX # KVM: x86: SVM: fix nested PAUSE filtering when L0 intercepts PAUSE # KVM: x86: SVM: drop preempt-safe wrappers for avic_vcpu_load/put # KVM: x86: disable preemption around the call to kvm_arch_vcpu_{un|}blocking # KVM: x86: disable preemption while updating apicv inhibition # KVM: x86: SVM: fix avic_kick_target_vcpus_fast # KVM: x86: SVM: remove avic's broken code that updated APIC ID # KVM: x86: inhibit APICv/AVIC on changes to APIC ID or APIC base # KVM: x86: document AVIC/APICv inhibit reasons # KVM: x86/mmu: Set memory encryption "value", not "mask", in shadow PDPTRs # ... # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 24625f7d91fb86b91e14749633a7f022f5866116 # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig arch/m68k/configs/sun3_defconfig:37:warning: symbol value 'm' invalid for ZPOOL # < make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 120 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:529, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:475:26: note: in expansion of macro 'printk_index_wrap' 475 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:00:42.514751