Commit 6905b1dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "It's a bit larger than I (and probably you) would like by the time we
  get to -rc6, but perhaps not entirely unexpected since the changes in
  the last merge window were larger than usual.

  x86:
   - Fixes for missing TLB flushes with TDP MMU

   - Fixes for race conditions in nested SVM

   - Fixes for lockdep splat with Xen emulation

   - Fix for kvmclock underflow

   - Fix srcdir != builddir builds

   - Other small cleanups

  ARM:
   - Fix GICv3 MMIO compatibility probing

   - Prevent guests from using the ARMv8.4 self-hosted tracing
     extension"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  selftests: kvm: Check that TSC page value is small after KVM_SET_CLOCK(0)
  KVM: x86: Prevent 'hv_clock->system_time' from going negative in kvm_guest_time_update()
  KVM: x86: disable interrupts while pvclock_gtod_sync_lock is taken
  KVM: x86: reduce pvclock_gtod_sync_lock critical sections
  KVM: SVM: ensure that EFER.SVME is set when running nested guest or on nested vmexit
  KVM: SVM: load control fields from VMCB12 before checking them
  KVM: x86/mmu: Don't allow TDP MMU to yield when recovering NX pages
  KVM: x86/mmu: Ensure TLBs are flushed for TDP MMU during NX zapping
  KVM: x86/mmu: Ensure TLBs are flushed when yielding during GFN range zap
  KVM: make: Fix out-of-source module builds
  selftests: kvm: make hardware_disable_test less verbose
  KVM: x86/vPMU: Forbid writing to MSR_F15H_PERF MSRs when guest doesn't have X86_FEATURE_PERFCTR_CORE
  KVM: x86: remove unused declaration of kvm_write_tsc()
  KVM: clean up the unused argument
  tools/kvm_stat: Add restart delay
  KVM: arm64: Fix CPU interface MMIO compatibility detection
  KVM: arm64: Disable guest access to trace filter controls
  KVM: arm64: Hide system instruction access to Trace registers
parents a80314c3 55626ca9

arch/arm64/include/asm/kvm_arm.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ 
#define CPTR_EL2_DEFAULT	CPTR_EL2_RES1



/* Hyp Debug Configuration Register bits */

#define MDCR_EL2_TTRF		(1 << 19)

#define MDCR_EL2_TPMS		(1 << 14)

#define MDCR_EL2_E2PB_MASK	(UL(0x3))

#define MDCR_EL2_E2PB_SHIFT	(UL(12))

arch/arm64/kernel/cpufeature.c

+0 −1
Original line number Diff line number Diff line
@@ -383,7 +383,6 @@ static const struct arm64_ftr_bits ftr_id_aa64dfr0[] = { 
	 * of support.

	 */

	S_ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_EXACT, ID_AA64DFR0_PMUVER_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_TRACEVER_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_EXACT, ID_AA64DFR0_DEBUGVER_SHIFT, 4, 0x6),

	ARM64_FTR_END,

};

arch/arm64/kvm/debug.c

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu) 
 *  - Debug ROM Address (MDCR_EL2_TDRA)

 *  - OS related registers (MDCR_EL2_TDOSA)

 *  - Statistical profiler (MDCR_EL2_TPMS/MDCR_EL2_E2PB)

 *  - Self-hosted Trace Filter controls (MDCR_EL2_TTRF)

 *

 * Additionally, KVM only traps guest accesses to the debug registers if

 * the guest is not actively using them (see the KVM_ARM64_DEBUG_DIRTY
@@ -112,6 +113,7 @@ void kvm_arm_setup_debug(struct kvm_vcpu *vcpu) 
	vcpu->arch.mdcr_el2 = __this_cpu_read(mdcr_el2) & MDCR_EL2_HPMN_MASK;

	vcpu->arch.mdcr_el2 |= (MDCR_EL2_TPM |

				MDCR_EL2_TPMS |

				MDCR_EL2_TTRF |

				MDCR_EL2_TPMCR |

				MDCR_EL2_TDRA |

				MDCR_EL2_TDOSA);

arch/arm64/kvm/hyp/vgic-v3-sr.c

+9 −0
Original line number Diff line number Diff line
@@ -429,6 +429,13 @@ u64 __vgic_v3_get_gic_config(void) 
	if (has_vhe())

		flags = local_daif_save();



	/*

	 * Table 11-2 "Permitted ICC_SRE_ELx.SRE settings" indicates

	 * that to be able to set ICC_SRE_EL1.SRE to 0, all the

	 * interrupt overrides must be set. You've got to love this.

	 */

	sysreg_clear_set(hcr_el2, 0, HCR_AMO | HCR_FMO | HCR_IMO);

	isb();

	write_gicreg(0, ICC_SRE_EL1);

	isb();
@@ -436,6 +443,8 @@ u64 __vgic_v3_get_gic_config(void) 


	write_gicreg(sre, ICC_SRE_EL1);

	isb();

	sysreg_clear_set(hcr_el2, HCR_AMO | HCR_FMO | HCR_IMO, 0);

	isb();



	if (has_vhe())

		local_daif_restore(flags);

arch/x86/kvm/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



ccflags-y += -Iarch/x86/kvm

ccflags-y += -I $(srctree)/arch/x86/kvm

ccflags-$(CONFIG_KVM_WERROR) += -Werror



ifeq ($(CONFIG_FRAME_POINTER),y)