Commit 94fe3e65 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-generic-7.0-rc3' of https://github.com/kvm-x86/linux into HEAD 

KVM generic changes for 7.0

 - Remove a subtle pseudo-overlay of kvm_stats_desc, which, aside from being
   unnecessary and confusing, triggered compiler warnings due to
   -Wflex-array-member-not-at-end.

 - Document that vcpu->mutex is take outside of kvm->slots_lock and
   kvm->slots_arch_lock, which is intentional and desirable despite being
   rather unintuitive.
parents 40c2ffca f8211e95

Documentation/virt/kvm/locking.rst

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ The acquisition orders for mutexes are as follows: 


- kvm->lock is taken outside kvm->slots_lock and kvm->irq_lock



- vcpu->mutex is taken outside kvm->slots_lock and kvm->slots_arch_lock



- kvm->slots_lock is taken outside kvm->irq_lock, though acquiring

  them together is quite rare.

arch/arm64/kvm/guest.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include "trace.h"



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

const struct kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS()

};
@@ -42,7 +42,7 @@ const struct kvm_stats_header kvm_vm_stats_header = { 
		       sizeof(kvm_vm_stats_desc),

};



const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {

const struct kvm_stats_desc kvm_vcpu_stats_desc[] = {

	KVM_GENERIC_VCPU_STATS(),

	STATS_DESC_COUNTER(VCPU, hvc_exit_stat),

	STATS_DESC_COUNTER(VCPU, wfe_exit_stat),

arch/loongarch/kvm/vcpu.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define CREATE_TRACE_POINTS

#include "trace.h"



const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {

const struct kvm_stats_desc kvm_vcpu_stats_desc[] = {

	KVM_GENERIC_VCPU_STATS(),

	STATS_DESC_COUNTER(VCPU, int_exits),

	STATS_DESC_COUNTER(VCPU, idle_exits),

arch/loongarch/kvm/vm.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <asm/kvm_eiointc.h>

#include <asm/kvm_pch_pic.h>



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

const struct kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS(),

	STATS_DESC_ICOUNTER(VM, pages),

	STATS_DESC_ICOUNTER(VM, hugepages),

arch/mips/kvm/mips.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#define VECTORSPACING 0x100	/* for EI/VI mode */

#endif



const struct _kvm_stats_desc kvm_vm_stats_desc[] = {

const struct kvm_stats_desc kvm_vm_stats_desc[] = {

	KVM_GENERIC_VM_STATS()

};
@@ -51,7 +51,7 @@ const struct kvm_stats_header kvm_vm_stats_header = { 
		       sizeof(kvm_vm_stats_desc),

};



const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = {

const struct kvm_stats_desc kvm_vcpu_stats_desc[] = {

	KVM_GENERIC_VCPU_STATS(),

	STATS_DESC_COUNTER(VCPU, wait_exits),

	STATS_DESC_COUNTER(VCPU, cache_exits),