* [PATCH V2 1/5] arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
@ 2021-08-12 5:09 ` Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 2/5] KVM: arm64: Use ARM64_MIN_PARANGE_BITS as the minimum supported IPA Anshuman Khandual
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Anshuman Khandual @ 2021-08-12 5:09 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Marc Zyngier, Catalin Marinas, Will Deacon,
kvmarm, linux-kernel
Currently there are macros only for 48 and 52 bits parange value extracted
from the ID_AA64MMFR0.PARANGE field. This change completes the enumeration
and updates the helper id_aa64mmfr0_parange_to_phys_shift(). While here it
also defines ARM64_MIN_PARANGE_BITS as the absolute minimum shift value PA
range which could be supported on a given platform.
Cc: Marc Zyngier <maz@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/include/asm/cpufeature.h | 14 +++++++-------
arch/arm64/include/asm/sysreg.h | 7 +++++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 9bb9d11750d7..8633bdb21f33 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -781,13 +781,13 @@ extern int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);
static inline u32 id_aa64mmfr0_parange_to_phys_shift(int parange)
{
switch (parange) {
- case 0: return 32;
- case 1: return 36;
- case 2: return 40;
- case 3: return 42;
- case 4: return 44;
- case 5: return 48;
- case 6: return 52;
+ case ID_AA64MMFR0_PARANGE_32: return 32;
+ case ID_AA64MMFR0_PARANGE_36: return 36;
+ case ID_AA64MMFR0_PARANGE_40: return 40;
+ case ID_AA64MMFR0_PARANGE_42: return 42;
+ case ID_AA64MMFR0_PARANGE_44: return 44;
+ case ID_AA64MMFR0_PARANGE_48: return 48;
+ case ID_AA64MMFR0_PARANGE_52: return 52;
/*
* A future PE could use a value unknown to the kernel.
* However, by the "D10.1.4 Principles of the ID scheme
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 7b9c3acba684..504e909129ea 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -853,9 +853,16 @@
#define ID_AA64MMFR0_TGRAN64_SUPPORTED 0x0
#define ID_AA64MMFR0_TGRAN16_NI 0x0
#define ID_AA64MMFR0_TGRAN16_SUPPORTED 0x1
+#define ID_AA64MMFR0_PARANGE_32 0x0
+#define ID_AA64MMFR0_PARANGE_36 0x1
+#define ID_AA64MMFR0_PARANGE_40 0x2
+#define ID_AA64MMFR0_PARANGE_42 0x3
+#define ID_AA64MMFR0_PARANGE_44 0x4
#define ID_AA64MMFR0_PARANGE_48 0x5
#define ID_AA64MMFR0_PARANGE_52 0x6
+#define ARM64_MIN_PARANGE_BITS 32
+
#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_DEFAULT 0x0
#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_NONE 0x1
#define ID_AA64MMFR0_TGRAN_2_SUPPORTED_MIN 0x2
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 2/5] KVM: arm64: Use ARM64_MIN_PARANGE_BITS as the minimum supported IPA
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 1/5] arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros Anshuman Khandual
@ 2021-08-12 5:09 ` Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 3/5] KVM: arm64: Drop init_common_resources() Anshuman Khandual
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Anshuman Khandual @ 2021-08-12 5:09 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Marc Zyngier, James Morse, Alexandru Elisei,
Suzuki K Poulose, Catalin Marinas, Will Deacon, kvmarm,
linux-kernel
Drop hard coded value for the minimum supported IPA range bits (i.e 32).
Instead use ARM64_MIN_PARANGE_BITS which improves the code readability.
Cc: Marc Zyngier <maz@kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/kvm/reset.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index cba7872d69a8..acf309698f33 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -369,7 +369,7 @@ int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
phys_shift = KVM_VM_TYPE_ARM_IPA_SIZE(type);
if (phys_shift) {
if (phys_shift > kvm_ipa_limit ||
- phys_shift < 32)
+ phys_shift < ARM64_MIN_PARANGE_BITS)
return -EINVAL;
} else {
phys_shift = KVM_PHYS_SHIFT;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 3/5] KVM: arm64: Drop init_common_resources()
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 1/5] arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 2/5] KVM: arm64: Use ARM64_MIN_PARANGE_BITS as the minimum supported IPA Anshuman Khandual
@ 2021-08-12 5:09 ` Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 4/5] KVM: arm64: Drop check_kvm_target_cpu() based percpu probe Anshuman Khandual
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Anshuman Khandual @ 2021-08-12 5:09 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Marc Zyngier, James Morse, Alexandru Elisei,
Suzuki K Poulose, Catalin Marinas, Will Deacon, kvmarm,
linux-kernel
Could do without this additional indirection via init_common_resources() by
just calling kvm_set_ipa_limit() directly instead.
Cc: Marc Zyngier <maz@kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/kvm/arm.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index e9a2b8f27792..19560e457c11 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1696,11 +1696,6 @@ static bool init_psci_relay(void)
return true;
}
-static int init_common_resources(void)
-{
- return kvm_set_ipa_limit();
-}
-
static int init_subsystems(void)
{
int err = 0;
@@ -2102,7 +2097,7 @@ int kvm_arch_init(void *opaque)
}
}
- err = init_common_resources();
+ err = kvm_set_ipa_limit();
if (err)
return err;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 4/5] KVM: arm64: Drop check_kvm_target_cpu() based percpu probe
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
` (2 preceding siblings ...)
2021-08-12 5:09 ` [PATCH V2 3/5] KVM: arm64: Drop init_common_resources() Anshuman Khandual
@ 2021-08-12 5:09 ` Anshuman Khandual
2021-08-12 5:09 ` [PATCH V2 5/5] KVM: arm64: Drop unused REQUIRES_VIRT Anshuman Khandual
2021-08-18 8:57 ` [PATCH V2 0/5] KVM: arm64: General cleanups Marc Zyngier
5 siblings, 0 replies; 7+ messages in thread
From: Anshuman Khandual @ 2021-08-12 5:09 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Marc Zyngier, James Morse, Alexandru Elisei,
Suzuki K Poulose, Catalin Marinas, Will Deacon, kvmarm,
linux-kernel
kvm_target_cpu() never returns a negative error code, so check_kvm_target()
would never have 'ret' filled with a negative error code. Hence the percpu
probe via check_kvm_target_cpu() does not make sense as its never going to
find an unsupported CPU, forcing kvm_arch_init() to exit early. Hence lets
just drop this percpu probe (and also check_kvm_target_cpu()) altogether.
While here, this also changes kvm_target_cpu() return type to a u32, making
it explicit that an error code will not be returned from this function.
Cc: Marc Zyngier <maz@kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/include/asm/kvm_host.h | 2 +-
arch/arm64/kvm/arm.c | 16 +---------------
arch/arm64/kvm/guest.c | 4 ++--
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 41911585ae0c..26bbd84a02de 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -66,7 +66,7 @@ DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use);
extern unsigned int kvm_sve_max_vl;
int kvm_arm_init_sve(void);
-int __attribute_const__ kvm_target_cpu(void);
+u32 __attribute_const__ kvm_target_cpu(void);
int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu);
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 19560e457c11..ee9b1166f330 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -1035,7 +1035,7 @@ static int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
const struct kvm_vcpu_init *init)
{
unsigned int i, ret;
- int phys_target = kvm_target_cpu();
+ u32 phys_target = kvm_target_cpu();
if (init->target != phys_target)
return -EINVAL;
@@ -2010,11 +2010,6 @@ static int finalize_hyp_mode(void)
return 0;
}
-static void check_kvm_target_cpu(void *ret)
-{
- *(int *)ret = kvm_target_cpu();
-}
-
struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
{
struct kvm_vcpu *vcpu;
@@ -2074,7 +2069,6 @@ void kvm_arch_irq_bypass_start(struct irq_bypass_consumer *cons)
int kvm_arch_init(void *opaque)
{
int err;
- int ret, cpu;
bool in_hyp_mode;
if (!is_hyp_mode_available()) {
@@ -2089,14 +2083,6 @@ int kvm_arch_init(void *opaque)
kvm_info("Guests without required CPU erratum workarounds can deadlock system!\n" \
"Only trusted guests should be used on this system.\n");
- for_each_online_cpu(cpu) {
- smp_call_function_single(cpu, check_kvm_target_cpu, &ret, 1);
- if (ret < 0) {
- kvm_err("Error, CPU %d not supported!\n", cpu);
- return -ENODEV;
- }
- }
-
err = kvm_set_ipa_limit();
if (err)
return err;
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 1dfb83578277..8ce850fa7b49 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -842,7 +842,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu,
return 0;
}
-int __attribute_const__ kvm_target_cpu(void)
+u32 __attribute_const__ kvm_target_cpu(void)
{
unsigned long implementor = read_cpuid_implementor();
unsigned long part_number = read_cpuid_part_number();
@@ -874,7 +874,7 @@ int __attribute_const__ kvm_target_cpu(void)
int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
{
- int target = kvm_target_cpu();
+ u32 target = kvm_target_cpu();
if (target < 0)
return -ENODEV;
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH V2 5/5] KVM: arm64: Drop unused REQUIRES_VIRT
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
` (3 preceding siblings ...)
2021-08-12 5:09 ` [PATCH V2 4/5] KVM: arm64: Drop check_kvm_target_cpu() based percpu probe Anshuman Khandual
@ 2021-08-12 5:09 ` Anshuman Khandual
2021-08-18 8:57 ` [PATCH V2 0/5] KVM: arm64: General cleanups Marc Zyngier
5 siblings, 0 replies; 7+ messages in thread
From: Anshuman Khandual @ 2021-08-12 5:09 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Anshuman Khandual, Marc Zyngier, James Morse, Alexandru Elisei,
Suzuki K Poulose, Catalin Marinas, Will Deacon, kvmarm,
linux-kernel
This seems like a residue from the past. REQUIRES_VIRT is no more available
. Hence it can just be dropped along with the related code section.
Cc: Marc Zyngier <maz@kernel.org>
Cc: James Morse <james.morse@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: kvmarm@lists.cs.columbia.edu
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
arch/arm64/kvm/arm.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index ee9b1166f330..d779a29c5607 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -42,10 +42,6 @@
#include <kvm/arm_pmu.h>
#include <kvm/arm_psci.h>
-#ifdef REQUIRES_VIRT
-__asm__(".arch_extension virt");
-#endif
-
static enum kvm_mode kvm_mode = KVM_MODE_DEFAULT;
DEFINE_STATIC_KEY_FALSE(kvm_protected_mode_initialized);
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH V2 0/5] KVM: arm64: General cleanups
2021-08-12 5:09 [PATCH V2 0/5] KVM: arm64: General cleanups Anshuman Khandual
` (4 preceding siblings ...)
2021-08-12 5:09 ` [PATCH V2 5/5] KVM: arm64: Drop unused REQUIRES_VIRT Anshuman Khandual
@ 2021-08-18 8:57 ` Marc Zyngier
5 siblings, 0 replies; 7+ messages in thread
From: Marc Zyngier @ 2021-08-18 8:57 UTC (permalink / raw)
To: linux-arm-kernel, Anshuman Khandual
Cc: Suzuki K Poulose, Catalin Marinas, kvmarm, linux-kernel,
James Morse, Alexandru Elisei, Will Deacon
On Thu, 12 Aug 2021 10:39:49 +0530, Anshuman Khandual wrote:
> This series contains mostly unrelated general cleanups. This series applies
> on v5.14-rc5 and has been boot tested with different page sized guests.
>
> Changes in V2:
>
> - Dropped the first patch regarding PAGE_[SHIFT|SIZE] per Marc
> - Added remaining ID_AA64MMFR0_PARANGE_ macros and ARM64_MIN_PARANGE_BITS per Marc
> - Dropped memory and cycle reference from commit message in [PATCH 3/5]
> - Changed return value as u32 in kvm_target_cpu() per Will
>
> [...]
Applied to next, thanks!
[1/5] arm64/mm: Add remaining ID_AA64MMFR0_PARANGE_ macros
commit: 504c6295b998effa682089747a96d7bb5933d4db
[2/5] KVM: arm64: Use ARM64_MIN_PARANGE_BITS as the minimum supported IPA
commit: 9788c14060f3c179c376b2a87af1a430d4d84973
[3/5] KVM: arm64: Drop init_common_resources()
commit: bf249d9e362f1011a839d57e771b4b1a7eed9656
[4/5] KVM: arm64: Drop check_kvm_target_cpu() based percpu probe
commit: 6b7982fefc1fdcaa31b712f5fbc2e993cc99ad23
[5/5] KVM: arm64: Drop unused REQUIRES_VIRT
commit: 9329752bc8659e3934e2b13434b2fddb0df0bb13
Cheers,
M.
--
Without deviation from the norm, progress is not possible.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 7+ messages in thread