[PATCH v4 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles

[PATCH v4 0/4] KVM: arm64: Tidy up arch Kconfig and Makefiles

[Fuad Tabba]

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.  This series is a refrensh on top of 5.7-rc1.
It depends on Marc's kvm-arm64/welcome-home branch [1] plus the fix
from Will [2].

Changes since V3 [3]:
  * Rebased on top of Will's fix [2].
  * Added S-o-B to patches written by others.

Cheers,
/fuad

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/welcome-home

[2]
https://lists.cs.columbia.edu/pipermail/kvmarm/2020-April/040336.html

[3]
https://lists.cs.columbia.edu/pipermail/kvmarm/2020-April/040288.html


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/cpu_errata.c  |  2 +-
 arch/arm64/kernel/smp.c         |  2 +-
 arch/arm64/kvm/Kconfig          | 22 ++++++++---------
 arch/arm64/kvm/Makefile         | 44 +++++++++++----------------------
 arch/arm64/kvm/hyp/Makefile     | 15 +++--------
 6 files changed, 32 insertions(+), 55 deletions(-)

-- 
2.26.1.301.g55bc3eb7cb9-goog

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

[PATCH v4 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST

[Fuad Tabba]

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>
Signed-off-by: Fuad Tabba <tabba@google.com>
---
 arch/arm64/kernel/asm-offsets.c |  2 +-
 arch/arm64/kernel/cpu_errata.c  |  2 +-
 arch/arm64/kernel/smp.c         |  2 +-
 arch/arm64/kvm/Kconfig          |  6 ----
 arch/arm64/kvm/Makefile         | 52 ++++++++++++++++-----------------
 arch/arm64/kvm/hyp/Makefile     | 22 +++++++-------
 6 files changed, 40 insertions(+), 46 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/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index df56d2295d16..a102321fc8a2 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -234,7 +234,7 @@ static int detect_harden_bp_fw(void)
 		smccc_end = NULL;
 		break;
 
-#if IS_ENABLED(CONFIG_KVM_ARM_HOST)
+#if IS_ENABLED(CONFIG_KVM)
 	case SMCCC_CONDUIT_SMC:
 		cb = call_smc_arch_workaround_1;
 		smccc_start = __smccc_workaround_1_smc;
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 7a3768538343..419696e615b3 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -7,33 +7,33 @@ ccflags-y += -I $(srctree)/$(src)
 
 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-$(CONFIG_KVM_ARM_HOST) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
-kvm-$(CONFIG_KVM_ARM_HOST) += arm.o mmu.o mmio.o
-kvm-$(CONFIG_KVM_ARM_HOST) += psci.o perf.o
-kvm-$(CONFIG_KVM_ARM_HOST) += hypercalls.o
-kvm-$(CONFIG_KVM_ARM_HOST) += pvtime.o
+kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
+kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
+kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
+kvm-$(CONFIG_KVM) += psci.o perf.o
+kvm-$(CONFIG_KVM) += hypercalls.o
+kvm-$(CONFIG_KVM) += 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) += aarch32.o
-kvm-$(CONFIG_KVM_ARM_HOST) += 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) += aarch32.o
+kvm-$(CONFIG_KVM) += arch_timer.o
 kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
 
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-init.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-irqfd.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v2.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v3.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-v4.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio-v2.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-mmio-v3.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-kvm-device.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-its.o
-kvm-$(CONFIG_KVM_ARM_HOST) += vgic/vgic-debug.o
+kvm-$(CONFIG_KVM) += vgic/vgic.o
+kvm-$(CONFIG_KVM) += vgic/vgic-init.o
+kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
+kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
+kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
+kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
+kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
+kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
+kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
+kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
+kvm-$(CONFIG_KVM) += vgic/vgic-its.o
+kvm-$(CONFIG_KVM) += vgic/vgic-debug.o
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index dc18274a6826..8229e47ba870 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -6,17 +6,17 @@
 ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \
 		$(DISABLE_STACKLEAK_PLUGIN)
 
-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
-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-v3-sr.o
+obj-$(CONFIG_KVM) += timer-sr.o
+obj-$(CONFIG_KVM) += aarch32.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.1.301.g55bc3eb7cb9-goog

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

[PATCH v4 2/4] KVM: arm64: Update help text

[Fuad Tabba]

From: Will Deacon <will@kernel.org>

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

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Fuad Tabba <tabba@google.com>
---
 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.1.301.g55bc3eb7cb9-goog

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

[PATCH v4 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry

[Fuad Tabba]

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>
Signed-off-by: Fuad Tabba <tabba@google.com>
---
 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.1.301.g55bc3eb7cb9-goog

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

[PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles

[Fuad Tabba]

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     | 40 ++++++++++++-------------------------
 arch/arm64/kvm/hyp/Makefile | 15 ++++----------
 2 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 419696e615b3..5354ca1b1bfb 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -10,30 +10,16 @@ KVM=../../../virt/kvm
 obj-$(CONFIG_KVM) += kvm.o
 obj-$(CONFIG_KVM) += hyp/
 
-kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
-kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
-kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
-kvm-$(CONFIG_KVM) += psci.o perf.o
-kvm-$(CONFIG_KVM) += hypercalls.o
-kvm-$(CONFIG_KVM) += pvtime.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) += aarch32.o
-kvm-$(CONFIG_KVM) += arch_timer.o
-kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
-
-kvm-$(CONFIG_KVM) += vgic/vgic.o
-kvm-$(CONFIG_KVM) += vgic/vgic-init.o
-kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
-kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
-kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
-kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
-kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
-kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
-kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
-kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
-kvm-$(CONFIG_KVM) += vgic/vgic-its.o
-kvm-$(CONFIG_KVM) += vgic/vgic-debug.o
+kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
+	 $(KVM)/vfio.o $(KVM)/irqchip.o \
+	 arm.o mmu.o mmio.o psci.o perf.o hypercalls.o 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 pmu-emul.o \
+	 aarch32.o arch_timer.o \
+	 vgic/vgic.o vgic/vgic-init.o \
+	 vgic/vgic-irqfd.o vgic/vgic-v2.o \
+	 vgic/vgic-v3.o vgic/vgic-v4.o \
+	 vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \
+	 vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \
+	 vgic/vgic-its.o vgic/vgic-debug.o
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index 8229e47ba870..529aecbd0231 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -6,17 +6,10 @@
 ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \
 		$(DISABLE_STACKLEAK_PLUGIN)
 
-obj-$(CONFIG_KVM) += vgic-v3-sr.o
-obj-$(CONFIG_KVM) += timer-sr.o
-obj-$(CONFIG_KVM) += aarch32.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
+obj-$(CONFIG_KVM) += hyp.o
+
+hyp-y := vgic-v3-sr.o timer-sr.o 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.1.301.g55bc3eb7cb9-goog

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

Re: [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles

[Will Deacon]

On Tue, Apr 21, 2020 at 02:17:34PM +0100, Fuad Tabba wrote:
> 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     | 40 ++++++++++++-------------------------
>  arch/arm64/kvm/hyp/Makefile | 15 ++++----------
>  2 files changed, 17 insertions(+), 38 deletions(-)

Seems like a sensible clean-up to me:

Acked-by: Will Deacon <will@kernel.org>

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

Re: [PATCH v4 2/4] KVM: arm64: Update help text

[Suzuki K Poulose]

On 04/21/2020 02:17 PM, Fuad Tabba wrote:
> From: Will Deacon <will@kernel.org>
> 
> arm64 KVM supports 16k pages since 02e0b7600f83
> ("arm64: kvm: Add support for 16K pages"), so update the Kconfig help
> text accordingly.
> 
> Signed-off-by: Will Deacon <will@kernel.org>
> Signed-off-by: Fuad Tabba <tabba@google.com>
> ---
>   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.

Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Re: [PATCH v4 1/4] KVM: arm64: Kill off CONFIG_KVM_ARM_HOST

[Suzuki K Poulose]

On 04/21/2020 02:17 PM, Fuad Tabba wrote:
> 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>
> Signed-off-by: Fuad Tabba <tabba@google.com>


Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Re: [PATCH v4 3/4] KVM: arm64: Change CONFIG_KVM to a menuconfig entry

[Suzuki K Poulose]

On 04/21/2020 02:17 PM, Fuad Tabba wrote:
> 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>
> Signed-off-by: Fuad Tabba <tabba@google.com>

Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Re: [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles

[Quentin Perret]

Hi Fuad,

On Tuesday 21 Apr 2020 at 14:17:34 (+0100), Fuad Tabba wrote:
> 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     | 40 ++++++++++++-------------------------
>  arch/arm64/kvm/hyp/Makefile | 15 ++++----------
>  2 files changed, 17 insertions(+), 38 deletions(-)
> 
> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
> index 419696e615b3..5354ca1b1bfb 100644
> --- a/arch/arm64/kvm/Makefile
> +++ b/arch/arm64/kvm/Makefile
> @@ -10,30 +10,16 @@ KVM=../../../virt/kvm
>  obj-$(CONFIG_KVM) += kvm.o
>  obj-$(CONFIG_KVM) += hyp/
>  
> -kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
> -kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
> -kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
> -kvm-$(CONFIG_KVM) += psci.o perf.o
> -kvm-$(CONFIG_KVM) += hypercalls.o
> -kvm-$(CONFIG_KVM) += pvtime.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) += aarch32.o
> -kvm-$(CONFIG_KVM) += arch_timer.o
> -kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
> -
> -kvm-$(CONFIG_KVM) += vgic/vgic.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-init.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-its.o
> -kvm-$(CONFIG_KVM) += vgic/vgic-debug.o
> +kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
> +	 $(KVM)/vfio.o $(KVM)/irqchip.o \
> +	 arm.o mmu.o mmio.o psci.o perf.o hypercalls.o 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 pmu-emul.o \

Should we keep pmu-emul.o conditional on CONFIG_KVM_ARM_PMU?

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

Re: [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles

[Marc Zyngier]

Hi all,

On 2020-05-04 14:26, Quentin Perret wrote:
> Hi Fuad,
> 
> On Tuesday 21 Apr 2020 at 14:17:34 (+0100), Fuad Tabba wrote:
>> 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     | 40 
>> ++++++++++++-------------------------
>>  arch/arm64/kvm/hyp/Makefile | 15 ++++----------
>>  2 files changed, 17 insertions(+), 38 deletions(-)
>> 
>> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
>> index 419696e615b3..5354ca1b1bfb 100644
>> --- a/arch/arm64/kvm/Makefile
>> +++ b/arch/arm64/kvm/Makefile
>> @@ -10,30 +10,16 @@ KVM=../../../virt/kvm
>>  obj-$(CONFIG_KVM) += kvm.o
>>  obj-$(CONFIG_KVM) += hyp/
>> 
>> -kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
>> -kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
>> -kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
>> -kvm-$(CONFIG_KVM) += psci.o perf.o
>> -kvm-$(CONFIG_KVM) += hypercalls.o
>> -kvm-$(CONFIG_KVM) += pvtime.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) += aarch32.o
>> -kvm-$(CONFIG_KVM) += arch_timer.o
>> -kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
>> -
>> -kvm-$(CONFIG_KVM) += vgic/vgic.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-init.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-its.o
>> -kvm-$(CONFIG_KVM) += vgic/vgic-debug.o
>> +kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
>> +	 $(KVM)/vfio.o $(KVM)/irqchip.o \
>> +	 arm.o mmu.o mmio.o psci.o perf.o hypercalls.o 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 pmu-emul.o \
> 
> Should we keep pmu-emul.o conditional on CONFIG_KVM_ARM_PMU?

Good point. KVM_ARM_PMU depends on HW_PERF_EVENTS, which depends
on ARM_PMU. Without the above condition being present, you can
try and build the kernel with the KVM PMU emulation, and not
the host CPU PMU. It stops building very quickly.

I guess we should clean this up now that 32 bit is gone. But
for the sake of this series, it would be better to keep the
dependency in place and sort out the PMU mess at a later stage.

Thanks,

        M.
-- 
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

Re: [PATCH v4 4/4] KVM: arm64: Clean up kvm makefiles

[Fuad Tabba]

Hi,


On Mon, May 4, 2020 at 4:27 PM Marc Zyngier <maz@kernel.org> wrote:
>
> Hi all,
>
> On 2020-05-04 14:26, Quentin Perret wrote:
> > Hi Fuad,
> >
> > On Tuesday 21 Apr 2020 at 14:17:34 (+0100), Fuad Tabba wrote:
> >> 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     | 40
> >> ++++++++++++-------------------------
> >>  arch/arm64/kvm/hyp/Makefile | 15 ++++----------
> >>  2 files changed, 17 insertions(+), 38 deletions(-)
> >>
> >> diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
> >> index 419696e615b3..5354ca1b1bfb 100644
> >> --- a/arch/arm64/kvm/Makefile
> >> +++ b/arch/arm64/kvm/Makefile
> >> @@ -10,30 +10,16 @@ KVM=../../../virt/kvm
> >>  obj-$(CONFIG_KVM) += kvm.o
> >>  obj-$(CONFIG_KVM) += hyp/
> >>
> >> -kvm-$(CONFIG_KVM) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o
> >> -kvm-$(CONFIG_KVM) += $(KVM)/eventfd.o $(KVM)/vfio.o $(KVM)/irqchip.o
> >> -kvm-$(CONFIG_KVM) += arm.o mmu.o mmio.o
> >> -kvm-$(CONFIG_KVM) += psci.o perf.o
> >> -kvm-$(CONFIG_KVM) += hypercalls.o
> >> -kvm-$(CONFIG_KVM) += pvtime.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) += aarch32.o
> >> -kvm-$(CONFIG_KVM) += arch_timer.o
> >> -kvm-$(CONFIG_KVM_ARM_PMU)  += pmu-emul.o
> >> -
> >> -kvm-$(CONFIG_KVM) += vgic/vgic.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-init.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-irqfd.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-v2.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-v3.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-v4.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v2.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-mmio-v3.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-kvm-device.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-its.o
> >> -kvm-$(CONFIG_KVM) += vgic/vgic-debug.o
> >> +kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
> >> +     $(KVM)/vfio.o $(KVM)/irqchip.o \
> >> +     arm.o mmu.o mmio.o psci.o perf.o hypercalls.o 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 pmu-emul.o \
> >
> > Should we keep pmu-emul.o conditional on CONFIG_KVM_ARM_PMU?
>
> Good point. KVM_ARM_PMU depends on HW_PERF_EVENTS, which depends
> on ARM_PMU. Without the above condition being present, you can
> try and build the kernel with the KVM PMU emulation, and not
> the host CPU PMU. It stops building very quickly.
>
> I guess we should clean this up now that 32 bit is gone. But
> for the sake of this series, it would be better to keep the
> dependency in place and sort out the PMU mess at a later stage.

Of course.  I will fix this and send out a new patch series.

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