All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles
@ 2020-04-17  8:55 Fuad Tabba
  2020-04-17  8:55 ` [PATCH 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST Fuad Tabba
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17  8:55 UTC (permalink / raw)
  To: catalin.marinas, maz, julien.thierry.kdev, suzuki.poulose, kvmarm; +Cc: will


Hi,

This small patch series tidies up the arm64 KVM build system by
rejigging config options, removing some redundant help text, and
consolidating some of the Makefile rules.

The changes are cosmetic, but it seemed worthwhile to send this out
for consideration.

Cheers,
/fuad

Fuad Tabba (1):
  KVM: arm64: Clean up kvm makefiles

Will Deacon (3):
  KVM: arm64: Kill off CONFIG_KVM_ARM_HOST
  KVM: arm64: Update help text
  KVM: arm64: Change CONFIG_KVM to a menuconfig entry

 arch/arm64/kernel/asm-offsets.c |  2 +-
 arch/arm64/kernel/smp.c         |  2 +-
 arch/arm64/kvm/Kconfig          | 22 ++++++++--------
 arch/arm64/kvm/Makefile         | 45 +++++++++++++--------------------
 arch/arm64/kvm/hyp/Makefile     | 16 ++++--------
 5 files changed, 35 insertions(+), 52 deletions(-)


base-commit: 8f3d9f354286745c751374f5f1fcafee6b3f3136
-- 
2.26.0.110.g2183baf09c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST
  2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
@ 2020-04-17  8:55 ` Fuad Tabba
  2020-04-17  8:55 ` [PATCH 2/4] KVM: arm64: Update help text Fuad Tabba
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17  8:55 UTC (permalink / raw)
  To: catalin.marinas, maz, julien.thierry.kdev, suzuki.poulose, kvmarm; +Cc: will

From: Will Deacon <will@kernel.org>

CONFIG_KVM_ARM_HOST is just a proxy for CONFIG_KVM, so remove it in favour
of the latter.

Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kernel/asm-offsets.c |  2 +-
 arch/arm64/kernel/smp.c         |  2 +-
 arch/arm64/kvm/Kconfig          |  6 ----
 arch/arm64/kvm/Makefile         | 52 ++++++++++++++++-----------------
 arch/arm64/kvm/hyp/Makefile     | 22 +++++++-------
 5 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index 9981a0a5a87f..a27e0cd731e9 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -96,7 +96,7 @@ int main(void)
   DEFINE(CPU_BOOT_PTRAUTH_KEY,	offsetof(struct secondary_data, ptrauth_key));
 #endif
   BLANK();
-#ifdef CONFIG_KVM_ARM_HOST
+#ifdef CONFIG_KVM
   DEFINE(VCPU_CONTEXT,		offsetof(struct kvm_vcpu, arch.ctxt));
   DEFINE(VCPU_FAULT_DISR,	offsetof(struct kvm_vcpu, arch.fault.disr_el1));
   DEFINE(VCPU_WORKAROUND_FLAGS,	offsetof(struct kvm_vcpu, arch.workaround_flags));
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 061f60fe452f..0a3045d9f33f 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -430,7 +430,7 @@ static void __init hyp_mode_check(void)
 			   "CPU: CPUs started in inconsistent modes");
 	else
 		pr_info("CPU: All CPU(s) started at EL1\n");
-	if (IS_ENABLED(CONFIG_KVM_ARM_HOST))
+	if (IS_ENABLED(CONFIG_KVM))
 		kvm_compute_layout();
 }
 
diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 449386d76441..ce724e526689 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -28,7 +28,6 @@ config KVM
 	select HAVE_KVM_CPU_RELAX_INTERCEPT
 	select HAVE_KVM_ARCH_TLB_FLUSH_ALL
 	select KVM_MMIO
-	select KVM_ARM_HOST
 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 	select SRCU
 	select KVM_VFIO
@@ -50,11 +49,6 @@ config KVM
 
 	  If unsure, say N.
 
-config KVM_ARM_HOST
-	bool
-	---help---
-	  Provides host support for ARM processors.
-
 config KVM_ARM_PMU
 	bool
 	---help---
diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 5ffbdc39e780..2d968e9ac792 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -7,33 +7,33 @@ ccflags-y += -I $(srctree)/$(src) -I $(srctree)/virt/kvm/arm/vgic
 
 KVM=../../../virt/kvm
 
-obj-$(CONFIG_KVM_ARM_HOST) += kvm.o
-obj-$(CONFIG_KVM_ARM_HOST) += hyp/
+obj-$(CONFIG_KVM) += kvm.o
+obj-$(CONFIG_KVM) += hyp/
 
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hypercalls.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/pvtime.o
+kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/hypercalls.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/pvtime.o
 
-kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o
-kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
-kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic-sys-reg-v3.o fpsimd.o pmu.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/aarch32.o
+kvm-$(CONFIG_KVM) += inject_fault.o regmap.o va_layout.o
+kvm-$(CONFIG_KVM) += hyp.o hyp-init.o handle_exit.o
+kvm-$(CONFIG_KVM) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o
+kvm-$(CONFIG_KVM) += vgic-sys-reg-v3.o fpsimd.o pmu.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/aarch32.o
 
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-irqfd.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v2.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v3.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v4.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-kvm-device.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-its.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-debug.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/irqchip.o
-kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-init.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-irqfd.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v2.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v3.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v4.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v2.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v3.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-kvm-device.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-its.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-debug.o
+kvm-$(CONFIG_KVM) += $(KVM)/irqchip.o
+kvm-$(CONFIG_KVM) += $(KVM)/arm/arch_timer.o
 kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index ea710f674cb6..ad4c173ed036 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -8,18 +8,18 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \
 
 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) += $(KVM)/arm/hyp/vgic-v3-sr.o
+obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/timer-sr.o
+obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/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
-obj-$(CONFIG_KVM_ARM_HOST) += entry.o
-obj-$(CONFIG_KVM_ARM_HOST) += switch.o
-obj-$(CONFIG_KVM_ARM_HOST) += fpsimd.o
-obj-$(CONFIG_KVM_ARM_HOST) += tlb.o
-obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
+obj-$(CONFIG_KVM) += vgic-v2-cpuif-proxy.o
+obj-$(CONFIG_KVM) += sysreg-sr.o
+obj-$(CONFIG_KVM) += debug-sr.o
+obj-$(CONFIG_KVM) += entry.o
+obj-$(CONFIG_KVM) += switch.o
+obj-$(CONFIG_KVM) += fpsimd.o
+obj-$(CONFIG_KVM) += tlb.o
+obj-$(CONFIG_KVM) += hyp-entry.o
 
 # KVM code is run at a different exception code with a different map, so
 # compiler instrumentation that inserts callbacks or checks into the code may
-- 
2.26.0.110.g2183baf09c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/4] KVM: arm64: Update help text
  2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
  2020-04-17  8:55 ` [PATCH 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST Fuad Tabba
@ 2020-04-17  8:55 ` Fuad Tabba
  2020-04-17  8:55 ` [PATCH 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry Fuad Tabba
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17  8:55 UTC (permalink / raw)
  To: catalin.marinas, maz, julien.thierry.kdev, suzuki.poulose, kvmarm; +Cc: will

From: Will Deacon <will@kernel.org>

arm64 KVM supports 16k pages since commit 02e0b7600f83
("arm64: kvm: Add support for 16K pages"), so update the Kconfig help
text accordingly.

Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kvm/Kconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index ce724e526689..d2cf4f099454 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -44,8 +44,6 @@ config KVM
 	select TASK_DELAY_ACCT
 	---help---
 	  Support hosting virtualized guest machines.
-	  We don't support KVM with 16K page tables yet, due to the multiple
-	  levels of fake page tables.
 
 	  If unsure, say N.
 
-- 
2.26.0.110.g2183baf09c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry
  2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
  2020-04-17  8:55 ` [PATCH 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST Fuad Tabba
  2020-04-17  8:55 ` [PATCH 2/4] KVM: arm64: Update help text Fuad Tabba
@ 2020-04-17  8:55 ` Fuad Tabba
  2020-04-17  8:55 ` [PATCH 4/4] KVM: arm64: Clean up kvm makefiles Fuad Tabba
  2020-04-17  9:29 ` [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Marc Zyngier
  4 siblings, 0 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17  8:55 UTC (permalink / raw)
  To: catalin.marinas, maz, julien.thierry.kdev, suzuki.poulose, kvmarm; +Cc: will

From: Will Deacon <will@kernel.org>

Changing CONFIG_KVM to be a 'menuconfig' entry in Kconfig mean that we
can straightforwardly enumerate optional features, such as the virtual
PMU device as dependent options.

Signed-off-by: Will Deacon <will@kernel.org>
---
 arch/arm64/kvm/Kconfig | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index d2cf4f099454..f1c1f981482c 100644
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -3,7 +3,6 @@
 # KVM configuration
 #
 
-source "virt/kvm/Kconfig"
 source "virt/lib/Kconfig"
 
 menuconfig VIRTUALIZATION
@@ -18,7 +17,7 @@ menuconfig VIRTUALIZATION
 
 if VIRTUALIZATION
 
-config KVM
+menuconfig KVM
 	bool "Kernel-based Virtual Machine (KVM) support"
 	depends on OF
 	# for TASKSTATS/TASK_DELAY_ACCT:
@@ -33,7 +32,6 @@ config KVM
 	select KVM_VFIO
 	select HAVE_KVM_EVENTFD
 	select HAVE_KVM_IRQFD
-	select KVM_ARM_PMU if HW_PERF_EVENTS
 	select HAVE_KVM_MSI
 	select HAVE_KVM_IRQCHIP
 	select HAVE_KVM_IRQ_ROUTING
@@ -47,13 +45,21 @@ config KVM
 
 	  If unsure, say N.
 
+if KVM
+
+source "virt/kvm/Kconfig"
+
 config KVM_ARM_PMU
-	bool
+	bool "Virtual Performance Monitoring Unit (PMU) support"
+	depends on HW_PERF_EVENTS
+	default y
 	---help---
 	  Adds support for a virtual Performance Monitoring Unit (PMU) in
 	  virtual machines.
 
 config KVM_INDIRECT_VECTORS
-       def_bool KVM && (HARDEN_BRANCH_PREDICTOR || HARDEN_EL2_VECTORS)
+	def_bool HARDEN_BRANCH_PREDICTOR || HARDEN_EL2_VECTORS
+
+endif # KVM
 
 endif # VIRTUALIZATION
-- 
2.26.0.110.g2183baf09c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 4/4] KVM: arm64: Clean up kvm makefiles
  2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
                   ` (2 preceding siblings ...)
  2020-04-17  8:55 ` [PATCH 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry Fuad Tabba
@ 2020-04-17  8:55 ` Fuad Tabba
  2020-04-17  9:29 ` [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Marc Zyngier
  4 siblings, 0 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17  8:55 UTC (permalink / raw)
  To: catalin.marinas, maz, julien.thierry.kdev, suzuki.poulose, kvmarm; +Cc: will

Consolidate references to the CONFIG_KVM configuration item to encompass
entire folders rather than per line.

Signed-off-by: Fuad Tabba <tabba@google.com>
---
 arch/arm64/kvm/Makefile     | 41 +++++++++++++++----------------------
 arch/arm64/kvm/hyp/Makefile | 16 +++++----------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 2d968e9ac792..a5eab7fe11a8 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -10,30 +10,21 @@ KVM=../../../virt/kvm
 obj-$(CONFIG_KVM) += kvm.o
 obj-$(CONFIG_KVM) += hyp/
 
-kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/hypercalls.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/pvtime.o
+kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
+	 $(KVM)/vfio.o \
+	 $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o $(KVM)/arm/psci.o \
+	 $(KVM)/arm/perf.o $(KVM)/arm/hypercalls.o $(KVM)/arm/pvtime.o \
+	 inject_fault.o regmap.o va_layout.o hyp.o hyp-init.o handle_exit.o \
+	 guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o \
+	 vgic-sys-reg-v3.o fpsimd.o pmu.o \
+	 $(KVM)/arm/aarch32.o \
+	 $(KVM)/arm/vgic/vgic.o $(KVM)/arm/vgic/vgic-init.o \
+	 $(KVM)/arm/vgic/vgic-irqfd.o $(KVM)/arm/vgic/vgic-v2.o \
+	 $(KVM)/arm/vgic/vgic-v3.o $(KVM)/arm/vgic/vgic-v4.o \
+	 $(KVM)/arm/vgic/vgic-mmio.o $(KVM)/arm/vgic/vgic-mmio-v2.o \
+	 $(KVM)/arm/vgic/vgic-mmio-v3.o $(KVM)/arm/vgic/vgic-kvm-device.o \
+	 $(KVM)/arm/vgic/vgic-its.o $(KVM)/arm/vgic/vgic-debug.o \
+	 $(KVM)/irqchip.o \
+	 $(KVM)/arm/arch_timer.o
 
-kvm-$(CONFIG_KVM) += inject_fault.o regmap.o va_layout.o
-kvm-$(CONFIG_KVM) += hyp.o hyp-init.o handle_exit.o
-kvm-$(CONFIG_KVM) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o
-kvm-$(CONFIG_KVM) += vgic-sys-reg-v3.o fpsimd.o pmu.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/aarch32.o
-
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-init.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-irqfd.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v2.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v3.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-v4.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v2.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-mmio-v3.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-kvm-device.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-its.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/vgic/vgic-debug.o
-kvm-$(CONFIG_KVM) += $(KVM)/irqchip.o
-kvm-$(CONFIG_KVM) += $(KVM)/arm/arch_timer.o
 kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index ad4c173ed036..9358fbd123c0 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -8,18 +8,12 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \
 
 KVM=../../../../virt/kvm
 
-obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/vgic-v3-sr.o
-obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/timer-sr.o
-obj-$(CONFIG_KVM) += $(KVM)/arm/hyp/aarch32.o
+obj-$(CONFIG_KVM) += hyp.o
 
-obj-$(CONFIG_KVM) += vgic-v2-cpuif-proxy.o
-obj-$(CONFIG_KVM) += sysreg-sr.o
-obj-$(CONFIG_KVM) += debug-sr.o
-obj-$(CONFIG_KVM) += entry.o
-obj-$(CONFIG_KVM) += switch.o
-obj-$(CONFIG_KVM) += fpsimd.o
-obj-$(CONFIG_KVM) += tlb.o
-obj-$(CONFIG_KVM) += hyp-entry.o
+hyp-y := $(KVM)/arm/hyp/vgic-v3-sr.o $(KVM)/arm/hyp/timer-sr.o \
+	 $(KVM)/arm/hyp/aarch32.o \
+	 vgic-v2-cpuif-proxy.o sysreg-sr.o debug-sr.o entry.o switch.o \
+	 fpsimd.o tlb.o hyp-entry.o
 
 # KVM code is run at a different exception code with a different map, so
 # compiler instrumentation that inserts callbacks or checks into the code may
-- 
2.26.0.110.g2183baf09c-goog

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles
  2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
                   ` (3 preceding siblings ...)
  2020-04-17  8:55 ` [PATCH 4/4] KVM: arm64: Clean up kvm makefiles Fuad Tabba
@ 2020-04-17  9:29 ` Marc Zyngier
  2020-04-17 13:54   ` Fuad Tabba
  4 siblings, 1 reply; 7+ messages in thread
From: Marc Zyngier @ 2020-04-17  9:29 UTC (permalink / raw)
  To: Fuad Tabba; +Cc: catalin.marinas, will, kvmarm

Hi Fuad,

Thanks for this.

On 2020-04-17 09:55, Fuad Tabba wrote:
> Hi,
> 
> This small patch series tidies up the arm64 KVM build system by
> rejigging config options, removing some redundant help text, and
> consolidating some of the Makefile rules.
> 
> The changes are cosmetic, but it seemed worthwhile to send this out
> for consideration.

Happy to take these patches for 5.8. Could you please rebase them on top
of [1], which moves all of the (now arm64-specific) code where it 
belongs?

Cheers,

         M.

[1] 
https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/welcome-home
-- 
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles
  2020-04-17  9:29 ` [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Marc Zyngier
@ 2020-04-17 13:54   ` Fuad Tabba
  0 siblings, 0 replies; 7+ messages in thread
From: Fuad Tabba @ 2020-04-17 13:54 UTC (permalink / raw)
  To: Marc Zyngier; +Cc: catalin.marinas, will, kvmarm


[-- Attachment #1.1: Type: text/plain, Size: 854 bytes --]

Thanks for the review Marc.  I'll post v2 shortly.

Cheers,
/fuad

On Fri, Apr 17, 2020 at 10:29 AM Marc Zyngier <maz@kernel.org> wrote:

> Hi Fuad,
>
> Thanks for this.
>
> On 2020-04-17 09:55, Fuad Tabba wrote:
> > Hi,
> >
> > This small patch series tidies up the arm64 KVM build system by
> > rejigging config options, removing some redundant help text, and
> > consolidating some of the Makefile rules.
> >
> > The changes are cosmetic, but it seemed worthwhile to send this out
> > for consideration.
>
> Happy to take these patches for 5.8. Could you please rebase them on top
> of [1], which moves all of the (now arm64-specific) code where it
> belongs?
>
> Cheers,
>
>          M.
>
> [1]
>
> https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/welcome-home
> --
> Jazz is not dead. It just smells funny...
>

[-- Attachment #1.2: Type: text/html, Size: 1428 bytes --]

[-- Attachment #2: Type: text/plain, Size: 151 bytes --]

_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-04-17 13:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-17  8:55 [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Fuad Tabba
2020-04-17  8:55 ` [PATCH 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST Fuad Tabba
2020-04-17  8:55 ` [PATCH 2/4] KVM: arm64: Update help text Fuad Tabba
2020-04-17  8:55 ` [PATCH 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry Fuad Tabba
2020-04-17  8:55 ` [PATCH 4/4] KVM: arm64: Clean up kvm makefiles Fuad Tabba
2020-04-17  9:29 ` [PATCH 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles Marc Zyngier
2020-04-17 13:54   ` Fuad Tabba

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.