@@ -29,7 +29,7 @@ struct kvm_fw_reg_info {
.max_feat_bit = bit_max, \
}
-static const struct kvm_fw_reg_info fw_reg_info[] = {
+static struct kvm_fw_reg_info fw_reg_info[] = {
FW_REG_INFO(KVM_REG_ARM_STD_BMAP, KVM_REG_ARM_STD_BMAP_BIT_MAX),
FW_REG_INFO(KVM_REG_ARM_STD_HYP_BMAP, KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX),
FW_REG_INFO(KVM_REG_ARM_VENDOR_HYP_BMAP, KVM_REG_ARM_VENDOR_HYP_BMAP_BIT_MAX),
@@ -294,19 +294,78 @@ static void test_fw_regs_after_vm_start(struct kvm_vm *vm)
}
}
-static struct kvm_vm *test_vm_create(void)
+static bool test_reg_is_bmap_fw_reg(uint64_t reg)
+{
+ if ((reg & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW &&
+ (reg & 0xffff) >= 0xff00) /* Bitmap firmware register space */
+ return true;
+
+ return false;
+}
+
+static void test_fw_regs_encode_vm_scope(void)
+{
+ int i;
+
+ /*
+ * Encode the scope as KVM_REG_ARM_SCOPE_VM for further use
+ * in KVM_SET_ONE_REG and KVM_GET_ONE_REG operations.
+ */
+ for (i = 0; i < ARRAY_SIZE(fw_reg_info); i++)
+ fw_reg_info[i].reg |= (KVM_REG_ARM_SCOPE_VM << KVM_REG_ARM_SCOPE_SHIFT);
+}
+
+static void test_validate_fw_regs(struct kvm_vm *vm, int scope)
+{
+ uint64_t i, reg;
+ int obtained_scope;
+ struct kvm_reg_list *reg_list;
+
+ reg_list = vcpu_get_reg_list(vm, 0);
+
+ for (i = 0; i < reg_list->n; i++) {
+ reg = reg_list->reg[i];
+ if (!test_reg_is_bmap_fw_reg(reg))
+ continue;
+
+ /*
+ * Depending on KVM_CAP_ARM_REG_SCOPE, currently all the firmware
+ * bitmap registers are either completely VM-scoped or vCPU scoped.
+ */
+ obtained_scope = (reg & KVM_REG_ARM_SCOPE_MASK) >> KVM_REG_ARM_SCOPE_SHIFT;
+ TEST_ASSERT(obtained_scope == scope,
+ "Incorrect scope detected for reg: %lx. Expected: %d; Obtained: %d\n",
+ reg, scope, obtained_scope);
+ }
+}
+
+static struct kvm_vm *test_vm_create(int scope)
{
struct kvm_vm *vm;
+ struct kvm_enable_cap reg_scope_cap = {
+ .cap = KVM_CAP_ARM_REG_SCOPE,
+ };
+
+ if (scope == KVM_REG_ARM_SCOPE_VM && !kvm_check_cap(KVM_CAP_ARM_REG_SCOPE)) {
+ print_skip("Capability KVM_CAP_ARM_REG_SCOPE unavailable\n");
+ return NULL;
+ }
vm = vm_create_default(0, 0, guest_code);
ucall_init(vm, NULL);
steal_time_init(vm);
+ if (scope == KVM_REG_ARM_SCOPE_VM) {
+ vm_enable_cap(vm, ®_scope_cap);
+ test_fw_regs_encode_vm_scope();
+ }
+
return vm;
}
-static struct kvm_vm *test_guest_stage(struct kvm_vm *vm)
+static struct kvm_vm *
+test_guest_stage(struct kvm_vm *vm, int scope)
{
struct kvm_vm *ret_vm = vm;
@@ -319,7 +378,7 @@ static struct kvm_vm *test_guest_stage(struct kvm_vm *vm)
case TEST_STAGE_HVC_IFACE_FEAT_DISABLED:
/* Start a new VM so that all the features are now enabled by default */
kvm_vm_free(vm);
- ret_vm = test_vm_create();
+ ret_vm = test_vm_create(scope);
break;
case TEST_STAGE_HVC_IFACE_FEAT_ENABLED:
case TEST_STAGE_HVC_IFACE_FALSE_INFO:
@@ -334,14 +393,20 @@ static struct kvm_vm *test_guest_stage(struct kvm_vm *vm)
return ret_vm;
}
-static void test_run(void)
+static void test_run(int scope)
{
struct kvm_vm *vm;
struct ucall uc;
bool guest_done = false;
- vm = test_vm_create();
+ vm = test_vm_create(scope);
+ if (!vm)
+ return;
+ stage = TEST_STAGE_REG_IFACE;
+ sync_global_to_guest(vm, stage);
+
+ test_validate_fw_regs(vm, scope);
test_fw_regs_before_vm_start(vm);
while (!guest_done) {
@@ -349,7 +414,7 @@ static void test_run(void)
switch (get_ucall(vm, 0, &uc)) {
case UCALL_SYNC:
- vm = test_guest_stage(vm);
+ vm = test_guest_stage(vm, scope);
break;
case UCALL_DONE:
guest_done = true;
@@ -371,6 +436,8 @@ int main(void)
{
setbuf(stdout, NULL);
- test_run();
+ test_run(KVM_REG_ARM_SCOPE_VCPU);
+ test_run(KVM_REG_ARM_SCOPE_VM);
+
return 0;
}
Upgrade the aarch64/hypercalls test to also consider the firmware register's scope information. Thus, run the test with the capability KVM_CAP_ARM_REG_SCOPE disabled and enabled. Signed-off-by: Raghavendra Rao Ananta <rananta@google.com> --- .../selftests/kvm/aarch64/hypercalls.c | 83 +++++++++++++++++-- 1 file changed, 75 insertions(+), 8 deletions(-)