From: Andrew Jones <drjones@redhat.com> To: Oliver Upton <oupton@google.com> Cc: kvmarm@lists.cs.columbia.edu, Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>, Alexandru Elisei <Alexandru.Elisei@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, Peter Shier <pshier@google.com>, Ricardo Koller <ricarkol@google.com>, Reiji Watanabe <reijiw@google.com>, Raghavendra Rao Anata <rananta@google.com>, kvm@vger.kernel.org Subject: Re: [PATCH v2 10/11] selftests: KVM: Refactor psci_test to make it amenable to new tests Date: Tue, 5 Oct 2021 21:05:35 +0200 [thread overview] Message-ID: <20211005190535.mxk6do6sbpf4j2c7@gator.home> (raw) In-Reply-To: <CAOQ_QsjQ28b8OXLR1o8QD=M8dsBKtPLyB-QRyd=D1UVMGy6o0w@mail.gmail.com> On Tue, Oct 05, 2021 at 07:54:01AM -0700, Oliver Upton wrote: > Hi Drew, > > On Tue, Oct 5, 2021 at 6:45 AM Andrew Jones <drjones@redhat.com> wrote: > > > > On Thu, Sep 23, 2021 at 07:16:09PM +0000, Oliver Upton wrote: > > > Split up the current test into several helpers that will be useful to > > > subsequent test cases added to the PSCI test suite. > > > > > > Signed-off-by: Oliver Upton <oupton@google.com> > > > --- > > > .../testing/selftests/kvm/aarch64/psci_test.c | 68 ++++++++++++------- > > > 1 file changed, 45 insertions(+), 23 deletions(-) > > > > > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c > > > index 8d043e12b137..90312be335da 100644 > > > --- a/tools/testing/selftests/kvm/aarch64/psci_test.c > > > +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c > > > @@ -45,7 +45,7 @@ static uint64_t psci_affinity_info(uint64_t target_affinity, > > > return res.a0; > > > } > > > > > > -static void guest_main(uint64_t target_cpu) > > > +static void guest_test_cpu_on(uint64_t target_cpu) > > > { > > > GUEST_ASSERT(!psci_cpu_on(target_cpu, CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID)); > > > uint64_t target_state; > > > @@ -69,12 +69,10 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) > > > vcpu_set_mp_state(vm, vcpuid, &mp_state); > > > } Context from last patch. > > > > > > -int main(void) > > > +static struct kvm_vm *setup_vm(void *guest_code) > > > { > > > - uint64_t target_mpidr, obs_pc, obs_x0; > > > struct kvm_vcpu_init init; > > > struct kvm_vm *vm; > > > - struct ucall uc; > > > > > > vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR); > > > kvm_vm_elf_load(vm, program_invocation_name); > > > @@ -83,31 +81,28 @@ int main(void) > > > vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init); > > > init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2); > > > > > > - aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_main); > > > - aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); > > > + aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_code); > > > + aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_code); Context from last patch. > > > > > > - /* > > > - * make sure the target is already off when executing the test. > > > - */ > > > - vcpu_power_off(vm, VCPU_ID_TARGET); > > > + return vm; > > > +} > > > > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > > > - vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > > > - vcpu_run(vm, VCPU_ID_SOURCE); > > > +static void enter_guest(struct kvm_vm *vm, uint32_t vcpuid) > > > +{ > > > + struct ucall uc; > > > > > > - switch (get_ucall(vm, VCPU_ID_SOURCE, &uc)) { > > > - case UCALL_DONE: > > > - break; > > > - case UCALL_ABORT: > > > + vcpu_run(vm, vcpuid); > > > + if (get_ucall(vm, vcpuid, &uc) == UCALL_ABORT) > > > TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0], __FILE__, > > > uc.args[1]); > > > - break; > > > - default: > > > - TEST_FAIL("Unhandled ucall: %lu", uc.cmd); > > > - } > > > +} > > > > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_CORE_REG(regs.pc), &obs_pc); > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_CORE_REG(regs.regs[0]), &obs_x0); > > > +static void assert_vcpu_reset(struct kvm_vm *vm, uint32_t vcpuid) > > > +{ > > > + uint64_t obs_pc, obs_x0; > > > + > > > + get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &obs_pc); > > > + get_reg(vm, vcpuid, ARM64_CORE_REG(regs.regs[0]), &obs_x0); > > > > > > TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, > > > "unexpected target cpu pc: %lx (expected: %lx)", > > > @@ -115,7 +110,34 @@ int main(void) > > > TEST_ASSERT(obs_x0 == CPU_ON_CONTEXT_ID, > > > "unexpected target context id: %lx (expected: %lx)", > > > obs_x0, CPU_ON_CONTEXT_ID); > > > +} > > > > > > +static void host_test_cpu_on(void) > > > +{ > > > + uint64_t target_mpidr; > > > + struct kvm_vm *vm; > > > + struct ucall uc; > > > + > > > + vm = setup_vm(guest_test_cpu_on); > > > + > > > + /* > > > + * make sure the target is already off when executing the test. > > > + */ > > > + vcpu_power_off(vm, VCPU_ID_TARGET); > > > + > > > + get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > > > + vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > > > + enter_guest(vm, VCPU_ID_SOURCE); > > > + > > > + if (get_ucall(vm, VCPU_ID_SOURCE, &uc) != UCALL_DONE) > > > + TEST_FAIL("Unhandled ucall: %lu", uc.cmd); > > > + > > > + assert_vcpu_reset(vm, VCPU_ID_TARGET); > > > kvm_vm_free(vm); > > > +} > > > + > > > +int main(void) > > > +{ > > > + host_test_cpu_on(); > > > return 0; > > > } > > > -- > > > 2.33.0.685.g46640cef36-goog > > > > > > > Hard to read diff, but I think the refactoring comes out right. > > Yeah, this one's nasty, sorry about that. Thanks for parsing it out, heh. > > > Please do this refactoring before adding the new test in the next revision, though. > > > > This is 10/11 in the series, and the test is 11/11. I'm not seeing any > context belonging to the last patch, but perhaps I'm missing something > obvious. It's not much, but nicer to have none. Thanks, drew > > > Reviewed-by: Andrew Jones <drjones@redhat.com> > > Thanks! > > -- > Best, > Oliver >
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com> To: Oliver Upton <oupton@google.com> Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>, Peter Shier <pshier@google.com>, kvmarm@lists.cs.columbia.edu Subject: Re: [PATCH v2 10/11] selftests: KVM: Refactor psci_test to make it amenable to new tests Date: Tue, 5 Oct 2021 21:05:35 +0200 [thread overview] Message-ID: <20211005190535.mxk6do6sbpf4j2c7@gator.home> (raw) In-Reply-To: <CAOQ_QsjQ28b8OXLR1o8QD=M8dsBKtPLyB-QRyd=D1UVMGy6o0w@mail.gmail.com> On Tue, Oct 05, 2021 at 07:54:01AM -0700, Oliver Upton wrote: > Hi Drew, > > On Tue, Oct 5, 2021 at 6:45 AM Andrew Jones <drjones@redhat.com> wrote: > > > > On Thu, Sep 23, 2021 at 07:16:09PM +0000, Oliver Upton wrote: > > > Split up the current test into several helpers that will be useful to > > > subsequent test cases added to the PSCI test suite. > > > > > > Signed-off-by: Oliver Upton <oupton@google.com> > > > --- > > > .../testing/selftests/kvm/aarch64/psci_test.c | 68 ++++++++++++------- > > > 1 file changed, 45 insertions(+), 23 deletions(-) > > > > > > diff --git a/tools/testing/selftests/kvm/aarch64/psci_test.c b/tools/testing/selftests/kvm/aarch64/psci_test.c > > > index 8d043e12b137..90312be335da 100644 > > > --- a/tools/testing/selftests/kvm/aarch64/psci_test.c > > > +++ b/tools/testing/selftests/kvm/aarch64/psci_test.c > > > @@ -45,7 +45,7 @@ static uint64_t psci_affinity_info(uint64_t target_affinity, > > > return res.a0; > > > } > > > > > > -static void guest_main(uint64_t target_cpu) > > > +static void guest_test_cpu_on(uint64_t target_cpu) > > > { > > > GUEST_ASSERT(!psci_cpu_on(target_cpu, CPU_ON_ENTRY_ADDR, CPU_ON_CONTEXT_ID)); > > > uint64_t target_state; > > > @@ -69,12 +69,10 @@ static void vcpu_power_off(struct kvm_vm *vm, uint32_t vcpuid) > > > vcpu_set_mp_state(vm, vcpuid, &mp_state); > > > } Context from last patch. > > > > > > -int main(void) > > > +static struct kvm_vm *setup_vm(void *guest_code) > > > { > > > - uint64_t target_mpidr, obs_pc, obs_x0; > > > struct kvm_vcpu_init init; > > > struct kvm_vm *vm; > > > - struct ucall uc; > > > > > > vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR); > > > kvm_vm_elf_load(vm, program_invocation_name); > > > @@ -83,31 +81,28 @@ int main(void) > > > vm_ioctl(vm, KVM_ARM_PREFERRED_TARGET, &init); > > > init.features[0] |= (1 << KVM_ARM_VCPU_PSCI_0_2); > > > > > > - aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_main); > > > - aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_main); > > > + aarch64_vcpu_add_default(vm, VCPU_ID_SOURCE, &init, guest_code); > > > + aarch64_vcpu_add_default(vm, VCPU_ID_TARGET, &init, guest_code); Context from last patch. > > > > > > - /* > > > - * make sure the target is already off when executing the test. > > > - */ > > > - vcpu_power_off(vm, VCPU_ID_TARGET); > > > + return vm; > > > +} > > > > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > > > - vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > > > - vcpu_run(vm, VCPU_ID_SOURCE); > > > +static void enter_guest(struct kvm_vm *vm, uint32_t vcpuid) > > > +{ > > > + struct ucall uc; > > > > > > - switch (get_ucall(vm, VCPU_ID_SOURCE, &uc)) { > > > - case UCALL_DONE: > > > - break; > > > - case UCALL_ABORT: > > > + vcpu_run(vm, vcpuid); > > > + if (get_ucall(vm, vcpuid, &uc) == UCALL_ABORT) > > > TEST_FAIL("%s at %s:%ld", (const char *)uc.args[0], __FILE__, > > > uc.args[1]); > > > - break; > > > - default: > > > - TEST_FAIL("Unhandled ucall: %lu", uc.cmd); > > > - } > > > +} > > > > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_CORE_REG(regs.pc), &obs_pc); > > > - get_reg(vm, VCPU_ID_TARGET, ARM64_CORE_REG(regs.regs[0]), &obs_x0); > > > +static void assert_vcpu_reset(struct kvm_vm *vm, uint32_t vcpuid) > > > +{ > > > + uint64_t obs_pc, obs_x0; > > > + > > > + get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &obs_pc); > > > + get_reg(vm, vcpuid, ARM64_CORE_REG(regs.regs[0]), &obs_x0); > > > > > > TEST_ASSERT(obs_pc == CPU_ON_ENTRY_ADDR, > > > "unexpected target cpu pc: %lx (expected: %lx)", > > > @@ -115,7 +110,34 @@ int main(void) > > > TEST_ASSERT(obs_x0 == CPU_ON_CONTEXT_ID, > > > "unexpected target context id: %lx (expected: %lx)", > > > obs_x0, CPU_ON_CONTEXT_ID); > > > +} > > > > > > +static void host_test_cpu_on(void) > > > +{ > > > + uint64_t target_mpidr; > > > + struct kvm_vm *vm; > > > + struct ucall uc; > > > + > > > + vm = setup_vm(guest_test_cpu_on); > > > + > > > + /* > > > + * make sure the target is already off when executing the test. > > > + */ > > > + vcpu_power_off(vm, VCPU_ID_TARGET); > > > + > > > + get_reg(vm, VCPU_ID_TARGET, ARM64_SYS_REG(MPIDR_EL1), &target_mpidr); > > > + vcpu_args_set(vm, VCPU_ID_SOURCE, 1, target_mpidr & MPIDR_HWID_BITMASK); > > > + enter_guest(vm, VCPU_ID_SOURCE); > > > + > > > + if (get_ucall(vm, VCPU_ID_SOURCE, &uc) != UCALL_DONE) > > > + TEST_FAIL("Unhandled ucall: %lu", uc.cmd); > > > + > > > + assert_vcpu_reset(vm, VCPU_ID_TARGET); > > > kvm_vm_free(vm); > > > +} > > > + > > > +int main(void) > > > +{ > > > + host_test_cpu_on(); > > > return 0; > > > } > > > -- > > > 2.33.0.685.g46640cef36-goog > > > > > > > Hard to read diff, but I think the refactoring comes out right. > > Yeah, this one's nasty, sorry about that. Thanks for parsing it out, heh. > > > Please do this refactoring before adding the new test in the next revision, though. > > > > This is 10/11 in the series, and the test is 11/11. I'm not seeing any > context belonging to the last patch, but perhaps I'm missing something > obvious. It's not much, but nicer to have none. Thanks, drew > > > Reviewed-by: Andrew Jones <drjones@redhat.com> > > Thanks! > > -- > Best, > Oliver > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2021-10-05 19:05 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-23 19:15 [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton 2021-09-23 19:15 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 01/11] KVM: arm64: Drop unused vcpu param to kvm_psci_valid_affinity() Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 3:50 ` Reiji Watanabe 2021-10-01 3:50 ` Reiji Watanabe 2021-10-05 13:22 ` Andrew Jones 2021-10-05 13:22 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 02/11] KVM: arm64: Clean up SMC64 PSCI filtering for AArch32 guests Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 3:56 ` Reiji Watanabe 2021-10-01 3:56 ` Reiji Watanabe 2021-10-05 13:23 ` Andrew Jones 2021-10-05 13:23 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 03/11] KVM: arm64: Encapsulate reset request logic in a helper function Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-01 6:04 ` Reiji Watanabe 2021-10-01 6:04 ` Reiji Watanabe 2021-10-01 16:10 ` Oliver Upton 2021-10-01 16:10 ` Oliver Upton 2021-10-05 13:33 ` Andrew Jones 2021-10-05 13:33 ` Andrew Jones 2021-10-05 15:05 ` Oliver Upton 2021-10-05 15:05 ` Oliver Upton 2021-10-05 19:01 ` Andrew Jones 2021-10-05 19:01 ` Andrew Jones 2021-10-13 4:48 ` Reiji Watanabe 2021-10-13 4:48 ` Reiji Watanabe 2021-10-05 13:35 ` Andrew Jones 2021-10-05 13:35 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 04/11] KVM: arm64: Rename the KVM_REQ_SLEEP handler Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:34 ` Andrew Jones 2021-10-05 13:34 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 05/11] KVM: arm64: Defer WFI emulation as a requested event Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-30 10:50 ` Marc Zyngier 2021-09-30 10:50 ` Marc Zyngier 2021-09-30 17:09 ` Sean Christopherson 2021-09-30 17:09 ` Sean Christopherson 2021-09-30 17:32 ` Oliver Upton 2021-09-30 17:32 ` Oliver Upton 2021-09-30 18:08 ` Sean Christopherson 2021-09-30 18:08 ` Sean Christopherson 2021-09-30 21:57 ` Oliver Upton 2021-09-30 21:57 ` Oliver Upton 2021-10-01 13:57 ` Marc Zyngier 2021-10-01 13:57 ` Marc Zyngier 2021-09-23 19:16 ` [PATCH v2 06/11] KVM: arm64: Add support for SYSTEM_SUSPEND PSCI call Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-30 12:29 ` Marc Zyngier 2021-09-30 12:29 ` Marc Zyngier 2021-09-30 17:19 ` Sean Christopherson 2021-09-30 17:19 ` Sean Christopherson 2021-09-30 17:35 ` Oliver Upton 2021-09-30 17:35 ` Oliver Upton 2021-09-30 17:40 ` Oliver Upton 2021-09-30 17:40 ` Oliver Upton 2021-10-01 14:02 ` Marc Zyngier 2021-10-01 14:02 ` Marc Zyngier 2021-10-05 16:02 ` Oliver Upton 2021-10-05 16:02 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 07/11] selftests: KVM: Rename psci_cpu_on_test to psci_test Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:36 ` Andrew Jones 2021-10-05 13:36 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 08/11] selftests: KVM: Create helper for making SMCCC calls Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:39 ` Andrew Jones 2021-10-05 13:39 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 09/11] selftests: KVM: Use KVM_SET_MP_STATE to power off vCPU in psci_test Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-09-23 19:16 ` [PATCH v2 10/11] selftests: KVM: Refactor psci_test to make it amenable to new tests Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:45 ` Andrew Jones 2021-10-05 13:45 ` Andrew Jones 2021-10-05 14:54 ` Oliver Upton 2021-10-05 14:54 ` Oliver Upton 2021-10-05 19:05 ` Andrew Jones [this message] 2021-10-05 19:05 ` Andrew Jones 2021-09-23 19:16 ` [PATCH v2 11/11] selftests: KVM: Test SYSTEM_SUSPEND PSCI call Oliver Upton 2021-09-23 19:16 ` Oliver Upton 2021-10-05 13:49 ` Andrew Jones 2021-10-05 13:49 ` Andrew Jones 2021-10-05 15:07 ` Oliver Upton 2021-10-05 15:07 ` Oliver Upton 2021-09-23 20:15 ` [PATCH v2 00/11] KVM: arm64: Implement PSCI SYSTEM_SUSPEND support Oliver Upton 2021-09-23 20:15 ` Oliver Upton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211005190535.mxk6do6sbpf4j2c7@gator.home \ --to=drjones@redhat.com \ --cc=Alexandru.Elisei@arm.com \ --cc=james.morse@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=maz@kernel.org \ --cc=oupton@google.com \ --cc=pshier@google.com \ --cc=rananta@google.com \ --cc=reijiw@google.com \ --cc=ricarkol@google.com \ --cc=suzuki.poulose@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.