| Message ID | 20210909013818.1191270-18-rananta@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: selftests: Introduce arch_timer selftest | expand |
On Thu, Sep 09, 2021 at 01:38:17AM +0000, Raghavendra Rao Ananta wrote: > With the introduction of ARM64_SYS_KVM_REG, that takes the > system register encodings from sysreg.h directly, replace > all the users of ARM64_SYS_REG, relyiing on the encodings > created in processor.h, with ARM64_SYS_KVM_REG. > > Signed-off-by: Raghavendra Rao Ananta <rananta@google.com> > --- > .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- > .../selftests/kvm/aarch64/psci_cpu_on_test.c | 3 ++- > .../selftests/kvm/include/aarch64/processor.h | 10 ---------- > .../selftests/kvm/lib/aarch64/processor.c | 16 ++++++++-------- > 4 files changed, 11 insertions(+), 20 deletions(-) I would probably just squash this into the patch that introduces the ARM64_SYS_KVM_REG macro. -- Thanks, Oliver
On Thu, Sep 09, 2021 at 01:38:17AM +0000, Raghavendra Rao Ananta wrote: > With the introduction of ARM64_SYS_KVM_REG, that takes the > system register encodings from sysreg.h directly, replace > all the users of ARM64_SYS_REG, relyiing on the encodings > created in processor.h, with ARM64_SYS_KVM_REG. > > Signed-off-by: Raghavendra Rao Ananta <rananta@google.com> > --- > .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- > .../selftests/kvm/aarch64/psci_cpu_on_test.c | 3 ++- > .../selftests/kvm/include/aarch64/processor.h | 10 ---------- > .../selftests/kvm/lib/aarch64/processor.c | 16 ++++++++-------- > 4 files changed, 11 insertions(+), 20 deletions(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > index 11fd23e21cb4..b28b311f4dd7 100644 > --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > @@ -190,7 +190,7 @@ static int debug_version(struct kvm_vm *vm) > { > uint64_t id_aa64dfr0; > > - get_reg(vm, VCPU_ID, ARM64_SYS_REG(ID_AA64DFR0_EL1), &id_aa64dfr0); > + get_reg(vm, VCPU_ID, ARM64_SYS_KVM_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); > return id_aa64dfr0 & 0xf; > } > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > index 018c269990e1..4c8aa7b8a65d 100644 > --- a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > +++ b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > @@ -91,7 +91,8 @@ int main(void) > init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); > aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); > > - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > + get_reg(vm, VCPU_ID_TARGET, > + ARM64_SYS_KVM_REG(SYS_MPIDR_EL1), &target_mpidr); nit: I'd just leave this on one line. We don't mind long lines in this part of town. > vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > vcpu_run(vm, VCPU_ID_SOURCE); > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > index 150f63101f4c..ee81dd3db516 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > @@ -16,16 +16,6 @@ > #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ > KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) > > -#define CPACR_EL1 3, 0, 1, 0, 2 > -#define TCR_EL1 3, 0, 2, 0, 2 > -#define MAIR_EL1 3, 0, 10, 2, 0 > -#define MPIDR_EL1 3, 0, 0, 0, 5 > -#define TTBR0_EL1 3, 0, 2, 0, 0 > -#define SCTLR_EL1 3, 0, 1, 0, 0 > -#define VBAR_EL1 3, 0, 12, 0, 0 > - > -#define ID_AA64DFR0_EL1 3, 0, 0, 5, 0 > - > /* > * ARM64_SYS_KVM_REG(sys_reg_id): Helper macro to convert > * SYS_* register definitions in sysreg.h to use in KVM > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > index 9844b62227b1..d7b89aa092f5 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > @@ -240,10 +240,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 > * registers, which the variable argument list macros do. > */ > - set_reg(vm, vcpuid, ARM64_SYS_REG(CPACR_EL1), 3 << 20); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_CPACR_EL1), 3 << 20); > > - get_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), &sctlr_el1); > - get_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), &tcr_el1); > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), &sctlr_el1); > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), &tcr_el1); > > switch (vm->mode) { > case VM_MODE_P52V48_4K: > @@ -281,10 +281,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > tcr_el1 |= (1 << 8) | (1 << 10) | (3 << 12); > tcr_el1 |= (64 - vm->va_bits) /* T0SZ */; > > - set_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), sctlr_el1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), tcr_el1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(MAIR_EL1), DEFAULT_MAIR_EL1); > - set_reg(vm, vcpuid, ARM64_SYS_REG(TTBR0_EL1), vm->pgd); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), sctlr_el1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), tcr_el1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TTBR0_EL1), vm->pgd); > } > > void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) > @@ -370,7 +370,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) > { > extern char vectors; > > - set_reg(vm, vcpuid, ARM64_SYS_REG(VBAR_EL1), (uint64_t)&vectors); > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_VBAR_EL1), (uint64_t)&vectors); > } > > void route_exception(struct ex_regs *regs, int vector) > -- > 2.33.0.153.gba50c8fa24-goog > I also agree with Oliver that this patch may be squashed into the one that introduces ARM64_SYS_KVM_REG. Thanks, drew
On Thu, Sep 9, 2021 at 6:38 AM Andrew Jones <drjones@redhat.com> wrote: > > On Thu, Sep 09, 2021 at 01:38:17AM +0000, Raghavendra Rao Ananta wrote: > > With the introduction of ARM64_SYS_KVM_REG, that takes the > > system register encodings from sysreg.h directly, replace > > all the users of ARM64_SYS_REG, relyiing on the encodings > > created in processor.h, with ARM64_SYS_KVM_REG. > > > > Signed-off-by: Raghavendra Rao Ananta <rananta@google.com> > > --- > > .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- > > .../selftests/kvm/aarch64/psci_cpu_on_test.c | 3 ++- > > .../selftests/kvm/include/aarch64/processor.h | 10 ---------- > > .../selftests/kvm/lib/aarch64/processor.c | 16 ++++++++-------- > > 4 files changed, 11 insertions(+), 20 deletions(-) > > > > diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > > index 11fd23e21cb4..b28b311f4dd7 100644 > > --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > > +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c > > @@ -190,7 +190,7 @@ static int debug_version(struct kvm_vm *vm) > > { > > uint64_t id_aa64dfr0; > > > > - get_reg(vm, VCPU_ID, ARM64_SYS_REG(ID_AA64DFR0_EL1), &id_aa64dfr0); > > + get_reg(vm, VCPU_ID, ARM64_SYS_KVM_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); > > return id_aa64dfr0 & 0xf; > > } > > > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > > index 018c269990e1..4c8aa7b8a65d 100644 > > --- a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > > +++ b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c > > @@ -91,7 +91,8 @@ int main(void) > > init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); > > aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); > > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > > + get_reg(vm, VCPU_ID_TARGET, > > + ARM64_SYS_KVM_REG(SYS_MPIDR_EL1), &target_mpidr); > > nit: I'd just leave this on one line. We don't mind long lines in this > part of town. > Good to know. I'll pull it into one line. > > vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > > vcpu_run(vm, VCPU_ID_SOURCE); > > > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > > index 150f63101f4c..ee81dd3db516 100644 > > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > > @@ -16,16 +16,6 @@ > > #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ > > KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) > > > > -#define CPACR_EL1 3, 0, 1, 0, 2 > > -#define TCR_EL1 3, 0, 2, 0, 2 > > -#define MAIR_EL1 3, 0, 10, 2, 0 > > -#define MPIDR_EL1 3, 0, 0, 0, 5 > > -#define TTBR0_EL1 3, 0, 2, 0, 0 > > -#define SCTLR_EL1 3, 0, 1, 0, 0 > > -#define VBAR_EL1 3, 0, 12, 0, 0 > > - > > -#define ID_AA64DFR0_EL1 3, 0, 0, 5, 0 > > - > > /* > > * ARM64_SYS_KVM_REG(sys_reg_id): Helper macro to convert > > * SYS_* register definitions in sysreg.h to use in KVM > > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > > index 9844b62227b1..d7b89aa092f5 100644 > > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > > @@ -240,10 +240,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > > * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 > > * registers, which the variable argument list macros do. > > */ > > - set_reg(vm, vcpuid, ARM64_SYS_REG(CPACR_EL1), 3 << 20); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_CPACR_EL1), 3 << 20); > > > > - get_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), &sctlr_el1); > > - get_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), &tcr_el1); > > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), &sctlr_el1); > > + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), &tcr_el1); > > > > switch (vm->mode) { > > case VM_MODE_P52V48_4K: > > @@ -281,10 +281,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini > > tcr_el1 |= (1 << 8) | (1 << 10) | (3 << 12); > > tcr_el1 |= (64 - vm->va_bits) /* T0SZ */; > > > > - set_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), sctlr_el1); > > - set_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), tcr_el1); > > - set_reg(vm, vcpuid, ARM64_SYS_REG(MAIR_EL1), DEFAULT_MAIR_EL1); > > - set_reg(vm, vcpuid, ARM64_SYS_REG(TTBR0_EL1), vm->pgd); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), sctlr_el1); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), tcr_el1); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TTBR0_EL1), vm->pgd); > > } > > > > void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) > > @@ -370,7 +370,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) > > { > > extern char vectors; > > > > - set_reg(vm, vcpuid, ARM64_SYS_REG(VBAR_EL1), (uint64_t)&vectors); > > + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_VBAR_EL1), (uint64_t)&vectors); > > } > > > > void route_exception(struct ex_regs *regs, int vector) > > -- > > 2.33.0.153.gba50c8fa24-goog > > > > I also agree with Oliver that this patch may be squashed into the one that > introduces ARM64_SYS_KVM_REG. > Sure, will do. Regards, Raghavendra > Thanks, > drew >
diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c index 11fd23e21cb4..b28b311f4dd7 100644 --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c @@ -190,7 +190,7 @@ static int debug_version(struct kvm_vm *vm) { uint64_t id_aa64dfr0; - get_reg(vm, VCPU_ID, ARM64_SYS_REG(ID_AA64DFR0_EL1), &id_aa64dfr0); + get_reg(vm, VCPU_ID, ARM64_SYS_KVM_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); return id_aa64dfr0 & 0xf; } diff --git a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c index 018c269990e1..4c8aa7b8a65d 100644 --- a/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c +++ b/tools/testing/selftests/kvm/aarch64/psci_cpu_on_test.c @@ -91,7 +91,8 @@ int main(void) init.features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); + get_reg(vm, VCPU_ID_TARGET, + ARM64_SYS_KVM_REG(SYS_MPIDR_EL1), &target_mpidr); vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); vcpu_run(vm, VCPU_ID_SOURCE); diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h index 150f63101f4c..ee81dd3db516 100644 --- a/tools/testing/selftests/kvm/include/aarch64/processor.h +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h @@ -16,16 +16,6 @@ #define ARM64_CORE_REG(x) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ KVM_REG_ARM_CORE | KVM_REG_ARM_CORE_REG(x)) -#define CPACR_EL1 3, 0, 1, 0, 2 -#define TCR_EL1 3, 0, 2, 0, 2 -#define MAIR_EL1 3, 0, 10, 2, 0 -#define MPIDR_EL1 3, 0, 0, 0, 5 -#define TTBR0_EL1 3, 0, 2, 0, 0 -#define SCTLR_EL1 3, 0, 1, 0, 0 -#define VBAR_EL1 3, 0, 12, 0, 0 - -#define ID_AA64DFR0_EL1 3, 0, 0, 5, 0 - /* * ARM64_SYS_KVM_REG(sys_reg_id): Helper macro to convert * SYS_* register definitions in sysreg.h to use in KVM diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 9844b62227b1..d7b89aa092f5 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -240,10 +240,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini * Enable FP/ASIMD to avoid trapping when accessing Q0-Q15 * registers, which the variable argument list macros do. */ - set_reg(vm, vcpuid, ARM64_SYS_REG(CPACR_EL1), 3 << 20); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_CPACR_EL1), 3 << 20); - get_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), &sctlr_el1); - get_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), &tcr_el1); + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), &sctlr_el1); + get_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), &tcr_el1); switch (vm->mode) { case VM_MODE_P52V48_4K: @@ -281,10 +281,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini tcr_el1 |= (1 << 8) | (1 << 10) | (3 << 12); tcr_el1 |= (64 - vm->va_bits) /* T0SZ */; - set_reg(vm, vcpuid, ARM64_SYS_REG(SCTLR_EL1), sctlr_el1); - set_reg(vm, vcpuid, ARM64_SYS_REG(TCR_EL1), tcr_el1); - set_reg(vm, vcpuid, ARM64_SYS_REG(MAIR_EL1), DEFAULT_MAIR_EL1); - set_reg(vm, vcpuid, ARM64_SYS_REG(TTBR0_EL1), vm->pgd); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_SCTLR_EL1), sctlr_el1); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TCR_EL1), tcr_el1); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_TTBR0_EL1), vm->pgd); } void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) @@ -370,7 +370,7 @@ void vcpu_init_descriptor_tables(struct kvm_vm *vm, uint32_t vcpuid) { extern char vectors; - set_reg(vm, vcpuid, ARM64_SYS_REG(VBAR_EL1), (uint64_t)&vectors); + set_reg(vm, vcpuid, ARM64_SYS_KVM_REG(SYS_VBAR_EL1), (uint64_t)&vectors); } void route_exception(struct ex_regs *regs, int vector)
With the introduction of ARM64_SYS_KVM_REG, that takes the system register encodings from sysreg.h directly, replace all the users of ARM64_SYS_REG, relyiing on the encodings created in processor.h, with ARM64_SYS_KVM_REG. Signed-off-by: Raghavendra Rao Ananta <rananta@google.com> --- .../selftests/kvm/aarch64/debug-exceptions.c | 2 +- .../selftests/kvm/aarch64/psci_cpu_on_test.c | 3 ++- .../selftests/kvm/include/aarch64/processor.h | 10 ---------- .../selftests/kvm/lib/aarch64/processor.c | 16 ++++++++-------- 4 files changed, 11 insertions(+), 20 deletions(-)