* [PATCH 1/8] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-11 0:10 ` [PATCH 2/8] KVM: arm64: Include KVM headers to get forward declarations Sean Christopherson
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
From: Anish Ghulati <aghulati@google.com>
Move arm_hypercalls.h and arm_psci.h into arch/arm64/kvm now that KVM
no longer supports 32-bit ARM, i.e. now that there's no reason to make
the hypercall and PSCI APIs "public".
Signed-off-by: Anish Ghulati <aghulati@google.com>
[sean: squash into one patch, write changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/arm64/kvm/arm.c | 5 +++--
{include => arch/arm64}/kvm/arm_hypercalls.h | 0
{include => arch/arm64}/kvm/arm_psci.h | 0
arch/arm64/kvm/guest.c | 2 +-
arch/arm64/kvm/handle_exit.c | 2 +-
arch/arm64/kvm/hyp/Makefile | 6 +++---
arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++--
arch/arm64/kvm/hyp/nvhe/switch.c | 4 ++--
arch/arm64/kvm/hyp/vhe/switch.c | 4 ++--
arch/arm64/kvm/hypercalls.c | 4 ++--
arch/arm64/kvm/psci.c | 4 ++--
arch/arm64/kvm/pvtime.c | 2 +-
arch/arm64/kvm/trng.c | 2 +-
13 files changed, 20 insertions(+), 19 deletions(-)
rename {include => arch/arm64}/kvm/arm_hypercalls.h (100%)
rename {include => arch/arm64}/kvm/arm_psci.h (100%)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index de2b4e9c9f9f..017c95c7bd03 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -42,9 +42,10 @@
#include <asm/kvm_ptrauth.h>
#include <asm/sections.h>
-#include <kvm/arm_hypercalls.h>
#include <kvm/arm_pmu.h>
-#include <kvm/arm_psci.h>
+
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
#include "sys_regs.h"
diff --git a/include/kvm/arm_hypercalls.h b/arch/arm64/kvm/arm_hypercalls.h
similarity index 100%
rename from include/kvm/arm_hypercalls.h
rename to arch/arm64/kvm/arm_hypercalls.h
diff --git a/include/kvm/arm_psci.h b/arch/arm64/kvm/arm_psci.h
similarity index 100%
rename from include/kvm/arm_psci.h
rename to arch/arm64/kvm/arm_psci.h
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 2196979a24a3..699a2f975350 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -18,7 +18,6 @@
#include <linux/string.h>
#include <linux/vmalloc.h>
#include <linux/fs.h>
-#include <kvm/arm_hypercalls.h>
#include <asm/cputype.h>
#include <linux/uaccess.h>
#include <asm/fpsimd.h>
@@ -27,6 +26,7 @@
#include <asm/kvm_nested.h>
#include <asm/sigcontext.h>
+#include "arm_hypercalls.h"
#include "trace.h"
const struct _kvm_stats_desc kvm_vm_stats_desc[] = {
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c
index 453266c96481..32a7b7c22924 100644
--- a/arch/arm64/kvm/handle_exit.c
+++ b/arch/arm64/kvm/handle_exit.c
@@ -22,7 +22,7 @@
#include <asm/stacktrace/nvhe.h>
#include <asm/traps.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define CREATE_TRACE_POINTS
#include "trace_handle_exit.h"
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index d61e44642f98..b1a4884446c6 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -3,8 +3,8 @@
# Makefile for Kernel-based Virtual Machine module, HYP part
#
-incdir := $(src)/include
-subdir-asflags-y := -I$(incdir)
-subdir-ccflags-y := -I$(incdir)
+hyp_includes := -I$(src)/include -I$(srctree)/arch/arm64/kvm
+subdir-asflags-y := $(hyp_includes)
+subdir-ccflags-y := $(hyp_includes)
obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o
diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h
index bb9f2eecfb67..340a57e0ed7c 100644
--- a/arch/arm64/kvm/hyp/include/hyp/switch.h
+++ b/arch/arm64/kvm/hyp/include/hyp/switch.h
@@ -16,8 +16,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/extable.h>
@@ -32,6 +30,8 @@
#include <asm/processor.h>
#include <asm/traps.h>
+#include "arm_psci.h"
+
struct kvm_exception_table_entry {
int insn, fixup;
};
diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c
index 73affe1333a4..e0610cf683ab 100644
--- a/arch/arm64/kvm/hyp/nvhe/switch.c
+++ b/arch/arm64/kvm/hyp/nvhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/jump_label.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -28,6 +26,8 @@
#include <nvhe/mem_protect.h>
+#include "arm_psci.h"
+
/* Non-VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index c9b330dc2066..96be652caf3a 100644
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -13,8 +13,6 @@
#include <linux/percpu.h>
#include <uapi/linux/psci.h>
-#include <kvm/arm_psci.h>
-
#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/kprobes.h>
@@ -28,6 +26,8 @@
#include <asm/thread_info.h>
#include <asm/vectors.h>
+#include "arm_psci.h"
+
/* VHE specific context */
DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data);
DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt);
diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c
index 569941eeb3fe..002f4c593e90 100644
--- a/arch/arm64/kvm/hypercalls.c
+++ b/arch/arm64/kvm/hypercalls.c
@@ -6,8 +6,8 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
-#include <kvm/arm_psci.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
#define KVM_ARM_SMCCC_STD_FEATURES \
GENMASK(KVM_REG_ARM_STD_BMAP_BIT_COUNT - 1, 0)
diff --git a/arch/arm64/kvm/psci.c b/arch/arm64/kvm/psci.c
index 3b5dbe9a0a0e..0566b5907497 100644
--- a/arch/arm64/kvm/psci.c
+++ b/arch/arm64/kvm/psci.c
@@ -13,8 +13,8 @@
#include <asm/cputype.h>
#include <asm/kvm_emulate.h>
-#include <kvm/arm_psci.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
+#include "arm_psci.h"
/*
* This is an implementation of the Power State Coordination Interface
diff --git a/arch/arm64/kvm/pvtime.c b/arch/arm64/kvm/pvtime.c
index 4ceabaa4c30b..b07d250d223c 100644
--- a/arch/arm64/kvm/pvtime.c
+++ b/arch/arm64/kvm/pvtime.c
@@ -8,7 +8,7 @@
#include <asm/kvm_mmu.h>
#include <asm/pvclock-abi.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
void kvm_update_stolen_time(struct kvm_vcpu *vcpu)
{
diff --git a/arch/arm64/kvm/trng.c b/arch/arm64/kvm/trng.c
index 99bdd7103c9c..b5dc0f09797a 100644
--- a/arch/arm64/kvm/trng.c
+++ b/arch/arm64/kvm/trng.c
@@ -6,7 +6,7 @@
#include <asm/kvm_emulate.h>
-#include <kvm/arm_hypercalls.h>
+#include "arm_hypercalls.h"
#define ARM_SMCCC_TRNG_VERSION_1_0 0x10000UL
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/8] KVM: arm64: Include KVM headers to get forward declarations
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
2025-06-11 0:10 ` [PATCH 1/8] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-11 0:10 ` [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory Sean Christopherson
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Include include/uapi/linux/kvm.h and include/linux/kvm_types.h in ARM's
public arm_arch_timer.h and arm_pmu.h headers to get forward declarations
of things like "struct kvm_vcpu" and "struct kvm_device_attr", which are
referenced but never declared (neither file includes *any* KVM headers).
The missing includes don't currently cause problems because of the order
of includes in parent files, but that order is largely arbitrary and is
subject to change, e.g. a future commit will move the ARM specific headers
to arch/arm64/include/asm and reorder parent includes to maintain
alphabetic ordering.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
include/kvm/arm_arch_timer.h | 2 ++
include/kvm/arm_pmu.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h
index 681cf0c8b9df..22cce6843e9a 100644
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
@@ -7,6 +7,8 @@
#ifndef __ASM_ARM_KVM_ARCH_TIMER_H
#define __ASM_ARM_KVM_ARCH_TIMER_H
+#include <linux/kvm.h>
+#include <linux/kvm_types.h>
#include <linux/clocksource.h>
#include <linux/hrtimer.h>
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
index 96754b51b411..baf028d19dfc 100644
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
@@ -7,6 +7,8 @@
#ifndef __ASM_ARM_KVM_PMU_H
#define __ASM_ARM_KVM_PMU_H
+#include <linux/kvm.h>
+#include <linux/kvm_types.h>
#include <linux/perf_event.h>
#include <linux/perf/arm_pmuv3.h>
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
2025-06-11 0:10 ` [PATCH 1/8] KVM: arm64: Move arm_{psci,hypercalls}.h to an internal KVM path Sean Christopherson
2025-06-11 0:10 ` [PATCH 2/8] KVM: arm64: Include KVM headers to get forward declarations Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-16 11:10 ` Zenghui Yu
2025-06-11 0:10 ` [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h Sean Christopherson
` (5 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Move kvm/arm_{arch_timer,pmu,vgic}.h to arch/arm64/include/asm and drop
the "arm" prefix from all file names. Now that KVM no longer supports
32-bit ARM, there is no reason to expose ARM specific headers to other
architectures beyond arm64.
Cc: Colton Lewis <coltonlewis@google.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
.../arm64/include/asm/kvm_arch_timer.h | 0
arch/arm64/include/asm/kvm_host.h | 7 +++----
include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h | 0
.../kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h | 0
arch/arm64/kvm/arch_timer.c | 5 ++---
arch/arm64/kvm/arm.c | 3 +--
arch/arm64/kvm/pmu-emul.c | 4 ++--
arch/arm64/kvm/reset.c | 3 +--
arch/arm64/kvm/trace_arm.h | 2 +-
arch/arm64/kvm/vgic/vgic-debug.c | 2 +-
arch/arm64/kvm/vgic/vgic-init.c | 2 +-
arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +-
arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 +-
arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +-
arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +-
arch/arm64/kvm/vgic/vgic-mmio.c | 4 ++--
arch/arm64/kvm/vgic/vgic-v2.c | 2 +-
arch/arm64/kvm/vgic/vgic-v3-nested.c | 3 +--
arch/arm64/kvm/vgic/vgic-v3.c | 2 +-
19 files changed, 21 insertions(+), 26 deletions(-)
rename include/kvm/arm_arch_timer.h => arch/arm64/include/asm/kvm_arch_timer.h (100%)
rename include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h (100%)
rename include/kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h (100%)
diff --git a/include/kvm/arm_arch_timer.h b/arch/arm64/include/asm/kvm_arch_timer.h
similarity index 100%
rename from include/kvm/arm_arch_timer.h
rename to arch/arm64/include/asm/kvm_arch_timer.h
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 6ce2c5173482..b8f910d5bdfa 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -26,17 +26,16 @@
#include <asm/daifflags.h>
#include <asm/fpsimd.h>
#include <asm/kvm.h>
+#include <asm/kvm_arch_timer.h>
#include <asm/kvm_asm.h>
+#include <asm/kvm_pmu.h>
+#include <asm/kvm_vgic.h>
#include <asm/vncr_mapping.h>
#define __KVM_HAVE_ARCH_INTC_INITIALIZED
#define KVM_HALT_POLL_NS_DEFAULT 500000
-#include <kvm/arm_vgic.h>
-#include <kvm/arm_arch_timer.h>
-#include <kvm/arm_pmu.h>
-
#define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS
#define KVM_VCPU_MAX_FEATURES 9
diff --git a/include/kvm/arm_pmu.h b/arch/arm64/include/asm/kvm_pmu.h
similarity index 100%
rename from include/kvm/arm_pmu.h
rename to arch/arm64/include/asm/kvm_pmu.h
diff --git a/include/kvm/arm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h
similarity index 100%
rename from include/kvm/arm_vgic.h
rename to arch/arm64/include/asm/kvm_vgic.h
diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c
index fdbc8beec930..d61b0450cbf9 100644
--- a/arch/arm64/kvm/arch_timer.c
+++ b/arch/arm64/kvm/arch_timer.c
@@ -14,12 +14,11 @@
#include <clocksource/arm_arch_timer.h>
#include <asm/arch_timer.h>
+#include <asm/kvm_arch_timer.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_hyp.h>
#include <asm/kvm_nested.h>
-
-#include <kvm/arm_vgic.h>
-#include <kvm/arm_arch_timer.h>
+#include <asm/kvm_vgic.h>
#include "trace.h"
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 017c95c7bd03..e452aba1a3b2 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -39,11 +39,10 @@
#include <asm/kvm_mmu.h>
#include <asm/kvm_nested.h>
#include <asm/kvm_pkvm.h>
+#include <asm/kvm_pmu.h>
#include <asm/kvm_ptrauth.h>
#include <asm/sections.h>
-#include <kvm/arm_pmu.h>
-
#include "arm_hypercalls.h"
#include "arm_psci.h"
diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index 25c29107f13f..47a518f6a393 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -12,8 +12,8 @@
#include <linux/perf/arm_pmu.h>
#include <linux/uaccess.h>
#include <asm/kvm_emulate.h>
-#include <kvm/arm_pmu.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_pmu.h>
+#include <asm/kvm_vgic.h>
#define PERF_ATTR_CFG1_COUNTER_64BIT BIT(0)
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 959532422d3a..bae367638741 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -17,12 +17,11 @@
#include <linux/string.h>
#include <linux/types.h>
-#include <kvm/arm_arch_timer.h>
-
#include <asm/cpufeature.h>
#include <asm/cputype.h>
#include <asm/fpsimd.h>
#include <asm/ptrace.h>
+#include <asm/kvm_arch_timer.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_asm.h>
#include <asm/kvm_emulate.h>
diff --git a/arch/arm64/kvm/trace_arm.h b/arch/arm64/kvm/trace_arm.h
index 9c60f6465c78..8fc8178e21a7 100644
--- a/arch/arm64/kvm/trace_arm.h
+++ b/arch/arm64/kvm/trace_arm.h
@@ -3,7 +3,7 @@
#define _TRACE_ARM_ARM64_KVM_H
#include <asm/kvm_emulate.h>
-#include <kvm/arm_arch_timer.h>
+#include <asm/kvm_arch_timer.h>
#include <linux/tracepoint.h>
#undef TRACE_SYSTEM
diff --git a/arch/arm64/kvm/vgic/vgic-debug.c b/arch/arm64/kvm/vgic/vgic-debug.c
index 2684f273d9e1..0eba9dc78e6f 100644
--- a/arch/arm64/kvm/vgic/vgic-debug.c
+++ b/arch/arm64/kvm/vgic/vgic-debug.c
@@ -9,7 +9,7 @@
#include <linux/interrupt.h>
#include <linux/kvm_host.h>
#include <linux/seq_file.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include <asm/kvm_mmu.h>
#include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c
index eb1205654ac8..5a4205fd78b2 100644
--- a/arch/arm64/kvm/vgic/vgic-init.c
+++ b/arch/arm64/kvm/vgic/vgic-init.c
@@ -7,7 +7,7 @@
#include <linux/interrupt.h>
#include <linux/cpu.h>
#include <linux/kvm_host.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_mmu.h>
#include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-irqfd.c b/arch/arm64/kvm/vgic/vgic-irqfd.c
index c314c016659a..b73401c34f29 100644
--- a/arch/arm64/kvm/vgic/vgic-irqfd.c
+++ b/arch/arm64/kvm/vgic/vgic-irqfd.c
@@ -6,7 +6,7 @@
#include <linux/kvm.h>
#include <linux/kvm_host.h>
#include <trace/events/kvm.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
/*
diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c
index f9ae790163fb..f542479ceb11 100644
--- a/arch/arm64/kvm/vgic/vgic-kvm-device.c
+++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c
@@ -6,7 +6,7 @@
* Author: Marc Zyngier <marc.zyngier@arm.com>
*/
#include <linux/kvm_host.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include <linux/uaccess.h>
#include <asm/kvm_mmu.h>
#include <asm/cputype.h>
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
index f25fccb1f8e6..d00c8a74fad6 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
@@ -9,7 +9,7 @@
#include <linux/nospec.h>
#include <kvm/iodev.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
#include "vgic-mmio.h"
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index ae4c0593d114..505d4e389885 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -9,11 +9,11 @@
#include <linux/kvm_host.h>
#include <linux/interrupt.h>
#include <kvm/iodev.h>
-#include <kvm/arm_vgic.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_mmu.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
#include "vgic-mmio.h"
diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
index e416e433baff..ec1b13abc728 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -10,8 +10,8 @@
#include <linux/kvm.h>
#include <linux/kvm_host.h>
#include <kvm/iodev.h>
-#include <kvm/arm_arch_timer.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_arch_timer.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
#include "vgic-mmio.h"
diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c
index 381673f03c39..780afb7aad06 100644
--- a/arch/arm64/kvm/vgic/vgic-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-v2.c
@@ -6,7 +6,7 @@
#include <linux/irqchip/arm-gic.h>
#include <linux/kvm.h>
#include <linux/kvm_host.h>
-#include <kvm/arm_vgic.h>
+#include <asm/kvm_vgic.h>
#include <asm/kvm_mmu.h>
#include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-v3-nested.c b/arch/arm64/kvm/vgic/vgic-v3-nested.c
index 4f6954c30674..bdee42a8be17 100644
--- a/arch/arm64/kvm/vgic/vgic-v3-nested.c
+++ b/arch/arm64/kvm/vgic/vgic-v3-nested.c
@@ -7,11 +7,10 @@
#include <linux/io.h>
#include <linux/uaccess.h>
-#include <kvm/arm_vgic.h>
-
#include <asm/kvm_arm.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_nested.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c
index b9ad7c42c5b0..a22fe73ca538 100644
--- a/arch/arm64/kvm/vgic/vgic-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-v3.c
@@ -7,10 +7,10 @@
#include <linux/kvm.h>
#include <linux/kvm_host.h>
#include <linux/string_choices.h>
-#include <kvm/arm_vgic.h>
#include <asm/kvm_hyp.h>
#include <asm/kvm_mmu.h>
#include <asm/kvm_asm.h>
+#include <asm/kvm_vgic.h>
#include "vgic.h"
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory
2025-06-11 0:10 ` [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory Sean Christopherson
@ 2025-06-16 11:10 ` Zenghui Yu
0 siblings, 0 replies; 15+ messages in thread
From: Zenghui Yu @ 2025-06-16 11:10 UTC (permalink / raw)
To: Sean Christopherson
Cc: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Paolo Bonzini, linux-arm-kernel, kvmarm, kvm, loongarch,
linux-mips, linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel,
Anish Ghulati, Colton Lewis, Thomas Huth
On 2025/6/11 8:10, Sean Christopherson wrote:
> Move kvm/arm_{arch_timer,pmu,vgic}.h to arch/arm64/include/asm and drop
> the "arm" prefix from all file names. Now that KVM no longer supports
> 32-bit ARM, there is no reason to expose ARM specific headers to other
> architectures beyond arm64.
>
> Cc: Colton Lewis <coltonlewis@google.com>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> .../arm64/include/asm/kvm_arch_timer.h | 0
> arch/arm64/include/asm/kvm_host.h | 7 +++----
> include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h | 0
> .../kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h | 0
> arch/arm64/kvm/arch_timer.c | 5 ++---
> arch/arm64/kvm/arm.c | 3 +--
> arch/arm64/kvm/pmu-emul.c | 4 ++--
> arch/arm64/kvm/reset.c | 3 +--
> arch/arm64/kvm/trace_arm.h | 2 +-
> arch/arm64/kvm/vgic/vgic-debug.c | 2 +-
> arch/arm64/kvm/vgic/vgic-init.c | 2 +-
> arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +-
> arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio.c | 4 ++--
> arch/arm64/kvm/vgic/vgic-v2.c | 2 +-
> arch/arm64/kvm/vgic/vgic-v3-nested.c | 3 +--
> arch/arm64/kvm/vgic/vgic-v3.c | 2 +-
> 19 files changed, 21 insertions(+), 26 deletions(-)
> rename include/kvm/arm_arch_timer.h => arch/arm64/include/asm/kvm_arch_timer.h (100%)
> rename include/kvm/arm_pmu.h => arch/arm64/include/asm/kvm_pmu.h (100%)
> rename include/kvm/arm_vgic.h => arch/arm64/include/asm/kvm_vgic.h (100%)
Nitpick:
|F: include/kvm/arm_*
can be deleted from the KVM/arm64 MAINTAINERS entry now.
Thanks,
Zenghui
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (2 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 3/8] KVM: arm64: Move ARM specific headers in include/kvm to arch directory Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-16 1:13 ` Bibo Mao
2025-06-11 0:10 ` [PATCH 5/8] KVM: MIPS: Stop adding virt/kvm to the arch include path Sean Christopherson
` (4 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Move iodev.h, the last remaining holdout in include/kvm, to the standard
include/linux directory as kvm_iodev.h and delete include/kvm.
Acked-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
MAINTAINERS | 1 -
arch/arm64/include/asm/kvm_vgic.h | 2 +-
arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +-
arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +-
arch/arm64/kvm/vgic/vgic-mmio.c | 2 +-
arch/loongarch/include/asm/kvm_eiointc.h | 2 +-
arch/loongarch/include/asm/kvm_ipi.h | 2 +-
arch/loongarch/include/asm/kvm_pch_pic.h | 2 +-
arch/mips/include/asm/kvm_host.h | 3 +--
arch/powerpc/kvm/mpic.c | 2 +-
arch/riscv/kvm/aia_aplic.c | 2 +-
arch/riscv/kvm/aia_imsic.c | 2 +-
arch/x86/kvm/i8254.h | 2 +-
arch/x86/kvm/ioapic.h | 2 +-
arch/x86/kvm/irq.h | 2 +-
arch/x86/kvm/lapic.h | 2 +-
include/{kvm/iodev.h => linux/kvm_iodev.h} | 0
virt/kvm/coalesced_mmio.c | 3 +--
virt/kvm/eventfd.c | 2 +-
virt/kvm/kvm_main.c | 3 +--
20 files changed, 18 insertions(+), 22 deletions(-)
rename include/{kvm/iodev.h => linux/kvm_iodev.h} (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 10cf54c8f727..a2cd432273e5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13011,7 +13011,6 @@ W: http://www.linux-kvm.org
T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
F: Documentation/virt/kvm/
F: include/asm-generic/kvm*
-F: include/kvm/iodev.h
F: include/linux/kvm*
F: include/trace/events/kvm.h
F: include/uapi/asm-generic/kvm*
diff --git a/arch/arm64/include/asm/kvm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h
index 4a34f7f0a864..09d7f628fa3b 100644
--- a/arch/arm64/include/asm/kvm_vgic.h
+++ b/arch/arm64/include/asm/kvm_vgic.h
@@ -14,7 +14,7 @@
#include <linux/static_key.h>
#include <linux/types.h>
#include <linux/xarray.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#include <linux/list.h>
#include <linux/jump_label.h>
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
index d00c8a74fad6..889440a8b129 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
@@ -6,9 +6,9 @@
#include <linux/irqchip/arm-gic.h>
#include <linux/kvm.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/nospec.h>
-#include <kvm/iodev.h>
#include <asm/kvm_vgic.h>
#include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index 505d4e389885..db95d3ccbd14 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -7,8 +7,8 @@
#include <linux/irqchip/arm-gic-v3.h>
#include <linux/kvm.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/interrupt.h>
-#include <kvm/iodev.h>
#include <asm/kvm_emulate.h>
#include <asm/kvm_arm.h>
diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
index ec1b13abc728..de689e0e881f 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -9,7 +9,7 @@
#include <linux/irq.h>
#include <linux/kvm.h>
#include <linux/kvm_host.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#include <asm/kvm_arch_timer.h>
#include <asm/kvm_vgic.h>
diff --git a/arch/loongarch/include/asm/kvm_eiointc.h b/arch/loongarch/include/asm/kvm_eiointc.h
index a3a40aba8acf..0049b0b79477 100644
--- a/arch/loongarch/include/asm/kvm_eiointc.h
+++ b/arch/loongarch/include/asm/kvm_eiointc.h
@@ -6,7 +6,7 @@
#ifndef __ASM_KVM_EIOINTC_H
#define __ASM_KVM_EIOINTC_H
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#define EIOINTC_IRQS 256
#define EIOINTC_ROUTE_MAX_VCPUS 256
diff --git a/arch/loongarch/include/asm/kvm_ipi.h b/arch/loongarch/include/asm/kvm_ipi.h
index 060163dfb4a3..3956b230f087 100644
--- a/arch/loongarch/include/asm/kvm_ipi.h
+++ b/arch/loongarch/include/asm/kvm_ipi.h
@@ -6,7 +6,7 @@
#ifndef __ASM_KVM_IPI_H
#define __ASM_KVM_IPI_H
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#define LARCH_INT_IPI 12
diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/include/asm/kvm_pch_pic.h
index e6df6a4c1c70..4b37e3134e52 100644
--- a/arch/loongarch/include/asm/kvm_pch_pic.h
+++ b/arch/loongarch/include/asm/kvm_pch_pic.h
@@ -6,7 +6,7 @@
#ifndef __ASM_KVM_PCH_PIC_H
#define __ASM_KVM_PCH_PIC_H
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#define PCH_PIC_SIZE 0x3e8
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index c14b10821817..0d7dd89ca5bf 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -16,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/kvm.h>
+#include <linux/kvm_iodev.h>
#include <linux/kvm_types.h>
#include <linux/threads.h>
#include <linux/spinlock.h>
@@ -24,8 +25,6 @@
#include <asm/inst.h>
#include <asm/mipsregs.h>
-#include <kvm/iodev.h>
-
/* MIPS KVM register ids */
#define MIPS_CP0_32(_R, _S) \
(KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S)))
diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
index 23e9c2bd9f27..b25a03251544 100644
--- a/arch/powerpc/kvm/mpic.c
+++ b/arch/powerpc/kvm/mpic.c
@@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/anon_inodes.h>
@@ -33,7 +34,6 @@
#include <asm/mpic.h>
#include <asm/kvm_para.h>
#include <asm/kvm_ppc.h>
-#include <kvm/iodev.h>
#define MAX_CPU 32
#define MAX_SRC 256
diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c
index f59d1c0c8c43..bf163724aec5 100644
--- a/arch/riscv/kvm/aia_aplic.c
+++ b/arch/riscv/kvm/aia_aplic.c
@@ -9,10 +9,10 @@
#include <linux/irqchip/riscv-aplic.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/math.h>
#include <linux/spinlock.h>
#include <linux/swab.h>
-#include <kvm/iodev.h>
struct aplic_irq {
raw_spinlock_t lock;
diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c
index 29ef9c2133a9..ae3c0807baa9 100644
--- a/arch/riscv/kvm/aia_imsic.c
+++ b/arch/riscv/kvm/aia_imsic.c
@@ -11,10 +11,10 @@
#include <linux/bitmap.h>
#include <linux/irqchip/riscv-imsic.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/math.h>
#include <linux/spinlock.h>
#include <linux/swab.h>
-#include <kvm/iodev.h>
#include <asm/csr.h>
#define IMSIC_MAX_EIX (IMSIC_MAX_ID / BITS_PER_TYPE(u64))
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index a768212ba821..4de7a0b88e4f 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -4,7 +4,7 @@
#include <linux/kthread.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
struct kvm_kpit_channel_state {
u32 count; /* can be 65536 */
diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index aa8cb4ac0479..cb36c36affd3 100644
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -3,7 +3,7 @@
#define __KVM_IO_APIC_H
#include <linux/kvm_host.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#include "irq.h"
struct kvm;
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 76d46b2f41dd..b21b03aa2ee7 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -13,9 +13,9 @@
#include <linux/mm_types.h>
#include <linux/hrtimer.h>
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/spinlock.h>
-#include <kvm/iodev.h>
#include "lapic.h"
#define PIC_NUM_PINS 16
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 4ce30db65828..43ffbded5f72 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -2,7 +2,7 @@
#ifndef __KVM_X86_LAPIC_H
#define __KVM_X86_LAPIC_H
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#include <linux/kvm_host.h>
diff --git a/include/kvm/iodev.h b/include/linux/kvm_iodev.h
similarity index 100%
rename from include/kvm/iodev.h
rename to include/linux/kvm_iodev.h
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index 375d6285475e..d0f84e3611da 100644
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -9,8 +9,7 @@
*
*/
-#include <kvm/iodev.h>
-
+#include <linux/kvm_iodev.h>
#include <linux/kvm_host.h>
#include <linux/slab.h>
#include <linux/kvm.h>
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 11e5d1e3f12e..35786d59b233 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -26,7 +26,7 @@
#include <linux/irqbypass.h>
#include <trace/events/kvm.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
#ifdef CONFIG_HAVE_KVM_IRQCHIP
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index eec82775c5bf..a401ba32ecaa 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -10,9 +10,8 @@
* Yaniv Kamay <yaniv@qumranet.com>
*/
-#include <kvm/iodev.h>
-
#include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
#include <linux/kvm.h>
#include <linux/module.h>
#include <linux/errno.h>
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h
2025-06-11 0:10 ` [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h Sean Christopherson
@ 2025-06-16 1:13 ` Bibo Mao
0 siblings, 0 replies; 15+ messages in thread
From: Bibo Mao @ 2025-06-16 1:13 UTC (permalink / raw)
To: Sean Christopherson, Marc Zyngier, Oliver Upton, Tianrui Zhao,
Huacai Chen, Madhavan Srinivasan, Anup Patel, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Christian Borntraeger, Janosch Frank,
Claudio Imbrenda, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
On 2025/6/11 上午8:10, Sean Christopherson wrote:
> Move iodev.h, the last remaining holdout in include/kvm, to the standard
> include/linux directory as kvm_iodev.h and delete include/kvm.
>
> Acked-by: Anup Patel <anup@brainfault.org>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> MAINTAINERS | 1 -
> arch/arm64/include/asm/kvm_vgic.h | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio-v2.c | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +-
> arch/arm64/kvm/vgic/vgic-mmio.c | 2 +-
> arch/loongarch/include/asm/kvm_eiointc.h | 2 +-
> arch/loongarch/include/asm/kvm_ipi.h | 2 +-
> arch/loongarch/include/asm/kvm_pch_pic.h | 2 +-
> arch/mips/include/asm/kvm_host.h | 3 +--
> arch/powerpc/kvm/mpic.c | 2 +-
> arch/riscv/kvm/aia_aplic.c | 2 +-
> arch/riscv/kvm/aia_imsic.c | 2 +-
> arch/x86/kvm/i8254.h | 2 +-
> arch/x86/kvm/ioapic.h | 2 +-
> arch/x86/kvm/irq.h | 2 +-
> arch/x86/kvm/lapic.h | 2 +-
> include/{kvm/iodev.h => linux/kvm_iodev.h} | 0
> virt/kvm/coalesced_mmio.c | 3 +--
> virt/kvm/eventfd.c | 2 +-
> virt/kvm/kvm_main.c | 3 +--
> 20 files changed, 18 insertions(+), 22 deletions(-)
> rename include/{kvm/iodev.h => linux/kvm_iodev.h} (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 10cf54c8f727..a2cd432273e5 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13011,7 +13011,6 @@ W: http://www.linux-kvm.org
> T: git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
> F: Documentation/virt/kvm/
> F: include/asm-generic/kvm*
> -F: include/kvm/iodev.h
> F: include/linux/kvm*
> F: include/trace/events/kvm.h
> F: include/uapi/asm-generic/kvm*
> diff --git a/arch/arm64/include/asm/kvm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h
> index 4a34f7f0a864..09d7f628fa3b 100644
> --- a/arch/arm64/include/asm/kvm_vgic.h
> +++ b/arch/arm64/include/asm/kvm_vgic.h
> @@ -14,7 +14,7 @@
> #include <linux/static_key.h>
> #include <linux/types.h>
> #include <linux/xarray.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/list.h>
> #include <linux/jump_label.h>
>
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> index d00c8a74fad6..889440a8b129 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> @@ -6,9 +6,9 @@
> #include <linux/irqchip/arm-gic.h>
> #include <linux/kvm.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/nospec.h>
>
> -#include <kvm/iodev.h>
> #include <asm/kvm_vgic.h>
>
> #include "vgic.h"
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> index 505d4e389885..db95d3ccbd14 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> @@ -7,8 +7,8 @@
> #include <linux/irqchip/arm-gic-v3.h>
> #include <linux/kvm.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/interrupt.h>
> -#include <kvm/iodev.h>
>
> #include <asm/kvm_emulate.h>
> #include <asm/kvm_arm.h>
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
> index ec1b13abc728..de689e0e881f 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio.c
> @@ -9,7 +9,7 @@
> #include <linux/irq.h>
> #include <linux/kvm.h>
> #include <linux/kvm_host.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
> #include <asm/kvm_arch_timer.h>
> #include <asm/kvm_vgic.h>
>
> diff --git a/arch/loongarch/include/asm/kvm_eiointc.h b/arch/loongarch/include/asm/kvm_eiointc.h
> index a3a40aba8acf..0049b0b79477 100644
> --- a/arch/loongarch/include/asm/kvm_eiointc.h
> +++ b/arch/loongarch/include/asm/kvm_eiointc.h
> @@ -6,7 +6,7 @@
> #ifndef __ASM_KVM_EIOINTC_H
> #define __ASM_KVM_EIOINTC_H
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> #define EIOINTC_IRQS 256
> #define EIOINTC_ROUTE_MAX_VCPUS 256
> diff --git a/arch/loongarch/include/asm/kvm_ipi.h b/arch/loongarch/include/asm/kvm_ipi.h
> index 060163dfb4a3..3956b230f087 100644
> --- a/arch/loongarch/include/asm/kvm_ipi.h
> +++ b/arch/loongarch/include/asm/kvm_ipi.h
> @@ -6,7 +6,7 @@
> #ifndef __ASM_KVM_IPI_H
> #define __ASM_KVM_IPI_H
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> #define LARCH_INT_IPI 12
>
> diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/include/asm/kvm_pch_pic.h
> index e6df6a4c1c70..4b37e3134e52 100644
> --- a/arch/loongarch/include/asm/kvm_pch_pic.h
> +++ b/arch/loongarch/include/asm/kvm_pch_pic.h
> @@ -6,7 +6,7 @@
> #ifndef __ASM_KVM_PCH_PIC_H
> #define __ASM_KVM_PCH_PIC_H
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> #define PCH_PIC_SIZE 0x3e8
>
> diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
> index c14b10821817..0d7dd89ca5bf 100644
> --- a/arch/mips/include/asm/kvm_host.h
> +++ b/arch/mips/include/asm/kvm_host.h
> @@ -16,6 +16,7 @@
> #include <linux/interrupt.h>
> #include <linux/types.h>
> #include <linux/kvm.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/kvm_types.h>
> #include <linux/threads.h>
> #include <linux/spinlock.h>
> @@ -24,8 +25,6 @@
> #include <asm/inst.h>
> #include <asm/mipsregs.h>
>
> -#include <kvm/iodev.h>
> -
> /* MIPS KVM register ids */
> #define MIPS_CP0_32(_R, _S) \
> (KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S)))
> diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
> index 23e9c2bd9f27..b25a03251544 100644
> --- a/arch/powerpc/kvm/mpic.c
> +++ b/arch/powerpc/kvm/mpic.c
> @@ -26,6 +26,7 @@
> #include <linux/slab.h>
> #include <linux/mutex.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> #include <linux/anon_inodes.h>
> @@ -33,7 +34,6 @@
> #include <asm/mpic.h>
> #include <asm/kvm_para.h>
> #include <asm/kvm_ppc.h>
> -#include <kvm/iodev.h>
>
> #define MAX_CPU 32
> #define MAX_SRC 256
> diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c
> index f59d1c0c8c43..bf163724aec5 100644
> --- a/arch/riscv/kvm/aia_aplic.c
> +++ b/arch/riscv/kvm/aia_aplic.c
> @@ -9,10 +9,10 @@
>
> #include <linux/irqchip/riscv-aplic.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/math.h>
> #include <linux/spinlock.h>
> #include <linux/swab.h>
> -#include <kvm/iodev.h>
>
> struct aplic_irq {
> raw_spinlock_t lock;
> diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c
> index 29ef9c2133a9..ae3c0807baa9 100644
> --- a/arch/riscv/kvm/aia_imsic.c
> +++ b/arch/riscv/kvm/aia_imsic.c
> @@ -11,10 +11,10 @@
> #include <linux/bitmap.h>
> #include <linux/irqchip/riscv-imsic.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/math.h>
> #include <linux/spinlock.h>
> #include <linux/swab.h>
> -#include <kvm/iodev.h>
> #include <asm/csr.h>
>
> #define IMSIC_MAX_EIX (IMSIC_MAX_ID / BITS_PER_TYPE(u64))
> diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
> index a768212ba821..4de7a0b88e4f 100644
> --- a/arch/x86/kvm/i8254.h
> +++ b/arch/x86/kvm/i8254.h
> @@ -4,7 +4,7 @@
>
> #include <linux/kthread.h>
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> struct kvm_kpit_channel_state {
> u32 count; /* can be 65536 */
> diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
> index aa8cb4ac0479..cb36c36affd3 100644
> --- a/arch/x86/kvm/ioapic.h
> +++ b/arch/x86/kvm/ioapic.h
> @@ -3,7 +3,7 @@
> #define __KVM_IO_APIC_H
>
> #include <linux/kvm_host.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
> #include "irq.h"
>
> struct kvm;
> diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
> index 76d46b2f41dd..b21b03aa2ee7 100644
> --- a/arch/x86/kvm/irq.h
> +++ b/arch/x86/kvm/irq.h
> @@ -13,9 +13,9 @@
> #include <linux/mm_types.h>
> #include <linux/hrtimer.h>
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/spinlock.h>
>
> -#include <kvm/iodev.h>
> #include "lapic.h"
>
> #define PIC_NUM_PINS 16
> diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
> index 4ce30db65828..43ffbded5f72 100644
> --- a/arch/x86/kvm/lapic.h
> +++ b/arch/x86/kvm/lapic.h
> @@ -2,7 +2,7 @@
> #ifndef __KVM_X86_LAPIC_H
> #define __KVM_X86_LAPIC_H
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> #include <linux/kvm_host.h>
>
> diff --git a/include/kvm/iodev.h b/include/linux/kvm_iodev.h
> similarity index 100%
> rename from include/kvm/iodev.h
> rename to include/linux/kvm_iodev.h
> diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
> index 375d6285475e..d0f84e3611da 100644
> --- a/virt/kvm/coalesced_mmio.c
> +++ b/virt/kvm/coalesced_mmio.c
> @@ -9,8 +9,7 @@
> *
> */
>
> -#include <kvm/iodev.h>
> -
> +#include <linux/kvm_iodev.h>
> #include <linux/kvm_host.h>
> #include <linux/slab.h>
> #include <linux/kvm.h>
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index 11e5d1e3f12e..35786d59b233 100644
> --- a/virt/kvm/eventfd.c
> +++ b/virt/kvm/eventfd.c
> @@ -26,7 +26,7 @@
> #include <linux/irqbypass.h>
> #include <trace/events/kvm.h>
>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>
> #ifdef CONFIG_HAVE_KVM_IRQCHIP
>
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index eec82775c5bf..a401ba32ecaa 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -10,9 +10,8 @@
> * Yaniv Kamay <yaniv@qumranet.com>
> */
>
> -#include <kvm/iodev.h>
> -
> #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
> #include <linux/kvm.h>
> #include <linux/module.h>
> #include <linux/errno.h>
>
About modification with LoongArch specific.
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/8] KVM: MIPS: Stop adding virt/kvm to the arch include path
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (3 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-11 0:10 ` [PATCH 6/8] KVM: PPC: " Sean Christopherson
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Don't add virt/kvm to KVM MIPS' include path, the headers in virt/kvm are
intended to be used only by other code in virt/kvm, i.e. are "private" to
the core KVM code. It's not clear that MIPS *ever* included a header from
virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a different
architecture's Makefile when MIPS support was first added.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/mips/kvm/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile
index 805aeea2166e..96a7cd21b140 100644
--- a/arch/mips/kvm/Makefile
+++ b/arch/mips/kvm/Makefile
@@ -4,7 +4,7 @@
include $(srctree)/virt/kvm/Makefile.kvm
-ccflags-y += -Ivirt/kvm -Iarch/mips/kvm
+ccflags-y += -Iarch/mips/kvm
kvm-$(CONFIG_CPU_HAS_MSA) += msa.o
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/8] KVM: PPC: Stop adding virt/kvm to the arch include path
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (4 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 5/8] KVM: MIPS: Stop adding virt/kvm to the arch include path Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-16 7:15 ` Gautam Menghani
2025-06-11 0:10 ` [PATCH 7/8] KVM: s390: " Sean Christopherson
` (2 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Don't add virt/kvm to KVM PPC's include path, the headers in virt/kvm are
intended to be used only by other code in virt/kvm, i.e. are "private" to
the core KVM code. It's not clear that PPC *ever* included a header from
virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a different
architecture's Makefile when PPC support was first added.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/powerpc/kvm/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 4bd9d1230869..1a575db2666e 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -3,7 +3,7 @@
# Makefile for Kernel-based Virtual Machine module
#
-ccflags-y := -Ivirt/kvm -Iarch/powerpc/kvm
+ccflags-y := -Iarch/powerpc/kvm
include $(srctree)/virt/kvm/Makefile.kvm
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 6/8] KVM: PPC: Stop adding virt/kvm to the arch include path
2025-06-11 0:10 ` [PATCH 6/8] KVM: PPC: " Sean Christopherson
@ 2025-06-16 7:15 ` Gautam Menghani
0 siblings, 0 replies; 15+ messages in thread
From: Gautam Menghani @ 2025-06-16 7:15 UTC (permalink / raw)
To: Sean Christopherson
Cc: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Paolo Bonzini, linux-arm-kernel, kvmarm, kvm, loongarch,
linux-mips, linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel,
Anish Ghulati, Colton Lewis, Thomas Huth
Reviewed-by: Gautam Menghani <gautam@linux.ibm.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 7/8] KVM: s390: Stop adding virt/kvm to the arch include path
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (5 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 6/8] KVM: PPC: " Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-12 13:01 ` Janosch Frank
2025-06-11 0:10 ` [PATCH 8/8] KVM: Standardize include paths across all architectures Sean Christopherson
2025-06-12 4:56 ` [PATCH 0/8] KVM: Remove include/kvm, standardize includes Paolo Bonzini
8 siblings, 1 reply; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Don't add virt/kvm to KVM s390's include path, the headers in virt/kvm are
intended to be used only by other code in virt/kvm, i.e. are "private" to
the core KVM code. It's not clear that s390 *ever* included a header from
virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a x86's
Makefile when s390 support was first added.
The only headers in virt/kvm at the time were the x86 specific ioapic.h,
and iodev.h, neither of which shows up as an #include in the diff for the
commit range 37817f2982d0f..e976a2b997fc4.
Acked-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/s390/kvm/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile
index 9a723c48b05a..b742e08c036b 100644
--- a/arch/s390/kvm/Makefile
+++ b/arch/s390/kvm/Makefile
@@ -5,7 +5,7 @@
include $(srctree)/virt/kvm/Makefile.kvm
-ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
+ccflags-y := -Iarch/s390/kvm
kvm-y += kvm-s390.o intercept.o interrupt.o priv.o sigp.o
kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 7/8] KVM: s390: Stop adding virt/kvm to the arch include path
2025-06-11 0:10 ` [PATCH 7/8] KVM: s390: " Sean Christopherson
@ 2025-06-12 13:01 ` Janosch Frank
0 siblings, 0 replies; 15+ messages in thread
From: Janosch Frank @ 2025-06-12 13:01 UTC (permalink / raw)
To: Sean Christopherson, Marc Zyngier, Oliver Upton, Tianrui Zhao,
Bibo Mao, Huacai Chen, Madhavan Srinivasan, Anup Patel,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Christian Borntraeger,
Claudio Imbrenda, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
On 6/11/25 2:10 AM, Sean Christopherson wrote:
> Don't add virt/kvm to KVM s390's include path, the headers in virt/kvm are
> intended to be used only by other code in virt/kvm, i.e. are "private" to
> the core KVM code. It's not clear that s390 *ever* included a header from
> virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a x86's
> Makefile when s390 support was first added.
>
> The only headers in virt/kvm at the time were the x86 specific ioapic.h,
> and iodev.h, neither of which shows up as an #include in the diff for the
> commit range 37817f2982d0f..e976a2b997fc4.
>
> Acked-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 8/8] KVM: Standardize include paths across all architectures
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (6 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 7/8] KVM: s390: " Sean Christopherson
@ 2025-06-11 0:10 ` Sean Christopherson
2025-06-12 4:56 ` [PATCH 0/8] KVM: Remove include/kvm, standardize includes Paolo Bonzini
8 siblings, 0 replies; 15+ messages in thread
From: Sean Christopherson @ 2025-06-11 0:10 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton, Tianrui Zhao, Bibo Mao, Huacai Chen,
Madhavan Srinivasan, Anup Patel, Paul Walmsley, Palmer Dabbelt,
Albert Ou, Christian Borntraeger, Janosch Frank, Claudio Imbrenda,
Sean Christopherson, Paolo Bonzini
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
Standardize KVM's include paths across all architectures by declaring
the KVM-specific includes in the common Makefile.kvm. Having common KVM
"own" the included paths reduces the temptation to unnecessarily add
virt/kvm to arch include paths, and conversely if allowing arch code to
grab headers from virt/kvm becomes desirable, virt/kvm can be added to
all architecture's include path with a single line update.
Having the common KVM makefile append to ccflags also provides a
convenient location to append other things, e.g. KVM-specific #defines.
Note, this changes the behavior of s390 and PPC, as s390 and PPC
previously overwrote ccflags-y instead of adding on. There is no evidence
that overwriting ccflags-y was necessary or even deliberate, as both s390
and PPC switched to the overwrite behavior without so much as a passing
mention when EXTRA_CFLAGS was replaced with ccflags-y (commit c73028a02887
("s390: change to new flag variable") and commit 4108d9ba9091
("powerpc/Makefiles: Change to new flag variables")).
Acked-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/arm64/kvm/Makefile | 2 --
arch/mips/kvm/Makefile | 2 --
arch/powerpc/kvm/Makefile | 2 --
arch/riscv/kvm/Makefile | 2 --
arch/s390/kvm/Makefile | 2 --
arch/x86/kvm/Makefile | 1 -
virt/kvm/Makefile.kvm | 2 ++
7 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 7c329e01c557..86035b311269 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -3,8 +3,6 @@
# Makefile for Kernel-based Virtual Machine module
#
-ccflags-y += -I $(src)
-
include $(srctree)/virt/kvm/Makefile.kvm
obj-$(CONFIG_KVM) += kvm.o
diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile
index 96a7cd21b140..d198e1addea7 100644
--- a/arch/mips/kvm/Makefile
+++ b/arch/mips/kvm/Makefile
@@ -4,8 +4,6 @@
include $(srctree)/virt/kvm/Makefile.kvm
-ccflags-y += -Iarch/mips/kvm
-
kvm-$(CONFIG_CPU_HAS_MSA) += msa.o
kvm-y += mips.o emulate.o entry.o \
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 1a575db2666e..6f12edd465df 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -3,8 +3,6 @@
# Makefile for Kernel-based Virtual Machine module
#
-ccflags-y := -Iarch/powerpc/kvm
-
include $(srctree)/virt/kvm/Makefile.kvm
common-objs-y += powerpc.o emulate_loadstore.o
diff --git a/arch/riscv/kvm/Makefile b/arch/riscv/kvm/Makefile
index 4e0bba91d284..dbe61a398cc8 100644
--- a/arch/riscv/kvm/Makefile
+++ b/arch/riscv/kvm/Makefile
@@ -3,8 +3,6 @@
# Makefile for RISC-V KVM support
#
-ccflags-y += -I $(src)
-
include $(srctree)/virt/kvm/Makefile.kvm
obj-$(CONFIG_KVM) += kvm.o
diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile
index b742e08c036b..5cbcaa7f241a 100644
--- a/arch/s390/kvm/Makefile
+++ b/arch/s390/kvm/Makefile
@@ -5,8 +5,6 @@
include $(srctree)/virt/kvm/Makefile.kvm
-ccflags-y := -Iarch/s390/kvm
-
kvm-y += kvm-s390.o intercept.o interrupt.o priv.o sigp.o
kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o
diff --git a/arch/x86/kvm/Makefile b/arch/x86/kvm/Makefile
index a5d362c7b504..f78f11b582d2 100644
--- a/arch/x86/kvm/Makefile
+++ b/arch/x86/kvm/Makefile
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
-ccflags-y += -I $(srctree)/arch/x86/kvm
ccflags-$(CONFIG_KVM_WERROR) += -Werror
include $(srctree)/virt/kvm/Makefile.kvm
diff --git a/virt/kvm/Makefile.kvm b/virt/kvm/Makefile.kvm
index 724c89af78af..0e7ba49026fc 100644
--- a/virt/kvm/Makefile.kvm
+++ b/virt/kvm/Makefile.kvm
@@ -3,6 +3,8 @@
# Makefile for Kernel-based Virtual Machine module
#
+ccflags-y += -I$(src)
+
KVM ?= ../../../virt/kvm
kvm-y := $(KVM)/kvm_main.o $(KVM)/eventfd.o $(KVM)/binary_stats.o
--
2.50.0.rc0.642.g800a2b2222-goog
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 0/8] KVM: Remove include/kvm, standardize includes
2025-06-11 0:10 [PATCH 0/8] KVM: Remove include/kvm, standardize includes Sean Christopherson
` (7 preceding siblings ...)
2025-06-11 0:10 ` [PATCH 8/8] KVM: Standardize include paths across all architectures Sean Christopherson
@ 2025-06-12 4:56 ` Paolo Bonzini
2025-06-13 21:02 ` Oliver Upton
8 siblings, 1 reply; 15+ messages in thread
From: Paolo Bonzini @ 2025-06-12 4:56 UTC (permalink / raw)
To: Sean Christopherson, Marc Zyngier, Oliver Upton, Tianrui Zhao,
Bibo Mao, Huacai Chen, Madhavan Srinivasan, Anup Patel,
Paul Walmsley, Palmer Dabbelt, Albert Ou, Christian Borntraeger,
Janosch Frank, Claudio Imbrenda
Cc: linux-arm-kernel, kvmarm, kvm, loongarch, linux-mips,
linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel, Anish Ghulati,
Colton Lewis, Thomas Huth
On 6/11/25 02:10, Sean Christopherson wrote:
> Kill off include/kvm (through file moves/renames), and standardize the set of
> KVM includes across all architectures.
>
> This conflicts with Colton's partioned PMU series[1], but this should work as
> a nice prepatory cleanup for the partitioned PMU work (and hopefully can land
> sooner).
>
> Note, these patches were originally posted as part of a much larger and more
> agressive RFC[1]. We've effectively abandoned upstreaming the multi-KVM idea,
> but I'm trying to (slowly) upstream the bits and pieces that I think/hope are
> generally beneficial.
>
> [1] https://lore.kernel.org/all/20250602192702.2125115-1-coltonlewis@google.com
> [2] https://lore.kernel.org/all/20230916003118.2540661-1-seanjc@google.com
Marc, Oliver, I'd like to commit this to kvm/next sometime soon; I'll
wait for your ack since most of the meat here is in arch/arm64.
Thanks,
Paolo
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 0/8] KVM: Remove include/kvm, standardize includes
2025-06-12 4:56 ` [PATCH 0/8] KVM: Remove include/kvm, standardize includes Paolo Bonzini
@ 2025-06-13 21:02 ` Oliver Upton
0 siblings, 0 replies; 15+ messages in thread
From: Oliver Upton @ 2025-06-13 21:02 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Sean Christopherson, Marc Zyngier, Tianrui Zhao, Bibo Mao,
Huacai Chen, Madhavan Srinivasan, Anup Patel, Paul Walmsley,
Palmer Dabbelt, Albert Ou, Christian Borntraeger, Janosch Frank,
Claudio Imbrenda, linux-arm-kernel, kvmarm, kvm, loongarch,
linux-mips, linuxppc-dev, kvm-riscv, linux-riscv, linux-kernel,
Anish Ghulati, Colton Lewis, Thomas Huth
On Thu, Jun 12, 2025 at 06:56:53AM +0200, Paolo Bonzini wrote:
> On 6/11/25 02:10, Sean Christopherson wrote:
> > Kill off include/kvm (through file moves/renames), and standardize the set of
> > KVM includes across all architectures.
> >
> > This conflicts with Colton's partioned PMU series[1], but this should work as
> > a nice prepatory cleanup for the partitioned PMU work (and hopefully can land
> > sooner).
> >
> > Note, these patches were originally posted as part of a much larger and more
> > agressive RFC[1]. We've effectively abandoned upstreaming the multi-KVM idea,
> > but I'm trying to (slowly) upstream the bits and pieces that I think/hope are
> > generally beneficial.
> >
> > [1] https://lore.kernel.org/all/20250602192702.2125115-1-coltonlewis@google.com
> > [2] https://lore.kernel.org/all/20230916003118.2540661-1-seanjc@google.com
>
> Marc, Oliver, I'd like to commit this to kvm/next sometime soon; I'll wait
> for your ack since most of the meat here is in arch/arm64.
Let it rip, just to get ahead of potential conflicts can you push out a
topic branch?
Acked-by: Oliver Upton <oliver.upton@linux.dev>
Thanks,
Oliver
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 15+ messages in thread