mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
selftests/futex: Migrate futex_requeue_pi to harness
Migrate futex_requeue_pi test to the kselftest harness framework, removing mixed legacy ksft_* API usages and passing test metadata to all helper threads via thread arguments. [ tglx: Fixup coding style ] Signed-off-by: Wake Liu <wakel@google.com> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Link: https://patch.msgid.link/20260601065126.3623867-3-wakel@google.com
This commit is contained in:
Wake Liu
committed by
Thomas Gleixner
Thomas Gleixner
parent
d0f7df9bb7
commit
b7d837c2d4
@@ -43,12 +43,13 @@ futex_t f2 = FUTEX_INITIALIZER;
|
||||
futex_t wake_complete = FUTEX_INITIALIZER;
|
||||
|
||||
struct thread_arg {
|
||||
long id;
|
||||
struct timespec *timeout;
|
||||
int lock;
|
||||
int ret;
|
||||
struct __test_metadata *_metadata;
|
||||
long id;
|
||||
struct timespec *timeout;
|
||||
int lock;
|
||||
int ret;
|
||||
};
|
||||
#define THREAD_ARG_INITIALIZER { 0, NULL, 0, 0 }
|
||||
#define THREAD_ARG_INITIALIZER { NULL, 0, NULL, 0, 0 }
|
||||
|
||||
FIXTURE(args)
|
||||
{
|
||||
@@ -118,7 +119,7 @@ FIXTURE_VARIANT_ADD_TIMEOUT(5000);
|
||||
FIXTURE_VARIANT_ADD_TIMEOUT(500000);
|
||||
FIXTURE_VARIANT_ADD_TIMEOUT(2000000000);
|
||||
|
||||
int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,
|
||||
int create_rt_thread(struct __test_metadata *_metadata, pthread_t *pth, void*(*func)(void *), void *arg,
|
||||
int policy, int prio)
|
||||
{
|
||||
int ret;
|
||||
@@ -129,29 +130,22 @@ int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,
|
||||
memset(&schedp, 0, sizeof(schedp));
|
||||
|
||||
ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
|
||||
if (ret) {
|
||||
ksft_exit_fail_msg("pthread_attr_setinheritsched\n");
|
||||
return -1;
|
||||
}
|
||||
ASSERT_EQ(ret, 0)
|
||||
TH_LOG("pthread_attr_setinheritsched failed");
|
||||
|
||||
ret = pthread_attr_setschedpolicy(&attr, policy);
|
||||
if (ret) {
|
||||
ksft_exit_fail_msg("pthread_attr_setschedpolicy\n");
|
||||
return -1;
|
||||
}
|
||||
ASSERT_EQ(ret, 0)
|
||||
TH_LOG("pthread_attr_setschedpolicy failed");
|
||||
|
||||
schedp.sched_priority = prio;
|
||||
ret = pthread_attr_setschedparam(&attr, &schedp);
|
||||
if (ret) {
|
||||
ksft_exit_fail_msg("pthread_attr_setschedparam\n");
|
||||
return -1;
|
||||
}
|
||||
ASSERT_EQ(ret, 0)
|
||||
TH_LOG("pthread_attr_setschedparam failed");
|
||||
|
||||
ret = pthread_create(pth, &attr, func, arg);
|
||||
if (ret) {
|
||||
ksft_exit_fail_msg("pthread_create\n");
|
||||
return -1;
|
||||
}
|
||||
ASSERT_EQ(ret, 0)
|
||||
TH_LOG("pthread_create failed");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -159,70 +153,76 @@ int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg,
|
||||
void *waiterfn(void *arg)
|
||||
{
|
||||
struct thread_arg *args = (struct thread_arg *)arg;
|
||||
struct __test_metadata *_metadata = args->_metadata;
|
||||
futex_t old_val;
|
||||
|
||||
ksft_print_dbg_msg("Waiter %ld: running\n", args->id);
|
||||
TH_LOG("Waiter %ld: running", args->id);
|
||||
/* Each thread sleeps for a different amount of time
|
||||
* This is to avoid races, because we don't lock the
|
||||
* external mutex here */
|
||||
* external mutex here
|
||||
*/
|
||||
usleep(1000 * (long)args->id);
|
||||
|
||||
old_val = f1;
|
||||
atomic_inc(&waiters_blocked);
|
||||
ksft_print_dbg_msg("Calling futex_wait_requeue_pi: %p (%u) -> %p\n",
|
||||
&f1, f1, &f2);
|
||||
TH_LOG("Calling futex_wait_requeue_pi: %p (%u) -> %p", &f1, f1, &f2);
|
||||
args->ret = futex_wait_requeue_pi(&f1, old_val, &f2, args->timeout,
|
||||
FUTEX_PRIVATE_FLAG);
|
||||
|
||||
ksft_print_dbg_msg("waiter %ld woke with %d %s\n", args->id, args->ret,
|
||||
args->ret < 0 ? strerror(errno) : "");
|
||||
TH_LOG("waiter %ld woke with %d %s", args->id, args->ret,
|
||||
args->ret < 0 ? strerror(errno) : "");
|
||||
atomic_inc(&waiters_woken);
|
||||
if (args->ret < 0) {
|
||||
if (args->timeout && errno == ETIMEDOUT)
|
||||
if (args->timeout && errno == ETIMEDOUT) {
|
||||
args->ret = 0;
|
||||
else {
|
||||
ksft_exit_fail_msg("futex_wait_requeue_pi\n");
|
||||
} else {
|
||||
ASSERT_EQ(args->ret, 0)
|
||||
TH_LOG("futex_wait_requeue_pi failed: %s", strerror(errno));
|
||||
}
|
||||
futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG);
|
||||
}
|
||||
futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG);
|
||||
|
||||
ksft_print_dbg_msg("Waiter %ld: exiting with %d\n", args->id, args->ret);
|
||||
TH_LOG("Waiter %ld: exiting with %d", args->id, args->ret);
|
||||
pthread_exit((void *)&args->ret);
|
||||
}
|
||||
|
||||
void *broadcast_wakerfn(void *arg)
|
||||
{
|
||||
struct thread_arg *args = (struct thread_arg *)arg;
|
||||
struct __test_metadata *_metadata = args->_metadata;
|
||||
int nr_requeue = INT_MAX;
|
||||
int task_count = 0;
|
||||
futex_t old_val;
|
||||
int nr_wake = 1;
|
||||
int i = 0;
|
||||
|
||||
ksft_print_dbg_msg("Waker: waiting for waiters to block\n");
|
||||
TH_LOG("Waker: waiting for waiters to block");
|
||||
while (waiters_blocked.val < THREAD_MAX)
|
||||
usleep(1000);
|
||||
usleep(1000);
|
||||
|
||||
ksft_print_dbg_msg("Waker: Calling broadcast\n");
|
||||
TH_LOG("Waker: Calling broadcast");
|
||||
if (args->lock) {
|
||||
ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", f2, &f2);
|
||||
TH_LOG("Calling FUTEX_LOCK_PI on mutex=%x @ %p", f2, &f2);
|
||||
futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG);
|
||||
}
|
||||
continue_requeue:
|
||||
old_val = f1;
|
||||
args->ret = futex_cmp_requeue_pi(&f1, old_val, &f2, nr_wake, nr_requeue,
|
||||
FUTEX_PRIVATE_FLAG);
|
||||
FUTEX_PRIVATE_FLAG);
|
||||
if (args->ret < 0) {
|
||||
ksft_exit_fail_msg("FUTEX_CMP_REQUEUE_PI failed\n");
|
||||
ASSERT_GE(args->ret, 0)
|
||||
TH_LOG("FUTEX_CMP_REQUEUE_PI failed: %s", strerror(errno));
|
||||
} else if (++i < MAX_WAKE_ITERS) {
|
||||
task_count += args->ret;
|
||||
if (task_count < THREAD_MAX - waiters_woken.val)
|
||||
goto continue_requeue;
|
||||
} else {
|
||||
ksft_exit_fail_msg("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued\n",
|
||||
MAX_WAKE_ITERS, task_count, THREAD_MAX);
|
||||
ASSERT_TRUE(0) {
|
||||
TH_LOG("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued",
|
||||
MAX_WAKE_ITERS, task_count, THREAD_MAX);
|
||||
}
|
||||
}
|
||||
|
||||
futex_wake(&wake_complete, 1, FUTEX_PRIVATE_FLAG);
|
||||
@@ -233,33 +233,33 @@ void *broadcast_wakerfn(void *arg)
|
||||
if (args->ret > 0)
|
||||
args->ret = task_count;
|
||||
|
||||
ksft_print_dbg_msg("Waker: exiting with %d\n", args->ret);
|
||||
TH_LOG("Waker: exiting with %d", args->ret);
|
||||
pthread_exit((void *)&args->ret);
|
||||
}
|
||||
|
||||
void *signal_wakerfn(void *arg)
|
||||
{
|
||||
struct thread_arg *args = (struct thread_arg *)arg;
|
||||
struct __test_metadata *_metadata = args->_metadata;
|
||||
unsigned int old_val;
|
||||
int nr_requeue = 0;
|
||||
int task_count = 0;
|
||||
int nr_wake = 1;
|
||||
int i = 0;
|
||||
|
||||
ksft_print_dbg_msg("Waker: waiting for waiters to block\n");
|
||||
TH_LOG("Waker: waiting for waiters to block");
|
||||
while (waiters_blocked.val < THREAD_MAX)
|
||||
usleep(1000);
|
||||
usleep(1000);
|
||||
|
||||
while (task_count < THREAD_MAX && waiters_woken.val < THREAD_MAX) {
|
||||
ksft_print_dbg_msg("task_count: %d, waiters_woken: %d\n",
|
||||
TH_LOG("task_count: %d, waiters_woken: %d",
|
||||
task_count, waiters_woken.val);
|
||||
if (args->lock) {
|
||||
ksft_print_dbg_msg("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n",
|
||||
f2, &f2);
|
||||
TH_LOG("Calling FUTEX_LOCK_PI on mutex=%x @ %p", f2, &f2);
|
||||
futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG);
|
||||
}
|
||||
ksft_print_dbg_msg("Waker: Calling signal\n");
|
||||
TH_LOG("Waker: Calling signal");
|
||||
/* cond_signal */
|
||||
old_val = f1;
|
||||
args->ret = futex_cmp_requeue_pi(&f1, old_val, &f2,
|
||||
@@ -267,23 +267,27 @@ void *signal_wakerfn(void *arg)
|
||||
FUTEX_PRIVATE_FLAG);
|
||||
if (args->ret < 0)
|
||||
args->ret = -errno;
|
||||
ksft_print_dbg_msg("futex: %x\n", f2);
|
||||
TH_LOG("futex: %x", f2);
|
||||
if (args->lock) {
|
||||
ksft_print_dbg_msg("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n",
|
||||
TH_LOG("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p",
|
||||
f2, &f2);
|
||||
futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG);
|
||||
}
|
||||
ksft_print_dbg_msg("futex: %x\n", f2);
|
||||
if (args->ret < 0)
|
||||
ksft_exit_fail_msg("FUTEX_CMP_REQUEUE_PI failed\n");
|
||||
TH_LOG("futex: %x", f2);
|
||||
if (args->ret < 0) {
|
||||
ASSERT_GE(args->ret, 0)
|
||||
TH_LOG("FUTEX_CMP_REQUEUE_PI failed: %s", strerror(-args->ret));
|
||||
}
|
||||
|
||||
task_count += args->ret;
|
||||
usleep(SIGNAL_PERIOD_US);
|
||||
i++;
|
||||
/* we have to loop at least THREAD_MAX times */
|
||||
if (i > MAX_WAKE_ITERS + THREAD_MAX) {
|
||||
ksft_exit_fail_msg("max signaling iterations (%d) reached, giving up on pending waiters.\n",
|
||||
MAX_WAKE_ITERS + THREAD_MAX);
|
||||
ASSERT_TRUE(0) {
|
||||
TH_LOG("max signaling iterations (%d) reached, giving up on pending waiters.",
|
||||
MAX_WAKE_ITERS + THREAD_MAX);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,14 +296,15 @@ void *signal_wakerfn(void *arg)
|
||||
if (args->ret >= 0)
|
||||
args->ret = task_count;
|
||||
|
||||
ksft_print_dbg_msg("Waker: exiting with %d\n", args->ret);
|
||||
ksft_print_dbg_msg("Waker: waiters_woken: %d\n", waiters_woken.val);
|
||||
TH_LOG("Waker: exiting with %d", args->ret);
|
||||
TH_LOG("Waker: waiters_woken: %d", waiters_woken.val);
|
||||
pthread_exit((void *)&args->ret);
|
||||
}
|
||||
|
||||
void *third_party_blocker(void *arg)
|
||||
{
|
||||
struct thread_arg *args = (struct thread_arg *)arg;
|
||||
struct __test_metadata *_metadata = args->_metadata;
|
||||
int ret2 = 0;
|
||||
|
||||
args->ret = futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG);
|
||||
@@ -310,8 +315,10 @@ void *third_party_blocker(void *arg)
|
||||
ret2 = futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG);
|
||||
|
||||
out:
|
||||
if (args->ret || ret2)
|
||||
ksft_exit_fail_msg("third_party_blocker() futex error");
|
||||
if (args->ret || ret2) {
|
||||
ASSERT_TRUE(0)
|
||||
TH_LOG("%s() futex error", __func__);
|
||||
}
|
||||
|
||||
pthread_exit((void *)&args->ret);
|
||||
}
|
||||
@@ -330,20 +337,19 @@ TEST_F(args, futex_requeue_pi)
|
||||
bool lock = variant->locked;
|
||||
int *waiter_ret, i, ret = 0;
|
||||
|
||||
ksft_print_msg(
|
||||
"\tArguments: broadcast=%d locked=%d owner=%d timeout=%ldns\n",
|
||||
TH_LOG("Arguments: broadcast=%d locked=%d owner=%d timeout=%ldns",
|
||||
broadcast, lock, third_party_owner, timeout_ns);
|
||||
|
||||
if (timeout_ns) {
|
||||
time_t secs;
|
||||
|
||||
ksft_print_dbg_msg("timeout_ns = %ld\n", timeout_ns);
|
||||
TH_LOG("timeout_ns = %ld", timeout_ns);
|
||||
ret = clock_gettime(CLOCK_MONOTONIC, &ts);
|
||||
secs = (ts.tv_nsec + timeout_ns) / 1000000000;
|
||||
ts.tv_nsec = ((int64_t)ts.tv_nsec + timeout_ns) % 1000000000;
|
||||
ts.tv_sec += secs;
|
||||
ksft_print_dbg_msg("ts.tv_sec = %ld\n", ts.tv_sec);
|
||||
ksft_print_dbg_msg("ts.tv_nsec = %ld\n", ts.tv_nsec);
|
||||
TH_LOG("ts.tv_sec = %ld", ts.tv_sec);
|
||||
TH_LOG("ts.tv_nsec = %ld", ts.tv_nsec);
|
||||
tsp = &ts;
|
||||
}
|
||||
|
||||
@@ -351,34 +357,29 @@ TEST_F(args, futex_requeue_pi)
|
||||
wakerfn = broadcast_wakerfn;
|
||||
|
||||
if (third_party_owner) {
|
||||
if (create_rt_thread(&blocker, third_party_blocker,
|
||||
(void *)&blocker_arg, SCHED_FIFO, 1)) {
|
||||
ksft_exit_fail_msg("Creating third party blocker thread failed\n");
|
||||
}
|
||||
blocker_arg._metadata = _metadata;
|
||||
create_rt_thread(_metadata, &blocker, third_party_blocker,
|
||||
(void *)&blocker_arg, SCHED_FIFO, 1);
|
||||
}
|
||||
|
||||
atomic_set(&waiters_woken, 0);
|
||||
for (i = 0; i < THREAD_MAX; i++) {
|
||||
args[i]._metadata = _metadata;
|
||||
args[i].id = i;
|
||||
args[i].timeout = tsp;
|
||||
ksft_print_dbg_msg("Starting thread %d\n", i);
|
||||
if (create_rt_thread(&waiter[i], waiterfn, (void *)&args[i],
|
||||
SCHED_FIFO, 1)) {
|
||||
ksft_exit_fail_msg("Creating waiting thread failed\n");
|
||||
}
|
||||
TH_LOG("Starting thread %d", i);
|
||||
create_rt_thread(_metadata, &waiter[i], waiterfn, (void *)&args[i],
|
||||
SCHED_FIFO, 1);
|
||||
}
|
||||
waker_arg._metadata = _metadata;
|
||||
waker_arg.lock = lock;
|
||||
if (create_rt_thread(&waker, wakerfn, (void *)&waker_arg,
|
||||
SCHED_FIFO, 1)) {
|
||||
ksft_exit_fail_msg("Creating waker thread failed\n");
|
||||
}
|
||||
create_rt_thread(_metadata, &waker, wakerfn, (void *)&waker_arg, SCHED_FIFO, 1);
|
||||
|
||||
/* Wait for threads to finish */
|
||||
/* Store the first error or failure encountered in waiter_ret */
|
||||
waiter_ret = &args[0].ret;
|
||||
for (i = 0; i < THREAD_MAX; i++)
|
||||
pthread_join(waiter[i],
|
||||
*waiter_ret ? NULL : (void **)&waiter_ret);
|
||||
pthread_join(waiter[i], *waiter_ret ? NULL : (void **)&waiter_ret);
|
||||
|
||||
if (third_party_owner)
|
||||
pthread_join(blocker, NULL);
|
||||
@@ -393,8 +394,8 @@ TEST_F(args, futex_requeue_pi)
|
||||
ret = blocker_arg.ret;
|
||||
}
|
||||
|
||||
if (ret)
|
||||
ksft_test_result_fail("fail");
|
||||
EXPECT_EQ(ret, 0)
|
||||
TH_LOG("Test failed with error code: %d", ret);
|
||||
}
|
||||
|
||||
TEST_HARNESS_MAIN
|
||||
|
||||
Reference in New Issue
Block a user