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

[PATCH v2 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 set is rebased on top of [1], which moves
the (now arm64-specific) code.

Cheers,
/fuad

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

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         | 44 +++++++++++----------------------
 arch/arm64/kvm/hyp/Makefile     | 15 +++--------
 5 files changed, 31 insertions(+), 54 deletions(-)


base-commit: c9346fa274ada428631ded07eaba696cdf99ce4e
-- 
2.26.1.301.g55bc3eb7cb9-goog

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

[PATCH v2 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>
---
 arch/arm64/kernel/asm-offsets.c |  2 +-
 arch/arm64/kernel/smp.c         |  2 +-
 arch/arm64/kvm/Kconfig          |  6 ----
 arch/arm64/kvm/Makefile         | 54 ++++++++++++++++-----------------
 arch/arm64/kvm/hyp/Makefile     | 22 +++++++-------
 5 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/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..a5334b91729a 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_ARM_PMU)  += pmu-emul.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)  += 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

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

[Mark Rutland]

Hi Fuad,

On Fri, Apr 17, 2020 at 02:57:58PM +0100, 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>

As a general thing, when sending patches written by others, you must
append your own S-o-B to the chain. Please see:

https://www.kernel.org/doc/html/v4.17/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin

That pplies to patches 1-3 in this series.

Thanks,
Mark.

> ---
>  arch/arm64/kernel/asm-offsets.c |  2 +-
>  arch/arm64/kernel/smp.c         |  2 +-
>  arch/arm64/kvm/Kconfig          |  6 ----
>  arch/arm64/kvm/Makefile         | 54 ++++++++++++++++-----------------
>  arch/arm64/kvm/hyp/Makefile     | 22 +++++++-------
>  5 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/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..a5334b91729a 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_ARM_PMU)  += pmu-emul.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)  += 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
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

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

[Fuad Tabba]

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

Thanks Mark.  I'll will fix this and send out a v3.

Cheers,
/fuad

On Fri, Apr 17, 2020 at 3:03 PM Mark Rutland <mark.rutland@arm.com> wrote:

> Hi Fuad,
>
> On Fri, Apr 17, 2020 at 02:57:58PM +0100, 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>
>
> As a general thing, when sending patches written by others, you must
> append your own S-o-B to the chain. Please see:
>
>
> https://www.kernel.org/doc/html/v4.17/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin
>
> That pplies to patches 1-3 in this series.
>
> Thanks,
> Mark.
>
> > ---
> >  arch/arm64/kernel/asm-offsets.c |  2 +-
> >  arch/arm64/kernel/smp.c         |  2 +-
> >  arch/arm64/kvm/Kconfig          |  6 ----
> >  arch/arm64/kvm/Makefile         | 54 ++++++++++++++++-----------------
> >  arch/arm64/kvm/hyp/Makefile     | 22 +++++++-------
> >  5 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/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..a5334b91729a 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_ARM_PMU)  += pmu-emul.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)  += 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
>

[-- Attachment #1.2: Type: text/html, Size: 9700 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

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

[Marc Zyngier]

On Fri, 17 Apr 2020 15:05:32 +0100
Fuad Tabba <tabba@google.com> wrote:

Hi Fuad,

> Thanks Mark.  I'll will fix this and send out a v3.

Whilst we're on the process chapter:

- Please don't use HTML email (I'm sure gmail has a "plain text only"
  option)
- Avoid top-posting, and instead place your reply after the part you
  are replying to
- Please take your time between versions of the same series. You have
  just sent 3 versions in about 5 hours... ;-)

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

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

[Fuad Tabba]

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.1.301.g55bc3eb7cb9-goog

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

[PATCH v2 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>
---
 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 v2 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 a5334b91729a..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)  += 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