Re: [PATCH v5 4/5] KVM: selftests: Add test for PSCI SYSTEM_OFF2

On Thu, Sep 26, 2024 at 07:37:59PM +0100, David Woodhouse wrote:

+static void guest_test_system_off2(void) +{

• uint64_t ret;
• /* assert that SYSTEM_OFF2 is discoverable */
• GUEST_ASSERT(psci_features(PSCI_1_3_FN_SYSTEM_OFF2) &

•      BIT(PSCI_1_3_HIBERNATE_TYPE_OFF));
  

• GUEST_ASSERT(psci_features(PSCI_1_3_FN64_SYSTEM_OFF2) &

•      BIT(PSCI_1_3_HIBERNATE_TYPE_OFF));
  

Can you also assert that the guest gets INVALID_PARAMETERS if it sets arg1 or arg2 to a reserved value?

• ret = psci_system_off2(PSCI_1_3_HIBERNATE_TYPE_OFF);
• GUEST_SYNC(ret);

+}

+static void host_test_system_off2(void) +{

• struct kvm_vcpu *source, *target;
• uint64_t psci_version = 0;
• struct kvm_run *run;
• struct kvm_vm *vm;
• vm = setup_vm(guest_test_system_off2, &source, &target);
• vcpu_get_reg(target, KVM_REG_ARM_PSCI_VERSION, &psci_version);
• TEST_ASSERT(psci_version >= PSCI_VERSION(0, 2),

•     "Unexpected PSCI version %lu.%lu",
  

•     PSCI_VERSION_MAJOR(psci_version),
  

•     PSCI_VERSION_MINOR(psci_version));
  

• if (psci_version < PSCI_VERSION(1,3))

• goto skip;
  

I'm not following this. Is there a particular reason why we'd want to skip for v1.2 and fail the test for anything less than that?

Just do TEST_REQUIRE(psci_version >= PSCI_VERSION(1, 3)), it makes the requirements obvious in the case someone runs new selftests on an old kernel.