Commit 07ab9d5b 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 more KVM updates from Paolo Bonzini:
 "Mostly bugfixes, but also:

   - s390 support for KVM selftests

   - LAPIC timer offloading to housekeeping CPUs

   - Extend an s390 optimization for overcommitted hosts to all
     architectures

   - Debugging cleanups and improvements"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (25 commits)
  KVM: x86: Add fixed counters to PMU filter
  KVM: nVMX: do not use dangling shadow VMCS after guest reset
  KVM: VMX: dump VMCS on failed entry
  KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed
  KVM: s390: Use kvm_vcpu_wake_up in kvm_s390_vcpu_wakeup
  KVM: Boost vCPUs that are delivering interrupts
  KVM: selftests: Remove superfluous define from vmx.c
  KVM: SVM: Fix detection of AMD Errata 1096
  KVM: LAPIC: Inject timer interrupt via posted interrupt
  KVM: LAPIC: Make lapic timer unpinned
  KVM: x86/vPMU: reset pmc->counter to 0 for pmu fixed_counters
  KVM: nVMX: Ignore segment base for VMX memory operand when segment not FS or GS
  kvm: x86: ioapic and apic debug macros cleanup
  kvm: x86: some tsc debug cleanup
  kvm: vmx: fix coccinelle warnings
  x86: kvm: avoid constant-conversion warning
  x86: kvm: avoid -Wsometimes-uninitized warning
  KVM: x86: expose AVX512_BF16 feature to guest
  KVM: selftests: enable pgste option for the linker on s390
  KVM: selftests: Move kvm_create_max_vcpus test to generic code
  ...
parents f65420df 30cd8604

Documentation/virtual/kvm/api.txt

+10 −5
Original line number Diff line number Diff line
@@ -4092,6 +4092,9 @@ Returns: 0 on success, -1 on error 
struct kvm_pmu_event_filter {

	__u32 action;

	__u32 nevents;

	__u32 fixed_counter_bitmap;

	__u32 flags;

	__u32 pad[4];

	__u64 events[0];

};
@@ -4099,8 +4102,10 @@ This ioctl restricts the set of PMU events that the guest can program. 
The argument holds a list of events which will be allowed or denied.

The eventsel+umask of each event the guest attempts to program is compared

against the events field to determine whether the guest should have access.

This only affects general purpose counters; fixed purpose counters can

be disabled by changing the perfmon CPUID leaf.

The events field only controls general purpose counters; fixed purpose

counters are controlled by the fixed_counter_bitmap.



No flags are defined yet, the field must be zero.



Valid values for 'action':

#define KVM_PMU_EVENT_ALLOW 0

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -8878,6 +8878,8 @@ F: arch/s390/include/asm/gmap.h 
F:	arch/s390/include/asm/kvm*

F:	arch/s390/kvm/

F:	arch/s390/mm/gmap.c

F:	tools/testing/selftests/kvm/s390x/

F:	tools/testing/selftests/kvm/*/s390x/



KERNEL VIRTUAL MACHINE FOR X86 (KVM/x86)

M:	Paolo Bonzini <pbonzini@redhat.com>

arch/s390/kvm/interrupt.c

+3 −20
Original line number Diff line number Diff line
@@ -1224,28 +1224,11 @@ no_timer: 


void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu)

{

	/*

	 * We cannot move this into the if, as the CPU might be already

	 * in kvm_vcpu_block without having the waitqueue set (polling)

	 */

	vcpu->valid_wakeup = true;

	kvm_vcpu_wake_up(vcpu);



	/*

	 * This is mostly to document, that the read in swait_active could

	 * be moved before other stores, leading to subtle races.

	 * All current users do not store or use an atomic like update

	 */

	smp_mb__after_atomic();

	if (swait_active(&vcpu->wq)) {

		/*

		 * The vcpu gave up the cpu voluntarily, mark it as a good

		 * yield-candidate.

		 */

		vcpu->preempted = true;

		swake_up_one(&vcpu->wq);

		vcpu->stat.halt_wakeup++;

	}

	/*

	 * The VCPU might not be sleeping but is executing the VSIE. Let's

	 * The VCPU might not be sleeping but rather executing VSIE. Let's

	 * kick it, so it leaves the SIE to process the request.

	 */

	kvm_s390_vsie_kick(vcpu);

arch/x86/include/uapi/asm/kvm.h

+6 −3
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ struct kvm_nested_state { 
struct kvm_pmu_event_filter {

	__u32 action;

	__u32 nevents;

	__u32 fixed_counter_bitmap;

	__u32 flags;

	__u32 pad[4];

	__u64 events[0];

};

arch/x86/kvm/cpuid.c

+11 −1
Original line number Diff line number Diff line
@@ -368,9 +368,13 @@ static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index) 
		F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES) | F(INTEL_STIBP) |

		F(MD_CLEAR);



	/* cpuid 7.1.eax */

	const u32 kvm_cpuid_7_1_eax_x86_features =

		F(AVX512_BF16);



	switch (index) {

	case 0:

		entry->eax = 0;

		entry->eax = min(entry->eax, 1u);

		entry->ebx &= kvm_cpuid_7_0_ebx_x86_features;

		cpuid_mask(&entry->ebx, CPUID_7_0_EBX);

		/* TSC_ADJUST is emulated */
@@ -394,6 +398,12 @@ static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index) 
		 */

		entry->edx |= F(ARCH_CAPABILITIES);

		break;

	case 1:

		entry->eax &= kvm_cpuid_7_1_eax_x86_features;

		entry->ebx = 0;

		entry->ecx = 0;

		entry->edx = 0;

		break;

	default:

		WARN_ON_ONCE(1);

		entry->eax = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE