KVM: arm64: Move virt/kvm/arm to arch/arm64
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: Move virt/kvm/arm to arch/arm64
Now that the 32bit KVM/arm host is a distant memory, let's move the whole of the KVM/arm64 code into the arm64 tree.
As they said in the song: Welcome Home (Sanitarium).
Signed-off-by Marc Zyngier <[email protected]>
---
MAINTAINERS | 1 -
arch/arm64/kvm/Makefile | 44 ++--
{virt/kvm/arm => arch/arm64/kvm}/aarch32.c | 0
{virt/kvm/arm => arch/arm64/kvm}/arch_timer.c | 0
{virt/kvm/arm => arch/arm64/kvm}/arm.c | 2 +-
arch/arm64/kvm/handle_exit.c | 2 +-
arch/arm64/kvm/hyp/Makefile | 9 +-
.../kvm/arm => arch/arm64/kvm}/hyp/aarch32.c | 0
.../kvm/arm => arch/arm64/kvm}/hyp/timer-sr.c | 0
.../arm => arch/arm64/kvm}/hyp/vgic-v3-sr.c | 4 -
{virt/kvm/arm => arch/arm64/kvm}/hypercalls.c | 0
{virt/kvm/arm => arch/arm64/kvm}/mmio.c | 0
{virt/kvm/arm => arch/arm64/kvm}/mmu.c | 0
{virt/kvm/arm => arch/arm64/kvm}/perf.c | 0
.../arm/pmu.c => arch/arm64/kvm/pmu-emul.c | 0
{virt/kvm/arm => arch/arm64/kvm}/psci.c | 0
{virt/kvm/arm => arch/arm64/kvm}/pvtime.c | 0
arch/arm64/kvm/trace.h | 216 +-----------------
.../arm/trace.h => arch/arm64/kvm/trace_arm.h | 11 +-
arch/arm64/kvm/trace_handle_exit.h | 215 +++++++++++++++++
arch/arm64/kvm/vgic-sys-reg-v3.c | 2 +-
{virt/kvm/arm => arch/arm64/kvm}/vgic/trace.h | 2 +-
.../arm => arch/arm64/kvm}/vgic/vgic-debug.c | 0
.../arm => arch/arm64/kvm}/vgic/vgic-init.c | 0
.../arm => arch/arm64/kvm}/vgic/vgic-irqfd.c | 0
.../arm => arch/arm64/kvm}/vgic/vgic-its.c | 0
.../arm64/kvm}/vgic/vgic-kvm-device.c | 0
.../arm64/kvm}/vgic/vgic-mmio-v2.c | 0
.../arm64/kvm}/vgic/vgic-mmio-v3.c | 0
.../arm => arch/arm64/kvm}/vgic/vgic-mmio.c | 0
.../arm => arch/arm64/kvm}/vgic/vgic-mmio.h | 0
.../kvm/arm => arch/arm64/kvm}/vgic/vgic-v2.c | 0
.../kvm/arm => arch/arm64/kvm}/vgic/vgic-v3.c | 2 -
.../kvm/arm => arch/arm64/kvm}/vgic/vgic-v4.c | 0
{virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.c | 0
{virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.h | 0
36 files changed, 253 insertions(+), 257 deletions(-)
rename {virt/kvm/arm => arch/arm64/kvm}/aarch32.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/arch_timer.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/arm.c (99%)
rename {virt/kvm/arm => arch/arm64/kvm}/hyp/aarch32.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/hyp/timer-sr.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/hyp/vgic-v3-sr.c (99%)
rename {virt/kvm/arm => arch/arm64/kvm}/hypercalls.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/mmio.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/mmu.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/perf.c (100%)
rename virt/kvm/arm/pmu.c => arch/arm64/kvm/pmu-emul.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/psci.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/pvtime.c (100%)
rename virt/kvm/arm/trace.h => arch/arm64/kvm/trace_arm.h (97%)
create mode 100644 arch/arm64/kvm/trace_handle_exit.h
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/trace.h (93%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-debug.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-init.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-irqfd.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-its.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-kvm-device.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v2.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio-v3.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-mmio.h (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v2.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v3.c (99%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic-v4.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.c (100%)
rename {virt/kvm/arm => arch/arm64/kvm}/vgic/vgic.h (100%)MAINTAINERS +0 -1
@@ -9295,7 +9295,6 @@ F: arch/arm64/include/asm/kvm* F: arch/arm64/include/uapi/asm/kvm* F: arch/arm64/kvm/ F: include/kvm/arm_* -F: virt/kvm/arm/ KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips) L: [email protected]
arch/arm64/kvm/Makefile +22 -22
59 lines not on this page · raw message
arch/arm64/kvm/aarch32.c renamed from virt/kvm/arm/aarch32.c +0 -0
arch/arm64/kvm/arch_timer.c renamed from virt/kvm/arm/arch_timer.c +0 -0
arch/arm64/kvm/arm.c renamed from virt/kvm/arm/arm.c +1 -1
@@ -22,7 +22,7 @@#include <trace/events/kvm.h> #define CREATE_TRACE_POINTS -#include "trace.h" +#include "trace_arm.h" #include <linux/uaccess.h> #include <asm/ptrace.h>
arch/arm64/kvm/handle_exit.c +1 -1
@@ -23,7 +23,7 @@#include <kvm/arm_hypercalls.h> #define CREATE_TRACE_POINTS -#include "trace.h" +#include "trace_handle_exit.h" typedef int (*exit_handle_fn )(struct kvm_vcpu *,struct kvm_run *);
arch/arm64/kvm/hyp/Makefile +3 -6
@@ -6,12 +6,9 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ $(DISABLE_STACKLEAK_PLUGIN) -KVM=../../../../virt/kvm - -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/aarch32.o - +obj-$(CONFIG_KVM_ARM_HOST) += vgic-v3-sr.o +obj-$(CONFIG_KVM_ARM_HOST) += timer-sr.o +obj-$(CONFIG_KVM_ARM_HOST) += aarch32.o obj-$(CONFIG_KVM_ARM_HOST) += vgic-v2-cpuif-proxy.o obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o
arch/arm64/kvm/hyp/aarch32.c renamed from virt/kvm/arm/hyp/aarch32.c +0 -0
arch/arm64/kvm/hyp/timer-sr.c renamed from virt/kvm/arm/hyp/timer-sr.c +0 -0
arch/arm64/kvm/hyp/vgic-v3-sr.c renamed from virt/kvm/arm/hyp/vgic-v3-sr.c +0 -4
@@ -431,8 +431,6 @@ void __hyp_text __vgic_v3_write_vmcr(u32 vmcr)write_gicreg (vmcr,ICH_VMCR_EL2 ); } -#ifdef CONFIG_ARM64 - static int __hyp_text __vgic_v3_bpr_min(void) {/* See Pseudocode for VPriorityGroup */
@@ -1126,5 +1124,3 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu)return 1 ; } - -#endif
arch/arm64/kvm/hypercalls.c renamed from virt/kvm/arm/hypercalls.c +0 -0
arch/arm64/kvm/mmio.c renamed from virt/kvm/arm/mmio.c +0 -0
arch/arm64/kvm/mmu.c renamed from virt/kvm/arm/mmu.c +0 -0
arch/arm64/kvm/perf.c renamed from virt/kvm/arm/perf.c +0 -0
arch/arm64/kvm/pmu-emul.c renamed from virt/kvm/arm/pmu.c +0 -0
arch/arm64/kvm/psci.c renamed from virt/kvm/arm/psci.c +0 -0
arch/arm64/kvm/pvtime.c renamed from virt/kvm/arm/pvtime.c +0 -0
arch/arm64/kvm/trace.h +4 -212
220 lines not on this page · raw message
arch/arm64/kvm/trace_arm.h renamed from virt/kvm/arm/trace.h +5 -6
@@ -1,10 +1,9 @@/* SPDX-License-Identifier: GPL-2.0 */ -#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ ) -#define _TRACE_KVM_H +#if !defined(_TRACE_ARM_ARM64_KVM_H) || defined(TRACE_HEADER_MULTI_READ ) +#define _TRACE_ARM_ARM64_KVM_H#include <kvm/arm_arch_timer.h> #include <linux/tracepoint.h> -#include <asm/kvm_arm.h> #undef TRACE_SYSTEM#define TRACE_SYSTEM kvm
@@ -368,12 +367,12 @@ TRACE_EVENT(kvm_timer_emulate, __entry->timer_idx, __entry->should_fire) ); -#endif /* _TRACE_KVM_H */ +#endif /* _TRACE_ARM_ARM64_KVM_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../virt/kvm/arm +#define TRACE_INCLUDE_PATH .#undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_FILE trace +#define TRACE_INCLUDE_FILE trace_arm/* This part must be outside protection */ #include <trace/define_trace.h>
arch/arm64/kvm/trace_handle_exit.h new file +215 -0
215 lines not on this page · raw message
arch/arm64/kvm/vgic-sys-reg-v3.c +1 -1
@@ -7,7 +7,7 @@#include <linux/kvm.h> #include <linux/kvm_host.h> #include <asm/kvm_emulate.h> -#include "vgic.h" +#include "vgic/vgic.h" #include "sys_regs.h" static bool access_gic_ctlr(struct kvm_vcpu *vcpu, struct sys_reg_params *p,
arch/arm64/kvm/vgic/trace.h renamed from virt/kvm/arm/vgic/trace.h +1 -1
@@ -30,7 +30,7 @@ TRACE_EVENT(vgic_update_irq_pending,#endif /* _TRACE_VGIC_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../virt/kvm/arm/vgic +#define TRACE_INCLUDE_PATH ../../arch/arm64/kvm/vgic#undef TRACE_INCLUDE_FILE#define TRACE_INCLUDE_FILE trace
arch/arm64/kvm/vgic/vgic-debug.c renamed from virt/kvm/arm/vgic/vgic-debug.c +0 -0
arch/arm64/kvm/vgic/vgic-init.c renamed from virt/kvm/arm/vgic/vgic-init.c +0 -0
arch/arm64/kvm/vgic/vgic-irqfd.c renamed from virt/kvm/arm/vgic/vgic-irqfd.c +0 -0
arch/arm64/kvm/vgic/vgic-its.c renamed from virt/kvm/arm/vgic/vgic-its.c +0 -0
arch/arm64/kvm/vgic/vgic-kvm-device.c renamed from virt/kvm/arm/vgic/vgic-kvm-device.c +0 -0
arch/arm64/kvm/vgic/vgic-mmio-v2.c renamed from virt/kvm/arm/vgic/vgic-mmio-v2.c +0 -0
arch/arm64/kvm/vgic/vgic-mmio-v3.c renamed from virt/kvm/arm/vgic/vgic-mmio-v3.c +0 -0
arch/arm64/kvm/vgic/vgic-mmio.c renamed from virt/kvm/arm/vgic/vgic-mmio.c +0 -0
arch/arm64/kvm/vgic/vgic-mmio.h renamed from virt/kvm/arm/vgic/vgic-mmio.h +0 -0
arch/arm64/kvm/vgic/vgic-v2.c renamed from virt/kvm/arm/vgic/vgic-v2.c +0 -0
arch/arm64/kvm/vgic/vgic-v3.c renamed from virt/kvm/arm/vgic/vgic-v3.c +0 -2
@@ -630,12 +630,10 @@ int vgic_v3_probe(const struct gic_kvm_info *info)if (kvm_vgic_global_state.vcpu_base ==0 )kvm_info ("disabling GICv2 emulation\n" ); -#ifdef CONFIG_ARM64 if (cpus_have_const_cap (ARM64_WORKAROUND_CAVIUM_30115 )) { group0_trap = true; group1_trap = true; } -#endif if (group0_trap || group1_trap || common_trap) { kvm_info("GICv3 sysreg trapping enabled ([%s%s%s], reduced performance)\n",
arch/arm64/kvm/vgic/vgic-v4.c renamed from virt/kvm/arm/vgic/vgic-v4.c +0 -0
arch/arm64/kvm/vgic/vgic.c renamed from virt/kvm/arm/vgic/vgic.c +0 -0
arch/arm64/kvm/vgic/vgic.h renamed from virt/kvm/arm/vgic/vgic.h +0 -0
Signature · 1 line
2.26.2
Quoted 6 lines · Marc Zyngier
Now that the 32bit KVM/arm host is a distant memory, let's move the whole of the KVM/arm64 code into the arm64 tree.
As they said in the song: Welcome Home (Sanitarium).
Signed-off-by Marc Zyngier <[email protected]>
Acked-by Will Deacon <[email protected]>
Will