Commit 3953a1d1 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Shuah Khan
Browse files

selftests: vDSO: improve getrandom and chacha error messages 



Improve the error and skip condition messages to let the developer know
precisely where a test has failed. Also make better use of the ksft api
for this.

Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent fe6305cb

tools/testing/selftests/vDSO/vdso_test_chacha.c

+16 −11
Original line number Diff line number Diff line
@@ -91,10 +91,8 @@ int main(int argc, char *argv[]) 
	ksft_set_plan(1);



	for (unsigned int trial = 0; trial < TRIALS; ++trial) {

		if (getrandom(key, sizeof(key), 0) != sizeof(key)) {

			printf("getrandom() failed!\n");

			return KSFT_SKIP;

		}

		if (getrandom(key, sizeof(key), 0) != sizeof(key))

			ksft_exit_skip("getrandom() failed unexpectedly\n");

		memset(counter1, 0, sizeof(counter1));

		reference_chacha20_blocks(output1, key, counter1, BLOCKS);

		for (unsigned int split = 0; split < BLOCKS; ++split) {
@@ -103,8 +101,10 @@ int main(int argc, char *argv[]) 
			if (split)

				__arch_chacha20_blocks_nostack(output2, key, counter2, split);

			__arch_chacha20_blocks_nostack(output2 + split * BLOCK_SIZE, key, counter2, BLOCKS - split);

			if (memcmp(output1, output2, sizeof(output1)) || memcmp(counter1, counter2, sizeof(counter1)))

				return KSFT_FAIL;

			if (memcmp(output1, output2, sizeof(output1)))

				ksft_exit_fail_msg("Main loop outputs do not match on trial %u, split %u\n", trial, split);

			if (memcmp(counter1, counter2, sizeof(counter1)))

				ksft_exit_fail_msg("Main loop counters do not match on trial %u, split %u\n", trial, split);

		}

	}

	memset(counter1, 0, sizeof(counter1));
@@ -114,14 +114,19 @@ int main(int argc, char *argv[]) 


	reference_chacha20_blocks(output1, key, counter1, BLOCKS);

	__arch_chacha20_blocks_nostack(output2, key, counter2, BLOCKS);

	if (memcmp(output1, output2, sizeof(output1)) || memcmp(counter1, counter2, sizeof(counter1)))

		return KSFT_FAIL;

	if (memcmp(output1, output2, sizeof(output1)))

		ksft_exit_fail_msg("Block limit outputs do not match after first round\n");

	if (memcmp(counter1, counter2, sizeof(counter1)))

		ksft_exit_fail_msg("Block limit counters do not match after first round\n");



	reference_chacha20_blocks(output1, key, counter1, BLOCKS);

	__arch_chacha20_blocks_nostack(output2, key, counter2, BLOCKS);

	if (memcmp(output1, output2, sizeof(output1)) || memcmp(counter1, counter2, sizeof(counter1)))

		return KSFT_FAIL;

	if (memcmp(output1, output2, sizeof(output1)))

		ksft_exit_fail_msg("Block limit outputs do not match after second round\n");

	if (memcmp(counter1, counter2, sizeof(counter1)))

		ksft_exit_fail_msg("Block limit counters do not match after second round\n");



	ksft_test_result_pass("chacha: PASS\n");

	return KSFT_PASS;

	ksft_exit_pass();

	return 0;

}

tools/testing/selftests/vDSO/vdso_test_getrandom.c

+33 −42
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
	} while (0)

#endif



#define ksft_assert(condition) \

	do { if (!(condition)) ksft_exit_fail_msg("Assertion failed: %s\n", #condition); } while (0)



static struct {

	pthread_mutex_t lock;

	void **states;
@@ -111,26 +114,19 @@ static void vgetrandom_init(void) 
	const char *version = versions[VDSO_VERSION];

	const char *name = names[VDSO_NAMES][6];

	unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);

	size_t ret;

	ssize_t ret;



	if (!sysinfo_ehdr) {

		printf("AT_SYSINFO_EHDR is not present!\n");

		exit(KSFT_SKIP);

	}

	if (!sysinfo_ehdr)

		ksft_exit_skip("AT_SYSINFO_EHDR is not present\n");

	vdso_init_from_sysinfo_ehdr(sysinfo_ehdr);

	vgrnd.fn = (__typeof__(vgrnd.fn))vdso_sym(version, name);

	if (!vgrnd.fn) {

		printf("%s is missing!\n", name);

		exit(KSFT_SKIP);

	}

	if (!vgrnd.fn)

		ksft_exit_skip("%s@%s symbol is missing from vDSO\n", name, version);

	ret = VDSO_CALL(vgrnd.fn, 5, NULL, 0, 0, &vgrnd.params, ~0UL);

	if (ret == -ENOSYS) {

		printf("unsupported architecture\n");

		exit(KSFT_SKIP);

	} else if (ret) {

		printf("failed to fetch vgetrandom params!\n");

		exit(KSFT_FAIL);

	}

	if (ret == -ENOSYS)

		ksft_exit_skip("CPU does not have runtime support\n");

	else if (ret)

		ksft_exit_fail_msg("Failed to fetch vgetrandom params: %zd\n", ret);

}



static ssize_t vgetrandom(void *buf, size_t len, unsigned long flags)
@@ -139,10 +135,7 @@ static ssize_t vgetrandom(void *buf, size_t len, unsigned long flags) 


	if (!state) {

		state = vgetrandom_get_state();

		if (!state) {

			printf("vgetrandom_get_state failed!\n");

			exit(KSFT_FAIL);

		}

		ksft_assert(state);

	}

	return VDSO_CALL(vgrnd.fn, 5, buf, len, flags, state, vgrnd.params.size_of_opaque_state);

}
@@ -154,7 +147,7 @@ static void *test_vdso_getrandom(void *ctx) 
	for (size_t i = 0; i < TRIALS; ++i) {

		unsigned int val;

		ssize_t ret = vgetrandom(&val, sizeof(val), 0);

		assert(ret == sizeof(val));

		ksft_assert(ret == sizeof(val));

	}

	return NULL;

}
@@ -164,7 +157,7 @@ static void *test_libc_getrandom(void *ctx) 
	for (size_t i = 0; i < TRIALS; ++i) {

		unsigned int val;

		ssize_t ret = getrandom(&val, sizeof(val), 0);

		assert(ret == sizeof(val));

		ksft_assert(ret == sizeof(val));

	}

	return NULL;

}
@@ -174,7 +167,7 @@ static void *test_syscall_getrandom(void *ctx) 
	for (size_t i = 0; i < TRIALS; ++i) {

		unsigned int val;

		ssize_t ret = syscall(__NR_getrandom, &val, sizeof(val), 0);

		assert(ret == sizeof(val));

		ksft_assert(ret == sizeof(val));

	}

	return NULL;

}
@@ -209,7 +202,7 @@ static void bench_multi(void) 


	clock_gettime(CLOCK_MONOTONIC, &start);

	for (size_t i = 0; i < THREADS; ++i)

		assert(pthread_create(&threads[i], NULL, test_vdso_getrandom, NULL) == 0);

		ksft_assert(pthread_create(&threads[i], NULL, test_vdso_getrandom, NULL) == 0);

	for (size_t i = 0; i < THREADS; ++i)

		pthread_join(threads[i], NULL);

	clock_gettime(CLOCK_MONOTONIC, &end);
@@ -218,7 +211,7 @@ static void bench_multi(void) 


	clock_gettime(CLOCK_MONOTONIC, &start);

	for (size_t i = 0; i < THREADS; ++i)

		assert(pthread_create(&threads[i], NULL, test_libc_getrandom, NULL) == 0);

		ksft_assert(pthread_create(&threads[i], NULL, test_libc_getrandom, NULL) == 0);

	for (size_t i = 0; i < THREADS; ++i)

		pthread_join(threads[i], NULL);

	clock_gettime(CLOCK_MONOTONIC, &end);
@@ -227,7 +220,7 @@ static void bench_multi(void) 


	clock_gettime(CLOCK_MONOTONIC, &start);

	for (size_t i = 0; i < THREADS; ++i)

		assert(pthread_create(&threads[i], NULL, test_syscall_getrandom, NULL) == 0);

		ksft_assert(pthread_create(&threads[i], NULL, test_syscall_getrandom, NULL) == 0);

	for (size_t i = 0; i < THREADS; ++i)

		pthread_join(threads[i], NULL);

	clock_gettime(CLOCK_MONOTONIC, &end);
@@ -252,48 +245,46 @@ static void kselftest(void) 


	for (size_t i = 0; i < 1000; ++i) {

		ssize_t ret = vgetrandom(weird_size, sizeof(weird_size), 0);

		if (ret != sizeof(weird_size))

			exit(KSFT_FAIL);

		ksft_assert(ret == sizeof(weird_size));

	}



	ksft_test_result_pass("getrandom: PASS\n");



	unshare(CLONE_NEWUSER);

	assert(unshare(CLONE_NEWTIME) == 0);

	ksft_assert(unshare(CLONE_NEWTIME) == 0);

	child = fork();

	assert(child >= 0);

	ksft_assert(child >= 0);

	if (!child) {

		vgetrandom_init();

		child = getpid();

		assert(ptrace(PTRACE_TRACEME, 0, NULL, NULL) == 0);

		assert(kill(child, SIGSTOP) == 0);

		assert(vgetrandom(weird_size, sizeof(weird_size), 0) == sizeof(weird_size));

		ksft_assert(ptrace(PTRACE_TRACEME, 0, NULL, NULL) == 0);

		ksft_assert(kill(child, SIGSTOP) == 0);

		ksft_assert(vgetrandom(weird_size, sizeof(weird_size), 0) == sizeof(weird_size));

		_exit(0);

	}

	for (;;) {

		struct ptrace_syscall_info info = { 0 };

		int status, ret;

		assert(waitpid(child, &status, 0) >= 0);

		ksft_assert(waitpid(child, &status, 0) >= 0);

		if (WIFEXITED(status)) {

			if (WEXITSTATUS(status) != 0)

				exit(KSFT_FAIL);

			ksft_assert(WEXITSTATUS(status) == 0);

			break;

		}

		assert(WIFSTOPPED(status));

		ksft_assert(WIFSTOPPED(status));

		if (WSTOPSIG(status) == SIGSTOP)

			assert(ptrace(PTRACE_SETOPTIONS, child, 0, PTRACE_O_TRACESYSGOOD) == 0);

			ksft_assert(ptrace(PTRACE_SETOPTIONS, child, 0, PTRACE_O_TRACESYSGOOD) == 0);

		else if (WSTOPSIG(status) == (SIGTRAP | 0x80)) {

			assert(ptrace(PTRACE_GET_SYSCALL_INFO, child, sizeof(info), &info) > 0);

			ksft_assert(ptrace(PTRACE_GET_SYSCALL_INFO, child, sizeof(info), &info) > 0);

			if (info.op == PTRACE_SYSCALL_INFO_ENTRY && info.entry.nr == __NR_getrandom &&

			    info.entry.args[0] == (uintptr_t)weird_size && info.entry.args[1] == sizeof(weird_size))

				exit(KSFT_FAIL);

				ksft_exit_fail_msg("vgetrandom passed buffer to syscall getrandom unexpectedly\n");

		}

		assert(ptrace(PTRACE_SYSCALL, child, 0, 0) == 0);

		ksft_assert(ptrace(PTRACE_SYSCALL, child, 0, 0) == 0);

	}



	ksft_test_result_pass("getrandom timens: PASS\n");



	exit(KSFT_PASS);

	ksft_exit_pass();

}



static void usage(const char *argv0)