When using the flags in KVM_X86_SET_MSR_FILTER and
KVM_CAP_X86_USER_SPACE_MSR it is expected that an attempt to write to
any of the unused bits will fail. Add testing to walk over every bit
in each of the flag fields in MSR filtering / exiting to verify that
happens.
Signed-off-by: Aaron Lewis <aaronlewis@xxxxxxxxxx>
---
.../kvm/x86_64/userspace_msr_exit_test.c | 95 +++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
index f84dc37426f5..3b4ad16cc982 100644
--- a/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
+++ b/tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c
@@ -734,6 +734,99 @@ static void test_msr_permission_bitmap(void)
kvm_vm_free(vm);
}
+static void test_results(int rc, const char *scmd, bool expected_success)
+{
+ int expected_rc;
+
+ expected_rc = expected_success ? 0 : -1;
+ TEST_ASSERT(rc == expected_rc,
+ "Unexpected result from '%s', rc: %d, expected rc: %d.",
+ scmd, rc, expected_rc);
+ TEST_ASSERT(!rc || (rc == -1 && errno == EINVAL),
+ "Failures are expected to have rc == -1 && errno == EINVAL(%d),\n"
+ " got rc: %d, errno: %d",
+ EINVAL, rc, errno);
+}
+
+#define test_ioctl(vm, cmd, arg, expected_success) \
+({ \
+ int rc = __vm_ioctl(vm, cmd, arg); \
+ \
+ test_results(rc, #cmd, expected_success); \
+})
+#define FLAG (1ul << i)
+
+static void run_user_space_msr_flag_test(struct kvm_vm *vm)
+{
+ struct kvm_enable_cap cap = { .cap = KVM_CAP_X86_USER_SPACE_MSR };
+ int nflags = sizeof(cap.args[0]) * BITS_PER_BYTE;
+ int rc;
+ int i;
+
+ rc = kvm_check_cap(KVM_CAP_X86_USER_SPACE_MSR);
+ TEST_ASSERT(rc, "KVM_CAP_X86_USER_SPACE_MSR is available");
+
+ for (i = 0; i < nflags; i++) {
+ cap.args[0] = FLAG;
+ test_ioctl(vm, KVM_ENABLE_CAP, &cap,
+ FLAG & KVM_MSR_EXIT_REASON_VALID_MASK);
+ }
+}
+
+static void run_msr_filter_flag_test(struct kvm_vm *vm)
+{
+ u64 deny_bits = 0;
+ struct kvm_msr_filter filter = {
+ .flags = KVM_MSR_FILTER_DEFAULT_ALLOW,
+ .ranges = {
+ {
+ .flags = KVM_MSR_FILTER_READ,
+ .nmsrs = 1,
+ .base = 0,
+ .bitmap = (uint8_t *)&deny_bits,
+ },
+ },
+ };
+ int nflags;
+ int rc;
+ int i;
+
+ rc = kvm_check_cap(KVM_CAP_X86_MSR_FILTER);
+ TEST_ASSERT(rc, "KVM_CAP_X86_MSR_FILTER is available");
+
+ nflags = sizeof(filter.flags) * BITS_PER_BYTE;
+ for (i = 0; i < nflags; i++) {
+ filter.flags = FLAG;
+ test_ioctl(vm, KVM_X86_SET_MSR_FILTER, &filter,
+ FLAG & KVM_MSR_FILTER_VALID_MASK);
+ }
+
+ filter.flags = KVM_MSR_FILTER_DEFAULT_ALLOW;
+ nflags = sizeof(filter.ranges[0].flags) * BITS_PER_BYTE;
+ for (i = 0; i < nflags; i++) {
+ filter.ranges[0].flags = FLAG;
+ test_ioctl(vm, KVM_X86_SET_MSR_FILTER, &filter,
+ FLAG & KVM_MSR_FILTER_RANGE_VALID_MASK);
+ }
+}
+
+/* Test that attempts to write to the unused bits in a flag fails. */
+static void test_flags(void)
+{
+ struct kvm_vcpu *vcpu;
+ struct kvm_vm *vm;
+
+ vm = vm_create_with_one_vcpu(&vcpu, NULL);
+
+ /* Test flags for KVM_CAP_X86_USER_SPACE_MSR. */
+ run_user_space_msr_flag_test(vm);
+
+ /* Test flags and range flags for KVM_X86_SET_MSR_FILTER. */
+ run_msr_filter_flag_test(vm);
+
+ kvm_vm_free(vm);
+}
+
int main(int argc, char *argv[])
{
/* Tell stdout not to buffer its content */
@@ -745,5 +838,7 @@ int main(int argc, char *argv[])
test_msr_permission_bitmap();
+ test_flags();
+
return 0;
}
--
2.37.1.359.gd136c6c3e2-goog
