KVM: Remove subtle "struct kvm_stats_desc" pseudo-overlay

[ Upstream commit da142f3d373a6ddaca0119615a8db2175ddc4121 ]

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: Gustavo A. R. Silva <gustavoars@kernel.org>
Closes: https://lore.kernel.org/all/aPfNKRpLfhmhYqfP@kspp
Acked-by: Marc Zyngier <maz@kernel.org>
Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
[..]
Acked-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Acked-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://patch.msgid.link/20251205232655.445294-1-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Stable-dep-of: 2619da73bb2f ("KVM: x86: Use __DECLARE_FLEX_ARRAY() for UAPI structures with VLAs")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 1c87699fd886e7d56b2b6b3298427f738f8cceb8..332c453b87cf8c25918a418d9ca37ebc72ee1234 100644 (file)
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -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),

diff --git a/arch/loongarch/kvm/vcpu.c b/arch/loongarch/kvm/vcpu.c
index fbe12a129c6049b4b60e376415047a9d8439a65b..14bd36597ab33b62ef8058fa49786f5dc9520435 100644 (file)
--- a/arch/loongarch/kvm/vcpu.c
+++ b/arch/loongarch/kvm/vcpu.c
@@ -13,7 +13,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),

diff --git a/arch/loongarch/kvm/vm.c b/arch/loongarch/kvm/vm.c
index a49b1c1a3dd1f7c7738237cb76c52a0d68b69879..85246a70d95d33cd0999c5a04cda654890a6a3a7 100644 (file)
--- a/arch/loongarch/kvm/vm.c
+++ b/arch/loongarch/kvm/vm.c
@@ -9,7 +9,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),

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index a75587018f447f65c5c4416612deaa88afae92af..e0311ca3f2e181a381b42984023379d59768e6aa 100644 (file)
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -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),

diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index d79c5d1098c05c81d2c189f570a3ac4866c3811b..2efbe05caed760f6520016a453a0deca092a39a2 100644 (file)
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -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),

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 3401b96be475ef9230890dc09a8949df15003776..f3ddb24ece749fa03f4e1440f94484d29eda0295 100644 (file)
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -36,7 +36,7 @@
 
 unsigned long kvmppc_booke_handlers;
 
-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)
@@ -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, sum_exits),
        STATS_DESC_COUNTER(VCPU, mmio_exits),

diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
index 5ce35aba60696cf5a1d736b31e08cf7da77e7792..d26c4967c20e2423ce8ff0b83baf3f9656de02cd 100644 (file)
--- a/arch/riscv/kvm/vcpu.c
+++ b/arch/riscv/kvm/vcpu.c
@@ -24,7 +24,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, ecall_exit_stat),
        STATS_DESC_COUNTER(VCPU, wfi_exit_stat),

diff --git a/arch/riscv/kvm/vm.c b/arch/riscv/kvm/vm.c
index 66d91ae6e9b2ad27cbc17e8a9a4ce9be680d9ea2..715a06ae8c1313707e55dfc2e4fbd33eae380d38 100644 (file)
--- a/arch/riscv/kvm/vm.c
+++ b/arch/riscv/kvm/vm.c
@@ -13,7 +13,7 @@
 #include <linux/kvm_host.h>
 #include <asm/kvm_mmu.h>
 
-const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
+const struct kvm_stats_desc kvm_vm_stats_desc[] = {
        KVM_GENERIC_VM_STATS()
 };
 static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 16ba04062854a99ab7d48ac427b690006ea8e7eb..a0162d03e16b9a1c835c34d140a0c3663b448ec5 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -64,7 +64,7 @@
 #define VCPU_IRQS_MAX_BUF (sizeof(struct kvm_s390_irq) * \
                           (KVM_MAX_VCPUS + LOCAL_IRQS))
 
-const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
+const struct kvm_stats_desc kvm_vm_stats_desc[] = {
        KVM_GENERIC_VM_STATS(),
        STATS_DESC_COUNTER(VM, inject_io),
        STATS_DESC_COUNTER(VM, inject_float_mchk),
@@ -90,7 +90,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, exit_userspace),
        STATS_DESC_COUNTER(VCPU, exit_null),

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d15bd078a2d9839e57088d60eac703c110693a31..4e550400b4e5965f586393b398ed68e4ad0bd20e 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -242,7 +242,7 @@ EXPORT_SYMBOL_FOR_KVM_INTERNAL(enable_ipiv);
 bool __read_mostly enable_device_posted_irqs = true;
 EXPORT_SYMBOL_FOR_KVM_INTERNAL(enable_device_posted_irqs);
 
-const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
+const struct kvm_stats_desc kvm_vm_stats_desc[] = {
        KVM_GENERIC_VM_STATS(),
        STATS_DESC_COUNTER(VM, mmu_shadow_zapped),
        STATS_DESC_COUNTER(VM, mmu_pte_write),
@@ -268,7 +268,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, pf_taken),
        STATS_DESC_COUNTER(VCPU, pf_fixed),

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 0c860864d065c7a769098bcecb504fc60d18ea66..a15f9e2b4e1e664229469d310487b6595450f747 100644 (file)
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1932,56 +1932,43 @@ enum kvm_stat_kind {
 
 struct kvm_stat_data {
        struct kvm *kvm;
-       const struct _kvm_stats_desc *desc;
+       const struct kvm_stats_desc *desc;
        enum kvm_stat_kind kind;
 };
 
-struct _kvm_stats_desc {
-       struct kvm_stats_desc desc;
-       char name[KVM_STATS_NAME_SIZE];
-};
-
-#define STATS_DESC_COMMON(type, unit, base, exp, sz, bsz)                     \
-       .flags = type | unit | base |                                          \
-                BUILD_BUG_ON_ZERO(type & ~KVM_STATS_TYPE_MASK) |              \
-                BUILD_BUG_ON_ZERO(unit & ~KVM_STATS_UNIT_MASK) |              \
-                BUILD_BUG_ON_ZERO(base & ~KVM_STATS_BASE_MASK),               \
-       .exponent = exp,                                                       \
-       .size = sz,                                                            \
+#define STATS_DESC_COMMON(type, unit, base, exp, sz, bsz)              \
+       .flags = type | unit | base |                                   \
+                BUILD_BUG_ON_ZERO(type & ~KVM_STATS_TYPE_MASK) |       \
+                BUILD_BUG_ON_ZERO(unit & ~KVM_STATS_UNIT_MASK) |       \
+                BUILD_BUG_ON_ZERO(base & ~KVM_STATS_BASE_MASK),        \
+       .exponent = exp,                                                \
+       .size = sz,                                                     \
        .bucket_size = bsz
 
-#define VM_GENERIC_STATS_DESC(stat, type, unit, base, exp, sz, bsz)           \
-       {                                                                      \
-               {                                                              \
-                       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),     \
-                       .offset = offsetof(struct kvm_vm_stat, generic.stat)   \
-               },                                                             \
-               .name = #stat,                                                 \
-       }
-#define VCPU_GENERIC_STATS_DESC(stat, type, unit, base, exp, sz, bsz)         \
-       {                                                                      \
-               {                                                              \
-                       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),     \
-                       .offset = offsetof(struct kvm_vcpu_stat, generic.stat) \
-               },                                                             \
-               .name = #stat,                                                 \
-       }
-#define VM_STATS_DESC(stat, type, unit, base, exp, sz, bsz)                   \
-       {                                                                      \
-               {                                                              \
-                       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),     \
-                       .offset = offsetof(struct kvm_vm_stat, stat)           \
-               },                                                             \
-               .name = #stat,                                                 \
-       }
-#define VCPU_STATS_DESC(stat, type, unit, base, exp, sz, bsz)                 \
-       {                                                                      \
-               {                                                              \
-                       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),     \
-                       .offset = offsetof(struct kvm_vcpu_stat, stat)         \
-               },                                                             \
-               .name = #stat,                                                 \
-       }
+#define VM_GENERIC_STATS_DESC(stat, type, unit, base, exp, sz, bsz)    \
+{                                                                      \
+       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),              \
+       .offset = offsetof(struct kvm_vm_stat, generic.stat),           \
+       .name = #stat,                                                  \
+}
+#define VCPU_GENERIC_STATS_DESC(stat, type, unit, base, exp, sz, bsz)  \
+{                                                                      \
+       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),              \
+       .offset = offsetof(struct kvm_vcpu_stat, generic.stat),         \
+       .name = #stat,                                                  \
+}
+#define VM_STATS_DESC(stat, type, unit, base, exp, sz, bsz)            \
+{                                                                      \
+       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),              \
+       .offset = offsetof(struct kvm_vm_stat, stat),                   \
+       .name = #stat,                                                  \
+}
+#define VCPU_STATS_DESC(stat, type, unit, base, exp, sz, bsz)          \
+{                                                                      \
+       STATS_DESC_COMMON(type, unit, base, exp, sz, bsz),              \
+       .offset = offsetof(struct kvm_vcpu_stat, stat),                 \
+       .name = #stat,                                                  \
+}
 /* SCOPE: VM, VM_GENERIC, VCPU, VCPU_GENERIC */
 #define STATS_DESC(SCOPE, stat, type, unit, base, exp, sz, bsz)                       \
        SCOPE##_STATS_DESC(stat, type, unit, base, exp, sz, bsz)
@@ -2058,7 +2045,7 @@ struct _kvm_stats_desc {
        STATS_DESC_IBOOLEAN(VCPU_GENERIC, blocking)
 
 ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,
-                      const struct _kvm_stats_desc *desc,
+                      const struct kvm_stats_desc *desc,
                       void *stats, size_t size_stats,
                       char __user *user_buffer, size_t size, loff_t *offset);
 
@@ -2103,9 +2090,9 @@ static inline void kvm_stats_log_hist_update(u64 *data, size_t size, u64 value)
 
 
 extern const struct kvm_stats_header kvm_vm_stats_header;
-extern const struct _kvm_stats_desc kvm_vm_stats_desc[];
+extern const struct kvm_stats_desc kvm_vm_stats_desc[];
 extern const struct kvm_stats_header kvm_vcpu_stats_header;
-extern const struct _kvm_stats_desc kvm_vcpu_stats_desc[];
+extern const struct kvm_stats_desc kvm_vcpu_stats_desc[];
 
 #ifdef CONFIG_KVM_GENERIC_MMU_NOTIFIER
 static inline int mmu_invalidate_retry(struct kvm *kvm, unsigned long mmu_seq)

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 52f6000ab020840ef9b38e545a148ee2e99fd1cb..f89e1500962cdf9d3780b0b5910a6ca4d22be8e8 100644 (file)
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -14,6 +14,10 @@
 #include <linux/ioctl.h>
 #include <asm/kvm.h>
 
+#ifdef __KERNEL__
+#include <linux/kvm_types.h>
+#endif
+
 #define KVM_API_VERSION 12
 
 /*
@@ -1568,7 +1572,11 @@ struct kvm_stats_desc {
        __u16 size;
        __u32 offset;
        __u32 bucket_size;
+#ifdef __KERNEL__
+       char name[KVM_STATS_NAME_SIZE];
+#else
        char name[];
+#endif
 };
 
 #define KVM_GET_STATS_FD  _IO(KVMIO,  0xce)

diff --git a/virt/kvm/binary_stats.c b/virt/kvm/binary_stats.c
index eefca6c69f519ebf109e41a93bcce32ae7ebac18..76ce697c773bf59e5fc9071aca5c8eee2b1b41b4 100644 (file)
--- a/virt/kvm/binary_stats.c
+++ b/virt/kvm/binary_stats.c
@@ -50,7 +50,7 @@
  * Return: the number of bytes that has been successfully read
  */
 ssize_t kvm_stats_read(char *id, const struct kvm_stats_header *header,
-                      const struct _kvm_stats_desc *desc,
+                      const struct kvm_stats_desc *desc,
                       void *stats, size_t size_stats,
                       char __user *user_buffer, size_t size, loff_t *offset)
 {

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7fea6ba91c1ef30427d9ad431a189f14a5c5ab10..46581554abfb2c91d7aa5fe04ad3cfb82ff47beb 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -982,9 +982,9 @@ static void kvm_free_memslots(struct kvm *kvm, struct kvm_memslots *slots)
                kvm_free_memslot(kvm, memslot);
 }
 
-static umode_t kvm_stats_debugfs_mode(const struct _kvm_stats_desc *pdesc)
+static umode_t kvm_stats_debugfs_mode(const struct kvm_stats_desc *desc)
 {
-       switch (pdesc->desc.flags & KVM_STATS_TYPE_MASK) {
+       switch (desc->flags & KVM_STATS_TYPE_MASK) {
        case KVM_STATS_TYPE_INSTANT:
                return 0444;
        case KVM_STATS_TYPE_CUMULATIVE:
@@ -1019,7 +1019,7 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, const char *fdname)
        struct dentry *dent;
        char dir_name[ITOA_MAX_LEN * 2];
        struct kvm_stat_data *stat_data;
-       const struct _kvm_stats_desc *pdesc;
+       const struct kvm_stats_desc *pdesc;
        int i, ret = -ENOMEM;
        int kvm_debugfs_num_entries = kvm_vm_stats_header.num_desc +
                                      kvm_vcpu_stats_header.num_desc;
@@ -6160,11 +6160,11 @@ static int kvm_stat_data_get(void *data, u64 *val)
        switch (stat_data->kind) {
        case KVM_STAT_VM:
                r = kvm_get_stat_per_vm(stat_data->kvm,
-                                       stat_data->desc->desc.offset, val);
+                                       stat_data->desc->offset, val);
                break;
        case KVM_STAT_VCPU:
                r = kvm_get_stat_per_vcpu(stat_data->kvm,
-                                         stat_data->desc->desc.offset, val);
+                                         stat_data->desc->offset, val);
                break;
        }
 
@@ -6182,11 +6182,11 @@ static int kvm_stat_data_clear(void *data, u64 val)
        switch (stat_data->kind) {
        case KVM_STAT_VM:
                r = kvm_clear_stat_per_vm(stat_data->kvm,
-                                         stat_data->desc->desc.offset);
+                                         stat_data->desc->offset);
                break;
        case KVM_STAT_VCPU:
                r = kvm_clear_stat_per_vcpu(stat_data->kvm,
-                                           stat_data->desc->desc.offset);
+                                           stat_data->desc->offset);
                break;
        }
 
@@ -6334,7 +6334,7 @@ static void kvm_uevent_notify_change(unsigned int type, struct kvm *kvm)
 static void kvm_init_debug(void)
 {
        const struct file_operations *fops;
-       const struct _kvm_stats_desc *pdesc;
+       const struct kvm_stats_desc *pdesc;
        int i;
 
        kvm_debugfs_dir = debugfs_create_dir("kvm", NULL);
@@ -6347,7 +6347,7 @@ static void kvm_init_debug(void)
                        fops = &vm_stat_readonly_fops;
                debugfs_create_file(pdesc->name, kvm_stats_debugfs_mode(pdesc),
                                kvm_debugfs_dir,
-                               (void *)(long)pdesc->desc.offset, fops);
+                               (void *)(long)pdesc->offset, fops);
        }
 
        for (i = 0; i < kvm_vcpu_stats_header.num_desc; ++i) {
@@ -6358,7 +6358,7 @@ static void kvm_init_debug(void)
                        fops = &vcpu_stat_readonly_fops;
                debugfs_create_file(pdesc->name, kvm_stats_debugfs_mode(pdesc),
                                kvm_debugfs_dir,
-                               (void *)(long)pdesc->desc.offset, fops);
+                               (void *)(long)pdesc->offset, fops);
        }
 }