@@ -1167,6 +1167,47 @@ void verify_tdcall_vp_info(void)
printf("\t ... PASSED\n");
}
+#define TDX_LOG_DIRTY_PAGES_FLAG_TEST_GPA (0xc0000000)
+#define TDX_LOG_DIRTY_PAGES_FLAG_TEST_GVA_SHARED (0x90000000)
+#define TDX_LOG_DIRTY_PAGES_FLAG_REGION_SLOT 10
+#define TDX_LOG_DIRTY_PAGES_FLAG_REGION_NR_PAGES (0x1000 / getpagesize())
+
+void guest_code_log_dirty_flag(void)
+{
+ memset((void *)TDX_LOG_DIRTY_PAGES_FLAG_TEST_GVA_SHARED, 1, 8);
+ tdx_test_success();
+}
+
+/*
+ * Verify adding flag KVM_MEM_LOG_DIRTY_PAGES to a !KVM_MEM_GUEST_MEMFD memslot
+ * in a TD does not produce host errors.
+ */
+void verify_log_dirty_pages_flag_on_non_gmemfd_slot(void)
+{
+ struct kvm_vcpu *vcpu;
+ struct kvm_vm *vm;
+
+ vm = td_create();
+ td_initialize(vm, VM_MEM_SRC_ANONYMOUS, 0);
+ vcpu = td_vcpu_add(vm, 0, guest_code_log_dirty_flag);
+
+ vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS,
+ TDX_LOG_DIRTY_PAGES_FLAG_TEST_GPA,
+ TDX_LOG_DIRTY_PAGES_FLAG_REGION_SLOT,
+ TDX_LOG_DIRTY_PAGES_FLAG_REGION_NR_PAGES,
+ KVM_MEM_LOG_DIRTY_PAGES);
+ virt_map_shared(vm, TDX_LOG_DIRTY_PAGES_FLAG_TEST_GVA_SHARED,
+ (uint64_t)TDX_LOG_DIRTY_PAGES_FLAG_TEST_GPA,
+ TDX_LOG_DIRTY_PAGES_FLAG_REGION_NR_PAGES);
+ td_finalize(vm);
+
+ printf("Verifying Log dirty flag:\n");
+ vcpu_run(vcpu);
+ tdx_test_assert_success(vcpu);
+ kvm_vm_free(vm);
+ printf("\t ... PASSED\n");
+}
+
int main(int argc, char **argv)
{
ksft_print_header();
@@ -1174,7 +1215,7 @@ int main(int argc, char **argv)
if (!is_tdx_enabled())
ksft_exit_skip("TDX is not supported by the KVM. Exiting.\n");
- ksft_set_plan(15);
+ ksft_set_plan(16);
ksft_test_result(!run_in_new_process(&verify_td_lifecycle),
"verify_td_lifecycle\n");
ksft_test_result(!run_in_new_process(&verify_report_fatal_error),
@@ -1205,6 +1246,8 @@ int main(int argc, char **argv)
"verify_host_reading_private_mem\n");
ksft_test_result(!run_in_new_process(&verify_tdcall_vp_info),
"verify_tdcall_vp_info\n");
+ ksft_test_result(!run_in_new_process(&verify_log_dirty_pages_flag_on_non_gmemfd_slot),
+ "verify_log_dirty_pages_flag_on_non_gmemfd_slot\n");
ksft_finished();
return 0;