Commit e5c04d0f authored by André Almeida's avatar André Almeida Committed by Thomas Gleixner
Browse files

selftests/futex: Refactor futex_wait with kselftest_harness.h 



To reduce the boilerplate code, refactor futex_wait test to use
kselftest_harness header instead of futex's logging header.

Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 14d016bd

tools/testing/selftests/futex/functional/futex_wait.c

+38 −65
Original line number Diff line number Diff line
@@ -9,25 +9,16 @@ 
#include <sys/shm.h>

#include <sys/mman.h>

#include <fcntl.h>

#include "logging.h"



#include "futextest.h"

#include "../../kselftest_harness.h"



#define TEST_NAME "futex-wait"

#define timeout_ns  30000000

#define WAKE_WAIT_US 10000

#define SHM_PATH "futex_shm_file"



void *futex;



void usage(char *prog)

{

	printf("Usage: %s\n", prog);

	printf("  -c	Use color\n");

	printf("  -h	Display this help message\n");

	printf("  -v L	Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n",

	       VQUIET, VCRITICAL, VINFO);

}



static void *waiterfn(void *arg)

{

	struct timespec to;
@@ -45,53 +36,37 @@ static void *waiterfn(void *arg) 
	return NULL;

}



int main(int argc, char *argv[])

TEST(private_futex)

{

	int res, ret = RET_PASS, fd, c, shm_id;

	u_int32_t f_private = 0, *shared_data;

	unsigned int flags = FUTEX_PRIVATE_FLAG;

	u_int32_t f_private = 0;

	pthread_t waiter;

	void *shm;

	int res;



	futex = &f_private;



	while ((c = getopt(argc, argv, "cht:v:")) != -1) {

		switch (c) {

		case 'c':

			log_color(1);

			break;

		case 'h':

			usage(basename(argv[0]));

			exit(0);

		case 'v':

			log_verbosity(atoi(optarg));

			break;

		default:

			usage(basename(argv[0]));

			exit(1);

		}

	}



	ksft_print_header();

	ksft_set_plan(3);

	ksft_print_msg("%s: Test futex_wait\n", basename(argv[0]));



	/* Testing a private futex */

	info("Calling private futex_wait on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling private futex_wait on futex: %p\n", futex);

	if (pthread_create(&waiter, NULL, waiterfn, (void *) &flags))

		error("pthread_create failed\n", errno);

		ksft_exit_fail_msg("pthread_create failed\n");



	usleep(WAKE_WAIT_US);



	info("Calling private futex_wake on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling private futex_wake on futex: %p\n", futex);

	res = futex_wake(futex, 1, FUTEX_PRIVATE_FLAG);

	if (res != 1) {

		ksft_test_result_fail("futex_wake private returned: %d %s\n",

				      errno, strerror(errno));

		ret = RET_FAIL;

	} else {

		ksft_test_result_pass("futex_wake private succeeds\n");

	}

}



TEST(anon_page)

{

	u_int32_t *shared_data;

	pthread_t waiter;

	int res, shm_id;



	/* Testing an anon page shared memory */

	shm_id = shmget(IPC_PRIVATE, 4096, IPC_CREAT | 0666);
@@ -105,67 +80,65 @@ int main(int argc, char *argv[]) 
	*shared_data = 0;

	futex = shared_data;



	info("Calling shared (page anon) futex_wait on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling shared (page anon) futex_wait on futex: %p\n", futex);

	if (pthread_create(&waiter, NULL, waiterfn, NULL))

		error("pthread_create failed\n", errno);

		ksft_exit_fail_msg("pthread_create failed\n");



	usleep(WAKE_WAIT_US);



	info("Calling shared (page anon) futex_wake on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling shared (page anon) futex_wake on futex: %p\n", futex);

	res = futex_wake(futex, 1, 0);

	if (res != 1) {

		ksft_test_result_fail("futex_wake shared (page anon) returned: %d %s\n",

				      errno, strerror(errno));

		ret = RET_FAIL;

	} else {

		ksft_test_result_pass("futex_wake shared (page anon) succeeds\n");

	}



	shmdt(shared_data);

}



TEST(file_backed)

{

	u_int32_t f_private = 0;

	pthread_t waiter;

	int res, fd;

	void *shm;



	/* Testing a file backed shared memory */

	fd = open(SHM_PATH, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);

	if (fd < 0) {

		perror("open");

		exit(1);

	}

	if (fd < 0)

		ksft_exit_fail_msg("open");



	if (ftruncate(fd, sizeof(f_private))) {

		perror("ftruncate");

		exit(1);

	}

	if (ftruncate(fd, sizeof(f_private)))

		ksft_exit_fail_msg("ftruncate");



	shm = mmap(NULL, sizeof(f_private), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

	if (shm == MAP_FAILED) {

		perror("mmap");

		exit(1);

	}

	if (shm == MAP_FAILED)

		ksft_exit_fail_msg("mmap");



	memcpy(shm, &f_private, sizeof(f_private));



	futex = shm;



	info("Calling shared (file backed) futex_wait on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling shared (file backed) futex_wait on futex: %p\n", futex);

	if (pthread_create(&waiter, NULL, waiterfn, NULL))

		error("pthread_create failed\n", errno);

		ksft_exit_fail_msg("pthread_create failed\n");



	usleep(WAKE_WAIT_US);



	info("Calling shared (file backed) futex_wake on futex: %p\n", futex);

	ksft_print_dbg_msg("Calling shared (file backed) futex_wake on futex: %p\n", futex);

	res = futex_wake(shm, 1, 0);

	if (res != 1) {

		ksft_test_result_fail("futex_wake shared (file backed) returned: %d %s\n",

				      errno, strerror(errno));

		ret = RET_FAIL;

	} else {

		ksft_test_result_pass("futex_wake shared (file backed) succeeds\n");

	}



	/* Freeing resources */

	shmdt(shared_data);

	munmap(shm, sizeof(f_private));

	remove(SHM_PATH);

	close(fd);



	ksft_print_cnts();

	return ret;

}



TEST_HARNESS_MAIN

tools/testing/selftests/futex/functional/run.sh

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ echo 
./futex_wait_private_mapped_file



echo

./futex_wait $COLOR

./futex_wait



echo

./futex_requeue $COLOR