Commit da142f3d authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: Remove subtle "struct kvm_stats_desc" pseudo-overlay 



Remove KVM's internal pseudo-overlay of kvm_stats_desc, which subtly
aliases the flexible name[] in the uAPI definition with a fixed-size array
of the same name.  The unusual embedded structure results in compiler
warnings due to -Wflex-array-member-not-at-end, and also necessitates an
extra level of dereferencing in KVM.  To avoid the "overlay", define the
uAPI structure to have a fixed-size name when building for the kernel.

Opportunistically clean up the indentation for the stats macros, and
replace spaces with tabs.

No functional change intended.

Reported-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Closes: https://lore.kernel.org/all/aPfNKRpLfhmhYqfP@kspp


Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
[..]
Acked-by: default avatarAnup Patel <anup@brainfault.org>
Reviewed-by: default avatarBibo Mao <maobibo@loongson.cn>
Acked-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/20251205232655.445294-1-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 9ace4753

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),

arch/powerpc/kvm/book3s.c

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


/* #define EXIT_DEBUG */



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, num_2M_pages),

	STATS_DESC_ICOUNTER(VM, num_1G_pages)
@@ -53,7 +53,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, sum_exits),

	STATS_DESC_COUNTER(VCPU, mmio_exits),