Commit de14e014 authored by Janis Schoetterl-Glausch's avatar Janis Schoetterl-Glausch Committed by Janosch Frank
Browse files

KVM: s390: selftest: memop: Move testlist into main



This allows checking if the necessary requirements for a test case are
met via an arbitrary expression. In particular, it is easy to check if
certain bits are set in the memop extension capability.

Signed-off-by: default avatarJanis Schoetterl-Glausch <scgl@linux.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/r/20230206164602.138068-4-scgl@linux.ibm.com


Message-Id: <20230206164602.138068-4-scgl@linux.ibm.com>
Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
parent 12d27074
Loading
Loading
Loading
Loading
+66 −65
Original line number Diff line number Diff line
@@ -690,85 +690,86 @@ static void test_errors(void)
	kvm_vm_free(t.kvm_vm);
}


int main(int argc, char *argv[])
{
	int extension_cap, idx;

	TEST_REQUIRE(kvm_has_cap(KVM_CAP_S390_MEM_OP));
	extension_cap = kvm_check_cap(KVM_CAP_S390_MEM_OP_EXTENSION);

	struct testdef {
		const char *name;
		void (*test)(void);
	int extension;
		bool requirements_met;
	} testlist[] = {
		{
			.name = "simple copy",
			.test = test_copy,
			.requirements_met = true,
		},
		{
			.name = "generic error checks",
			.test = test_errors,
			.requirements_met = true,
		},
		{
			.name = "copy with storage keys",
			.test = test_copy_key,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "copy with key storage protection override",
			.test = test_copy_key_storage_prot_override,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "copy with key fetch protection",
			.test = test_copy_key_fetch_prot,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "copy with key fetch protection override",
			.test = test_copy_key_fetch_prot_override,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "error checks with key",
			.test = test_errors_key,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "termination",
			.test = test_termination,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "error checks with key storage protection override",
			.test = test_errors_key_storage_prot_override,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "error checks without key fetch prot override",
			.test = test_errors_key_fetch_prot_override_not_enabled,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
		{
			.name = "error checks with key fetch prot override",
			.test = test_errors_key_fetch_prot_override_enabled,
		.extension = 1,
			.requirements_met = extension_cap > 0,
		},
	};

int main(int argc, char *argv[])
{
	int extension_cap, idx;

	TEST_REQUIRE(kvm_has_cap(KVM_CAP_S390_MEM_OP));

	ksft_print_header();

	ksft_set_plan(ARRAY_SIZE(testlist));

	extension_cap = kvm_check_cap(KVM_CAP_S390_MEM_OP_EXTENSION);
	for (idx = 0; idx < ARRAY_SIZE(testlist); idx++) {
		if (extension_cap >= testlist[idx].extension) {
		if (testlist[idx].requirements_met) {
			testlist[idx].test();
			ksft_test_result_pass("%s\n", testlist[idx].name);
		} else {
			ksft_test_result_skip("%s - extension level %d not supported\n",
					      testlist[idx].name,
					      testlist[idx].extension);
			ksft_test_result_skip("%s - requirements not met (kernel has extension cap %#x)\n",
					      testlist[idx].name, extension_cap);
		}
	}