* [GIT PULL v2] selftest: Add futex functional tests @ 2015-05-08 22:09 Darren Hart 2015-05-08 22:09 ` [PATCH 1/5] selftests: " Darren Hart 2015-05-08 22:09 ` [PATCH 3/5] selftest/futex: Increment ksft pass and fail counters Darren Hart 0 siblings, 2 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Darren Hart Hi Shuah, This series begins the process of migrating my futextest tests into kselftest. I've started with only the functional tests, as the performance and stress may not be appropriate for kselftest as they stand. I cleaned up various complaints from checkpatch, but I ignored others that would require significant rework of the testcases, such as not using volatile and not creating new typedefs. Since v1: Avoid checkpatch errors on 1/5 by: - combining a later patch which did substantial cleanup. - removing file-local typedefs and replacing with structs - correcting all >80 char lines, except for quoted strings and header boiler plate due to long email addresses I did *not* make changes for the following: - Use of new typdefs for types futex_t and atomic_t as they are used throughout the test suite and I consider them to be worth while. - Use of volatile as the warning is about use of volatile in kernel code. The usage in futextest is correct, as an indicator that other threads may modify the value. - Adding parentheses around complex defines as it would break one use case and change the behavior of another. The patches will follow, but I'm providing a pull request for your convenience as well. The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031: Linux 4.1-rc1 (2015-04-26 17:59:10 -0700) are available in the git repository at: git://git.infradead.org/users/dvhart/linux.git futextest-v2 Darren Hart (5): selftests: Add futex functional tests selftest/futex: Update Makefile to use lib.mk selftest/futex: Increment ksft pass and fail counters selftest: Add futex tests to the top-level Makefile kselftest: Add exit code defines tools/testing/selftests/Makefile | 1 + tools/testing/selftests/futex/Makefile | 29 ++ tools/testing/selftests/futex/README | 62 ++++ tools/testing/selftests/futex/functional/Makefile | 25 ++ .../selftests/futex/functional/futex_requeue_pi.c | 409 +++++++++++++++++++++ .../functional/futex_requeue_pi_mismatched_ops.c | 135 +++++++ .../functional/futex_requeue_pi_signal_restart.c | 223 +++++++++++ .../functional/futex_wait_private_mapped_file.c | 125 +++++++ .../futex/functional/futex_wait_timeout.c | 86 +++++ .../functional/futex_wait_uninitialized_heap.c | 124 +++++++ .../futex/functional/futex_wait_wouldblock.c | 79 ++++ tools/testing/selftests/futex/functional/run.sh | 80 ++++ tools/testing/selftests/futex/include/atomic.h | 83 +++++ tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++ tools/testing/selftests/futex/include/logging.h | 153 ++++++++ tools/testing/selftests/futex/run.sh | 33 ++ tools/testing/selftests/kselftest.h | 17 +- 17 files changed, 1925 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/futex/Makefile create mode 100644 tools/testing/selftests/futex/README create mode 100644 tools/testing/selftests/futex/functional/Makefile create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c create mode 100755 tools/testing/selftests/futex/functional/run.sh create mode 100644 tools/testing/selftests/futex/include/atomic.h create mode 100644 tools/testing/selftests/futex/include/futextest.h create mode 100644 tools/testing/selftests/futex/include/logging.h create mode 100755 tools/testing/selftests/futex/run.sh -- 2.1.4 ^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 1/5] selftests: Add futex functional tests 2015-05-08 22:09 [GIT PULL v2] selftest: Add futex functional tests Darren Hart @ 2015-05-08 22:09 ` Darren Hart [not found] ` <cover.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2015-05-11 18:06 ` [PATCH 1/5] selftests: Add futex functional tests Shuah Khan 2015-05-08 22:09 ` [PATCH 3/5] selftest/futex: Increment ksft pass and fail counters Darren Hart 1 sibling, 2 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api, Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain; charset=y, Size: 60321 bytes --] The futextest testsuite [1] provides functional, stress, and performance tests for the various futex op codes. Those tests will be of more use to futex developers if they are included with the kernel source. Copy the core infrastructure and the functional tests into selftests, but adapt them for inclusion in the kernel: - Update the Makefile to include the run_tests target, remove reference to the performance and stress tests from the contributed sources. - Replace my dead IBM email address with my current Intel email address. - Remove the warrantee and write-to paragraphs from the license blurbs. - Remove the NAME section as the filename is easily determined. ;-) - Make the whitespace usage consistent in a couple of places. - Cleanup various CodingStyle violations. A future effort will explore moving the performance and stress tests into the kernel. 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git Cc: Shuah Khan <shuahkh@osg.samsung.com> Cc: linux-api@vger.kernel.org Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- tools/testing/selftests/futex/Makefile | 11 + tools/testing/selftests/futex/README | 62 ++++ tools/testing/selftests/futex/functional/Makefile | 24 ++ .../selftests/futex/functional/futex_requeue_pi.c | 409 +++++++++++++++++++++ .../functional/futex_requeue_pi_mismatched_ops.c | 135 +++++++ .../functional/futex_requeue_pi_signal_restart.c | 223 +++++++++++ .../functional/futex_wait_private_mapped_file.c | 125 +++++++ .../futex/functional/futex_wait_timeout.c | 86 +++++ .../functional/futex_wait_uninitialized_heap.c | 124 +++++++ .../futex/functional/futex_wait_wouldblock.c | 79 ++++ tools/testing/selftests/futex/functional/run.sh | 80 ++++ tools/testing/selftests/futex/include/atomic.h | 83 +++++ tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++ tools/testing/selftests/futex/include/logging.h | 150 ++++++++ tools/testing/selftests/futex/run.sh | 33 ++ 15 files changed, 1890 insertions(+) create mode 100644 tools/testing/selftests/futex/Makefile create mode 100644 tools/testing/selftests/futex/README create mode 100644 tools/testing/selftests/futex/functional/Makefile create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c create mode 100755 tools/testing/selftests/futex/functional/run.sh create mode 100644 tools/testing/selftests/futex/include/atomic.h create mode 100644 tools/testing/selftests/futex/include/futextest.h create mode 100644 tools/testing/selftests/futex/include/logging.h create mode 100755 tools/testing/selftests/futex/run.sh diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile new file mode 100644 index 0000000..2c26d59 --- /dev/null +++ b/tools/testing/selftests/futex/Makefile @@ -0,0 +1,11 @@ +SUBDIRS := functional + +.PHONY: all clean +all: + for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done + +run_tests: all + ./run.sh + +clean: + for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done diff --git a/tools/testing/selftests/futex/README b/tools/testing/selftests/futex/README new file mode 100644 index 0000000..3224a04 --- /dev/null +++ b/tools/testing/selftests/futex/README @@ -0,0 +1,62 @@ +Futex Test +========== +Futex Test is intended to thoroughly test the Linux kernel futex system call +API. + +Functional tests shall test the documented behavior of the futex operation +code under test. This includes checking for proper behavior under normal use, +odd corner cases, regression tests, and abject abuse and misuse. + +Futextest will also provide example implementation of mutual exclusion +primitives. These can be used as is in user applications or can serve as +examples for system libraries. These will likely be added to either a new lib/ +directory or purely as header files under include/, I'm leaning toward the +latter. + +Quick Start +----------- +# make +# ./run.sh + +Design and Implementation Goals +------------------------------- +o Tests should be as self contained as is practical so as to facilitate sharing + the individual tests on mailing list discussions and bug reports. +o The build system shall remain as simple as possible, avoiding any archive or + shared object building and linking. +o Where possible, any helper functions or other package-wide code shall be + implemented in header files, avoiding the need to compile intermediate object + files. +o External dependendencies shall remain as minimal as possible. Currently gcc + and glibc are the only dependencies. +o Tests return 0 for success and < 0 for failure. + +Output Formatting +----------------- +Test output shall be easily parsable by both human and machine. Title and +results are printed to stdout, while intermediate ERROR or FAIL messages are +sent to stderr. Tests shall support the -c option to print PASS, FAIL, and +ERROR strings in color for easy visual parsing. Output shall conform to the +following format: + +test_name: Description of the test + Arguments: arg1=val1 #units specified for clarity where appropriate + ERROR: Description of unexpected error + FAIL: Reason for test failure + # FIXME: Perhaps an " INFO: informational message" option would be + # useful here. Using -v to toggle it them on and off, as with -c. + # there may be multiple ERROR or FAIL messages +Result: (PASS|FAIL|ERROR) + +Naming +------ +o FIXME: decide on a sane test naming scheme. Currently the tests are named + based on the primary futex operation they test. Eventually this will become a + problem as we intend to write multiple tests which collide in this namespace. + Perhaps something like "wait-wake-1" "wait-wake-2" is adequate, leaving the + detailed description in the test source and the output. + +Coding Style +------------ +o The Futex Test project adheres to the coding standards set forth by Linux + kernel as defined in the Linux source Documentation/CodingStyle. diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile new file mode 100644 index 0000000..4098340 --- /dev/null +++ b/tools/testing/selftests/futex/functional/Makefile @@ -0,0 +1,24 @@ +INCLUDES := -I../include +CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) +LDFLAGS := $(LDFLAGS) -lpthread -lrt + +HEADERS := ../include/futextest.h +TARGETS := \ + futex_wait_timeout \ + futex_wait_wouldblock \ + futex_requeue_pi \ + futex_requeue_pi_signal_restart \ + futex_requeue_pi_mismatched_ops \ + futex_wait_uninitialized_heap \ + futex_wait_private_mapped_file + +.PHONY: all clean +all: $(TARGETS) + +$(TARGETS): $(HEADERS) + +run_tests: all + ./run.sh + +clean: + rm -f $(TARGETS) diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi.c b/tools/testing/selftests/futex/functional/futex_requeue_pi.c new file mode 100644 index 0000000..3da06ad --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi.c @@ -0,0 +1,409 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2006-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * This test excercises the futex syscall op codes needed for requeuing + * priority inheritance aware POSIX condition variables and mutexes. + * + * AUTHORS + * Sripathi Kodi <sripathik@in.ibm.com> + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2008-Jan-13: Initial version by Sripathi Kodi <sripathik@in.ibm.com> + * 2009-Nov-6: futex test adaptation by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <limits.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <signal.h> +#include <string.h> +#include "atomic.h" +#include "futextest.h" +#include "logging.h" + +#define MAX_WAKE_ITERS 1000 +#define THREAD_MAX 10 +#define SIGNAL_PERIOD_US 100 + +atomic_t waiters_blocked = ATOMIC_INITIALIZER; +atomic_t waiters_woken = ATOMIC_INITIALIZER; + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +futex_t wake_complete = FUTEX_INITIALIZER; + +/* Test option defaults */ +static long timeout_ns; +static int broadcast; +static int owner; +static int locked; + +struct thread_arg { + long id; + struct timespec *timeout; + int lock; + int ret; +}; +#define THREAD_ARG_INITIALIZER { 0, NULL, 0, 0 } + +void usage(char *prog) +{ + printf("Usage: %s\n", prog); + printf(" -b Broadcast wakeup (all waiters)\n"); + printf(" -c Use color\n"); + printf(" -h Display this help message\n"); + printf(" -l Lock the pi futex across requeue\n"); + printf(" -o Use a third party pi futex owner during requeue (cancels -l)\n"); + printf(" -t N Timeout in nanoseconds (default: 0)\n"); + printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n", + VQUIET, VCRITICAL, VINFO); +} + +int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg, + int policy, int prio) +{ + int ret; + struct sched_param schedp; + pthread_attr_t attr; + + pthread_attr_init(&attr); + memset(&schedp, 0, sizeof(schedp)); + + ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + if (ret) { + error("pthread_attr_setinheritsched\n", ret); + return -1; + } + + ret = pthread_attr_setschedpolicy(&attr, policy); + if (ret) { + error("pthread_attr_setschedpolicy\n", ret); + return -1; + } + + schedp.sched_priority = prio; + ret = pthread_attr_setschedparam(&attr, &schedp); + if (ret) { + error("pthread_attr_setschedparam\n", ret); + return -1; + } + + ret = pthread_create(pth, &attr, func, arg); + if (ret) { + error("pthread_create\n", ret); + return -1; + } + return 0; +} + + +void *waiterfn(void *arg) +{ + struct thread_arg *args = (struct thread_arg *)arg; + futex_t old_val; + + info("Waiter %ld: running\n", 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 */ + usleep(1000 * (long)args->id); + + old_val = f1; + atomic_inc(&waiters_blocked); + info("Calling futex_wait_requeue_pi: %p (%u) -> %p\n", + &f1, f1, &f2); + args->ret = futex_wait_requeue_pi(&f1, old_val, &f2, args->timeout, + FUTEX_PRIVATE_FLAG); + + info("waiter %ld woke with %d %s\n", args->id, args->ret, + args->ret < 0 ? strerror(errno) : ""); + atomic_inc(&waiters_woken); + if (args->ret < 0) { + if (args->timeout && errno == ETIMEDOUT) + args->ret = 0; + else { + args->ret = RET_ERROR; + error("futex_wait_requeue_pi\n", errno); + } + futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG); + } + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + info("Waiter %ld: exiting with %d\n", args->id, args->ret); + pthread_exit((void *)&args->ret); +} + +void *broadcast_wakerfn(void *arg) +{ + struct thread_arg *args = (struct thread_arg *)arg; + int nr_requeue = INT_MAX; + int task_count = 0; + futex_t old_val; + int nr_wake = 1; + int i = 0; + + info("Waker: waiting for waiters to block\n"); + while (waiters_blocked.val < THREAD_MAX) + usleep(1000); + usleep(1000); + + info("Waker: Calling broadcast\n"); + if (args->lock) { + info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", 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); + if (args->ret < 0) { + args->ret = RET_ERROR; + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + } else if (++i < MAX_WAKE_ITERS) { + task_count += args->ret; + if (task_count < THREAD_MAX - waiters_woken.val) + goto continue_requeue; + } else { + error("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued\n", + 0, MAX_WAKE_ITERS, task_count, THREAD_MAX); + args->ret = RET_ERROR; + } + + futex_wake(&wake_complete, 1, FUTEX_PRIVATE_FLAG); + + if (args->lock) + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + if (args->ret > 0) + args->ret = task_count; + + info("Waker: exiting with %d\n", args->ret); + pthread_exit((void *)&args->ret); +} + +void *signal_wakerfn(void *arg) +{ + struct thread_arg *args = (struct thread_arg *)arg; + unsigned int old_val; + int nr_requeue = 0; + int task_count = 0; + int nr_wake = 1; + int i = 0; + + info("Waker: waiting for waiters to block\n"); + while (waiters_blocked.val < THREAD_MAX) + usleep(1000); + usleep(1000); + + while (task_count < THREAD_MAX && waiters_woken.val < THREAD_MAX) { + info("task_count: %d, waiters_woken: %d\n", + task_count, waiters_woken.val); + if (args->lock) { + info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", + f2, &f2); + futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG); + } + info("Waker: Calling signal\n"); + /* cond_signal */ + old_val = f1; + args->ret = futex_cmp_requeue_pi(&f1, old_val, &f2, + nr_wake, nr_requeue, + FUTEX_PRIVATE_FLAG); + if (args->ret < 0) + args->ret = -errno; + info("futex: %x\n", f2); + if (args->lock) { + info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", + f2, &f2); + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + } + info("futex: %x\n", f2); + if (args->ret < 0) { + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + args->ret = RET_ERROR; + break; + } + + 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) { + error("max signaling iterations (%d) reached, giving up on pending waiters.\n", + 0, MAX_WAKE_ITERS + THREAD_MAX); + args->ret = RET_ERROR; + break; + } + } + + futex_wake(&wake_complete, 1, FUTEX_PRIVATE_FLAG); + + if (args->ret >= 0) + args->ret = task_count; + + info("Waker: exiting with %d\n", args->ret); + info("Waker: waiters_woken: %d\n", waiters_woken.val); + pthread_exit((void *)&args->ret); +} + +void *third_party_blocker(void *arg) +{ + struct thread_arg *args = (struct thread_arg *)arg; + int ret2 = 0; + + args->ret = futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG); + if (args->ret) + goto out; + args->ret = futex_wait(&wake_complete, wake_complete, NULL, + FUTEX_PRIVATE_FLAG); + ret2 = futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + out: + if (args->ret || ret2) { + error("third_party_blocker() futex error", 0); + args->ret = RET_ERROR; + } + + pthread_exit((void *)&args->ret); +} + +int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns) +{ + void *(*wakerfn)(void *) = signal_wakerfn; + struct thread_arg blocker_arg = THREAD_ARG_INITIALIZER; + struct thread_arg waker_arg = THREAD_ARG_INITIALIZER; + pthread_t waiter[THREAD_MAX], waker, blocker; + struct timespec ts, *tsp = NULL; + struct thread_arg args[THREAD_MAX]; + int *waiter_ret; + int i, ret = RET_PASS; + + if (timeout_ns) { + time_t secs; + + info("timeout_ns = %ld\n", 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; + info("ts.tv_sec = %ld\n", ts.tv_sec); + info("ts.tv_nsec = %ld\n", ts.tv_nsec); + tsp = &ts; + } + + if (broadcast) + wakerfn = broadcast_wakerfn; + + if (third_party_owner) { + if (create_rt_thread(&blocker, third_party_blocker, + (void *)&blocker_arg, SCHED_FIFO, 1)) { + error("Creating third party blocker thread failed\n", + errno); + ret = RET_ERROR; + goto out; + } + } + + atomic_set(&waiters_woken, 0); + for (i = 0; i < THREAD_MAX; i++) { + args[i].id = i; + args[i].timeout = tsp; + info("Starting thread %d\n", i); + if (create_rt_thread(&waiter[i], waiterfn, (void *)&args[i], + SCHED_FIFO, 1)) { + error("Creating waiting thread failed\n", errno); + ret = RET_ERROR; + goto out; + } + } + waker_arg.lock = lock; + if (create_rt_thread(&waker, wakerfn, (void *)&waker_arg, + SCHED_FIFO, 1)) { + error("Creating waker thread failed\n", errno); + ret = RET_ERROR; + goto out; + } + + /* 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); + + if (third_party_owner) + pthread_join(blocker, NULL); + pthread_join(waker, NULL); + +out: + if (!ret) { + if (*waiter_ret) + ret = *waiter_ret; + else if (waker_arg.ret < 0) + ret = waker_arg.ret; + else if (blocker_arg.ret) + ret = blocker_arg.ret; + } + + return ret; +} + +int main(int argc, char *argv[]) +{ + int c, ret; + + while ((c = getopt(argc, argv, "bchlot:v:")) != -1) { + switch (c) { + case 'b': + broadcast = 1; + break; + case 'c': + log_color(1); + break; + case 'h': + usage(basename(argv[0])); + exit(0); + case 'l': + locked = 1; + break; + case 'o': + owner = 1; + locked = 0; + break; + case 't': + timeout_ns = atoi(optarg); + break; + case 'v': + log_verbosity(atoi(optarg)); + break; + default: + usage(basename(argv[0])); + exit(1); + } + } + + printf("%s: Test requeue functionality\n", basename(argv[0])); + printf("\tArguments: broadcast=%d locked=%d owner=%d timeout=%ldns\n", + broadcast, locked, owner, timeout_ns); + + /* + * FIXME: unit_test is obsolete now that we parse options and the + * various style of runs are done by run.sh - simplify the code and move + * unit_test into main() + */ + ret = unit_test(broadcast, locked, owner, timeout_ns); + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c new file mode 100644 index 0000000..d5e4f2c --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c @@ -0,0 +1,135 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * 1. Block a thread using FUTEX_WAIT + * 2. Attempt to use FUTEX_CMP_REQUEUE_PI on the futex from 1. + * 3. The kernel must detect the mismatch and return -EINVAL. + * + * AUTHOR + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2009-Nov-9: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +int child_ret = 0; + +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); +} + +void *blocking_child(void *arg) +{ + child_ret = futex_wait(&f1, f1, NULL, FUTEX_PRIVATE_FLAG); + if (child_ret < 0) { + child_ret = -errno; + error("futex_wait\n", errno); + } + return (void *)&child_ret; +} + +int main(int argc, char *argv[]) +{ + int ret = RET_PASS; + pthread_t child; + int c; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Detect mismatched requeue_pi operations\n", + basename(argv[0])); + + if (pthread_create(&child, NULL, blocking_child, NULL)) { + error("pthread_create\n", errno); + ret = RET_ERROR; + goto out; + } + /* Allow the child to block in the kernel. */ + sleep(1); + + /* + * The kernel should detect the waiter did not setup the + * q->requeue_pi_key and return -EINVAL. If it does not, + * it likely gave the lock to the child, which is now hung + * in the kernel. + */ + ret = futex_cmp_requeue_pi(&f1, f1, &f2, 1, 0, FUTEX_PRIVATE_FLAG); + if (ret < 0) { + if (errno == EINVAL) { + /* + * The kernel correctly detected the mismatched + * requeue_pi target and aborted. Wake the child with + * FUTEX_WAKE. + */ + ret = futex_wake(&f1, 1, FUTEX_PRIVATE_FLAG); + if (ret == 1) { + ret = RET_PASS; + } else if (ret < 0) { + error("futex_wake\n", errno); + ret = RET_ERROR; + } else { + error("futex_wake did not wake the child\n", 0); + ret = RET_ERROR; + } + } else { + error("futex_cmp_requeue_pi\n", errno); + ret = RET_ERROR; + } + } else if (ret > 0) { + fail("futex_cmp_requeue_pi failed to detect the mismatch\n"); + ret = RET_FAIL; + } else { + error("futex_cmp_requeue_pi found no waiters\n", 0); + ret = RET_ERROR; + } + + pthread_join(child, NULL); + + if (!ret) + ret = child_ret; + + out: + /* If the kernel crashes, we shouldn't return at all. */ + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c new file mode 100644 index 0000000..7f0c756 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c @@ -0,0 +1,223 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2006-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * This test exercises the futex_wait_requeue_pi() signal handling both + * before and after the requeue. The first should be restarted by the + * kernel. The latter should return EWOULDBLOCK to the waiter. + * + * AUTHORS + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2008-May-5: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <limits.h> +#include <pthread.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "atomic.h" +#include "futextest.h" +#include "logging.h" + +#define DELAY_US 100 + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +atomic_t requeued = ATOMIC_INITIALIZER; + +int waiter_ret = 0; + +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); +} + +int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg, + int policy, int prio) +{ + struct sched_param schedp; + pthread_attr_t attr; + int ret; + + pthread_attr_init(&attr); + memset(&schedp, 0, sizeof(schedp)); + + ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + if (ret) { + error("pthread_attr_setinheritsched\n", ret); + return -1; + } + + ret = pthread_attr_setschedpolicy(&attr, policy); + if (ret) { + error("pthread_attr_setschedpolicy\n", ret); + return -1; + } + + schedp.sched_priority = prio; + ret = pthread_attr_setschedparam(&attr, &schedp); + if (ret) { + error("pthread_attr_setschedparam\n", ret); + return -1; + } + + ret = pthread_create(pth, &attr, func, arg); + if (ret) { + error("pthread_create\n", ret); + return -1; + } + return 0; +} + +void handle_signal(int signo) +{ + info("signal received %s requeue\n", + requeued.val ? "after" : "prior to"); +} + +void *waiterfn(void *arg) +{ + unsigned int old_val; + int res; + + waiter_ret = RET_PASS; + + info("Waiter running\n"); + info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &f2); + old_val = f1; + res = futex_wait_requeue_pi(&f1, old_val, &(f2), NULL, + FUTEX_PRIVATE_FLAG); + if (!requeued.val || errno != EWOULDBLOCK) { + fail("unexpected return from futex_wait_requeue_pi: %d (%s)\n", + res, strerror(errno)); + info("w2:futex: %x\n", f2); + if (!res) + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + waiter_ret = RET_FAIL; + } + + info("Waiter exiting with %d\n", waiter_ret); + pthread_exit(NULL); +} + + +int main(int argc, char *argv[]) +{ + unsigned int old_val; + struct sigaction sa; + pthread_t waiter; + int c, res, ret = RET_PASS; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Test signal handling during requeue_pi\n", + basename(argv[0])); + printf("\tArguments: <none>\n"); + + sa.sa_handler = handle_signal; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL)) { + error("sigaction\n", errno); + exit(1); + } + + info("m1:f2: %x\n", f2); + info("Creating waiter\n"); + res = create_rt_thread(&waiter, waiterfn, NULL, SCHED_FIFO, 1); + if (res) { + error("Creating waiting thread failed", res); + ret = RET_ERROR; + goto out; + } + + info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &f2); + info("m2:f2: %x\n", f2); + futex_lock_pi(&f2, 0, 0, FUTEX_PRIVATE_FLAG); + info("m3:f2: %x\n", f2); + + while (1) { + /* + * signal the waiter before requeue, waiter should automatically + * restart futex_wait_requeue_pi() in the kernel. Wait for the + * waiter to block on f1 again. + */ + info("Issuing SIGUSR1 to waiter\n"); + pthread_kill(waiter, SIGUSR1); + usleep(DELAY_US); + + info("Requeueing waiter via FUTEX_CMP_REQUEUE_PI\n"); + old_val = f1; + res = futex_cmp_requeue_pi(&f1, old_val, &(f2), 1, 0, + FUTEX_PRIVATE_FLAG); + /* + * If res is non-zero, we either requeued the waiter or hit an + * error, break out and handle it. If it is zero, then the + * signal may have hit before the the waiter was blocked on f1. + * Try again. + */ + if (res > 0) { + atomic_set(&requeued, 1); + break; + } else if (res > 0) { + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + ret = RET_ERROR; + break; + } + } + info("m4:f2: %x\n", f2); + + /* + * Signal the waiter after requeue, waiter should return from + * futex_wait_requeue_pi() with EWOULDBLOCK. Join the thread here so the + * futex_unlock_pi() can't happen before the signal wakeup is detected + * in the kernel. + */ + info("Issuing SIGUSR1 to waiter\n"); + pthread_kill(waiter, SIGUSR1); + info("Waiting for waiter to return\n"); + pthread_join(waiter, NULL); + + info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", f2, &f2); + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + info("m5:f2: %x\n", f2); + + out: + if (ret == RET_PASS && waiter_ret) + ret = waiter_ret; + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c b/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c new file mode 100644 index 0000000..5f687f2 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c @@ -0,0 +1,125 @@ +/****************************************************************************** + * + * Copyright FUJITSU LIMITED 2010 + * Copyright KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Internally, Futex has two handling mode, anon and file. The private file + * mapping is special. At first it behave as file, but after write anything + * it behave as anon. This test is intent to test such case. + * + * AUTHOR + * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + * HISTORY + * 2010-Jan-6: Initial version by KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + *****************************************************************************/ + +#include <stdio.h> +#include <stdlib.h> +#include <syscall.h> +#include <unistd.h> +#include <errno.h> +#include <linux/futex.h> +#include <pthread.h> +#include <libgen.h> +#include <signal.h> + +#include "logging.h" +#include "futextest.h" + +#define PAGE_SZ 4096 + +char pad[PAGE_SZ] = {1}; +futex_t val = 1; +char pad2[PAGE_SZ] = {1}; + +#define WAKE_WAIT_US 3000000 +struct timespec wait_timeout = { .tv_sec = 5, .tv_nsec = 0}; + +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); +} + +void *thr_futex_wait(void *arg) +{ + int ret; + + info("futex wait\n"); + ret = futex_wait(&val, 1, &wait_timeout, 0); + if (ret && errno != EWOULDBLOCK && errno != ETIMEDOUT) { + error("futex error.\n", errno); + print_result(RET_ERROR); + exit(RET_ERROR); + } + + if (ret && errno == ETIMEDOUT) + fail("waiter timedout\n"); + + info("futex_wait: ret = %d, errno = %d\n", ret, errno); + + return NULL; +} + +int main(int argc, char **argv) +{ + pthread_t thr; + int ret = RET_PASS; + int res; + int c; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Test the futex value of private file mappings in FUTEX_WAIT\n", + basename(argv[0])); + + ret = pthread_create(&thr, NULL, thr_futex_wait, NULL); + if (ret < 0) { + fprintf(stderr, "pthread_create error\n"); + ret = RET_ERROR; + goto out; + } + + info("wait a while\n"); + usleep(WAKE_WAIT_US); + val = 2; + res = futex_wake(&val, 1, 0); + info("futex_wake %d\n", res); + if (res != 1) { + fail("FUTEX_WAKE didn't find the waiting thread.\n"); + ret = RET_FAIL; + } + + info("join\n"); + pthread_join(thr, NULL); + + out: + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c new file mode 100644 index 0000000..ab428ca --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c @@ -0,0 +1,86 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Block on a futex and wait for timeout. + * + * AUTHOR + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +static long timeout_ns = 100000; /* 100us default timeout */ + +void usage(char *prog) +{ + printf("Usage: %s\n", prog); + printf(" -c Use color\n"); + printf(" -h Display this help message\n"); + printf(" -t N Timeout in nanoseconds (default: 100,000)\n"); + printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n", + VQUIET, VCRITICAL, VINFO); +} + +int main(int argc, char *argv[]) +{ + futex_t f1 = FUTEX_INITIALIZER; + struct timespec to; + int res, ret = RET_PASS; + int c; + + 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 't': + timeout_ns = atoi(optarg); + break; + case 'v': + log_verbosity(atoi(optarg)); + break; + default: + usage(basename(argv[0])); + exit(1); + } + } + + printf("%s: Block on a futex and wait for timeout\n", + basename(argv[0])); + printf("\tArguments: timeout=%ldns\n", timeout_ns); + + /* initialize timeout */ + to.tv_sec = 0; + to.tv_nsec = timeout_ns; + + info("Calling futex_wait on f1: %u @ %p\n", f1, &f1); + res = futex_wait(&f1, f1, &to, FUTEX_PRIVATE_FLAG); + if (!res || errno != ETIMEDOUT) { + fail("futex_wait returned %d\n", ret < 0 ? errno : ret); + ret = RET_FAIL; + } + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c b/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c new file mode 100644 index 0000000..fe7aee9 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c @@ -0,0 +1,124 @@ +/****************************************************************************** + * + * Copyright FUJITSU LIMITED 2010 + * Copyright KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Wait on uninitialized heap. It shold be zero and FUTEX_WAIT should + * return immediately. This test is intent to test zero page handling in + * futex. + * + * AUTHOR + * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + * HISTORY + * 2010-Jan-6: Initial version by KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + *****************************************************************************/ + +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <syscall.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> +#include <linux/futex.h> +#include <libgen.h> + +#include "logging.h" +#include "futextest.h" + +#define WAIT_US 5000000 + +static int child_blocked = 1; +static int child_ret; +void *buf; + +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); +} + +void *wait_thread(void *arg) +{ + int res; + + child_ret = RET_PASS; + res = futex_wait(buf, 1, NULL, 0); + child_blocked = 0; + + if (res != 0 && errno != EWOULDBLOCK) { + error("futex failure\n", errno); + child_ret = RET_ERROR; + } + pthread_exit(NULL); +} + +int main(int argc, char **argv) +{ + int c, ret = RET_PASS; + long page_size; + pthread_t thr; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + page_size = sysconf(_SC_PAGESIZE); + + buf = mmap(NULL, page_size, PROT_READ|PROT_WRITE, + MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); + if (buf == (void *)-1) { + error("mmap\n", errno); + exit(1); + } + + printf("%s: Test the uninitialized futex value in FUTEX_WAIT\n", + basename(argv[0])); + + + ret = pthread_create(&thr, NULL, wait_thread, NULL); + if (ret) { + error("pthread_create\n", errno); + ret = RET_ERROR; + goto out; + } + + info("waiting %dus for child to return\n", WAIT_US); + usleep(WAIT_US); + + ret = child_ret; + if (child_blocked) { + fail("child blocked in kernel\n"); + ret = RET_FAIL; + } + + out: + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c new file mode 100644 index 0000000..b6b0274 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c @@ -0,0 +1,79 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Test if FUTEX_WAIT op returns -EWOULDBLOCK if the futex value differs + * from the expected one. + * + * AUTHOR + * Gowrishankar <gowrishankar.m@in.ibm.com> + * + * HISTORY + * 2009-Nov-14: Initial version by Gowrishankar <gowrishankar.m@in.ibm.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +#define timeout_ns 100000 + +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); +} + +int main(int argc, char *argv[]) +{ + struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns}; + futex_t f1 = FUTEX_INITIALIZER; + int res, ret = RET_PASS; + int c; + + 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); + } + } + + printf("%s: Test the unexpected futex value in FUTEX_WAIT\n", + basename(argv[0])); + + info("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &f1, f1+1); + res = futex_wait(&f1, f1+1, &to, FUTEX_PRIVATE_FLAG); + if (!res || errno != EWOULDBLOCK) { + fail("futex_wait returned: %d %s\n", + res ? errno : res, res ? strerror(errno) : ""); + ret = RET_FAIL; + } + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh new file mode 100755 index 0000000..46827a8 --- /dev/null +++ b/tools/testing/selftests/futex/functional/run.sh @@ -0,0 +1,80 @@ +#!/bin/sh + +############################################################################### +# +# Copyright © International Business Machines Corp., 2009 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DESCRIPTION +# Run tests in the current directory. +# +# AUTHOR +# Darren Hart <dvhart@linux.intel.com> +# +# HISTORY +# 2009-Nov-9: Initial version by Darren Hart <dvhart@linux.intel.com> +# 2010-Jan-6: Add futex_wait_uninitialized_heap and futex_wait_private_mapped_file +# by KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> +# +############################################################################### + +# Test for a color capable console +if [ -z "$USE_COLOR" ]; then + tput setf 7 + if [ $? -eq 0 ]; then + USE_COLOR=1 + tput sgr0 + fi +fi +if [ "$USE_COLOR" -eq 1 ]; then + COLOR="-c" +fi + + +echo +# requeue pi testing +# without timeouts +./futex_requeue_pi $COLOR +./futex_requeue_pi $COLOR -b +./futex_requeue_pi $COLOR -b -l +./futex_requeue_pi $COLOR -b -o +./futex_requeue_pi $COLOR -l +./futex_requeue_pi $COLOR -o +# with timeouts +./futex_requeue_pi $COLOR -b -l -t 5000 +./futex_requeue_pi $COLOR -l -t 5000 +./futex_requeue_pi $COLOR -b -l -t 500000 +./futex_requeue_pi $COLOR -l -t 500000 +./futex_requeue_pi $COLOR -b -t 5000 +./futex_requeue_pi $COLOR -t 5000 +./futex_requeue_pi $COLOR -b -t 500000 +./futex_requeue_pi $COLOR -t 500000 +./futex_requeue_pi $COLOR -b -o -t 5000 +./futex_requeue_pi $COLOR -l -t 5000 +./futex_requeue_pi $COLOR -b -o -t 500000 +./futex_requeue_pi $COLOR -l -t 500000 +# with long timeout +./futex_requeue_pi $COLOR -b -l -t 2000000000 +./futex_requeue_pi $COLOR -l -t 2000000000 + + +echo +./futex_requeue_pi_mismatched_ops $COLOR + +echo +./futex_requeue_pi_signal_restart $COLOR + +echo +./futex_wait_timeout $COLOR + +echo +./futex_wait_wouldblock $COLOR + +echo +./futex_wait_uninitialized_heap $COLOR +./futex_wait_private_mapped_file $COLOR + diff --git a/tools/testing/selftests/futex/include/atomic.h b/tools/testing/selftests/futex/include/atomic.h new file mode 100644 index 0000000..f861da3 --- /dev/null +++ b/tools/testing/selftests/futex/include/atomic.h @@ -0,0 +1,83 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * GCC atomic builtin wrappers + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * + * AUTHOR + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2009-Nov-17: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#ifndef _ATOMIC_H +#define _ATOMIC_H + +typedef struct { + volatile int val; +} atomic_t; + +#define ATOMIC_INITIALIZER { 0 } + +/** + * atomic_cmpxchg() - Atomic compare and exchange + * @uaddr: The address of the futex to be modified + * @oldval: The expected value of the futex + * @newval: The new value to try and assign the futex + * + * Return the old value of addr->val. + */ +static inline int +atomic_cmpxchg(atomic_t *addr, int oldval, int newval) +{ + return __sync_val_compare_and_swap(&addr->val, oldval, newval); +} + +/** + * atomic_inc() - Atomic incrememnt + * @addr: Address of the variable to increment + * + * Return the new value of addr->val. + */ +static inline int +atomic_inc(atomic_t *addr) +{ + return __sync_add_and_fetch(&addr->val, 1); +} + +/** + * atomic_dec() - Atomic decrement + * @addr: Address of the variable to decrement + * + * Return the new value of addr-val. + */ +static inline int +atomic_dec(atomic_t *addr) +{ + return __sync_sub_and_fetch(&addr->val, 1); +} + +/** + * atomic_set() - Atomic set + * @addr: Address of the variable to set + * @newval: New value for the atomic_t + * + * Return the new value of addr->val. + */ +static inline int +atomic_set(atomic_t *addr, int newval) +{ + addr->val = newval; + return newval; +} + +#endif diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h new file mode 100644 index 0000000..b98c3ab --- /dev/null +++ b/tools/testing/selftests/futex/include/futextest.h @@ -0,0 +1,266 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Glibc independent futex library for testing kernel functionality. + * + * AUTHOR + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#ifndef _FUTEXTEST_H +#define _FUTEXTEST_H + +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <linux/futex.h> + +typedef volatile u_int32_t futex_t; +#define FUTEX_INITIALIZER 0 + +/* Define the newer op codes if the system header file is not up to date. */ +#ifndef FUTEX_WAIT_BITSET +#define FUTEX_WAIT_BITSET 9 +#endif +#ifndef FUTEX_WAKE_BITSET +#define FUTEX_WAKE_BITSET 10 +#endif +#ifndef FUTEX_WAIT_REQUEUE_PI +#define FUTEX_WAIT_REQUEUE_PI 11 +#endif +#ifndef FUTEX_CMP_REQUEUE_PI +#define FUTEX_CMP_REQUEUE_PI 12 +#endif +#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE +#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ + FUTEX_PRIVATE_FLAG) +#endif +#ifndef FUTEX_REQUEUE_PI_PRIVATE +#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ + FUTEX_PRIVATE_FLAG) +#endif + +/** + * futex() - SYS_futex syscall wrapper + * @uaddr: address of first futex + * @op: futex op code + * @val: typically expected value of uaddr, but varies by op + * @timeout: typically an absolute struct timespec (except where noted + * otherwise). Overloaded by some ops + * @uaddr2: address of second futex for some ops\ + * @val3: varies by op + * @opflags: flags to be bitwise OR'd with op, such as FUTEX_PRIVATE_FLAG + * + * futex() is used by all the following futex op wrappers. It can also be + * used for misuse and abuse testing. Generally, the specific op wrappers + * should be used instead. It is a macro instead of an static inline function as + * some of the types over overloaded (timeout is used for nr_requeue for + * example). + * + * These argument descriptions are the defaults for all + * like-named arguments in the following wrappers except where noted below. + */ +#define futex(uaddr, op, val, timeout, uaddr2, val3, opflags) \ + syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3) + +/** + * futex_wait() - block on uaddr with optional timeout + * @timeout: relative timeout + */ +static inline int +futex_wait(futex_t *uaddr, futex_t val, struct timespec *timeout, int opflags) +{ + return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags); +} + +/** + * futex_wake() - wake one or more tasks blocked on uaddr + * @nr_wake: wake up to this many tasks + */ +static inline int +futex_wake(futex_t *uaddr, int nr_wake, int opflags) +{ + return futex(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags); +} + +/** + * futex_wait_bitset() - block on uaddr with bitset + * @bitset: bitset to be used with futex_wake_bitset + */ +static inline int +futex_wait_bitset(futex_t *uaddr, futex_t val, struct timespec *timeout, + u_int32_t bitset, int opflags) +{ + return futex(uaddr, FUTEX_WAIT_BITSET, val, timeout, NULL, bitset, + opflags); +} + +/** + * futex_wake_bitset() - wake one or more tasks blocked on uaddr with bitset + * @bitset: bitset to compare with that used in futex_wait_bitset + */ +static inline int +futex_wake_bitset(futex_t *uaddr, int nr_wake, u_int32_t bitset, int opflags) +{ + return futex(uaddr, FUTEX_WAKE_BITSET, nr_wake, NULL, NULL, bitset, + opflags); +} + +/** + * futex_lock_pi() - block on uaddr as a PI mutex + * @detect: whether (1) or not (0) to perform deadlock detection + */ +static inline int +futex_lock_pi(futex_t *uaddr, struct timespec *timeout, int detect, + int opflags) +{ + return futex(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, opflags); +} + +/** + * futex_unlock_pi() - release uaddr as a PI mutex, waking the top waiter + */ +static inline int +futex_unlock_pi(futex_t *uaddr, int opflags) +{ + return futex(uaddr, FUTEX_UNLOCK_PI, 0, NULL, NULL, 0, opflags); +} + +/** + * futex_wake_op() - FIXME: COME UP WITH A GOOD ONE LINE DESCRIPTION + */ +static inline int +futex_wake_op(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_wake2, + int wake_op, int opflags) +{ + return futex(uaddr, FUTEX_WAKE_OP, nr_wake, nr_wake2, uaddr2, wake_op, + opflags); +} + +/** + * futex_requeue() - requeue without expected value comparison, deprecated + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + * + * Due to its inherently racy implementation, futex_requeue() is deprecated in + * favor of futex_cmp_requeue(). + */ +static inline int +futex_requeue(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_requeue, + int opflags) +{ + return futex(uaddr, FUTEX_REQUEUE, nr_wake, nr_requeue, uaddr2, 0, + opflags); +} + +/** + * futex_cmp_requeue() - requeue tasks from uaddr to uaddr2 + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + */ +static inline int +futex_cmp_requeue(futex_t *uaddr, futex_t val, futex_t *uaddr2, int nr_wake, + int nr_requeue, int opflags) +{ + return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2, + val, opflags); +} + +/** + * futex_wait_requeue_pi() - block on uaddr and prepare to requeue to uaddr2 + * @uaddr: non-PI futex source + * @uaddr2: PI futex target + * + * This is the first half of the requeue_pi mechanism. It shall always be + * paired with futex_cmp_requeue_pi(). + */ +static inline int +futex_wait_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, + struct timespec *timeout, int opflags) +{ + return futex(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2, 0, + opflags); +} + +/** + * futex_cmp_requeue_pi() - requeue tasks from uaddr to uaddr2 (PI aware) + * @uaddr: non-PI futex source + * @uaddr2: PI futex target + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + */ +static inline int +futex_cmp_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, int nr_wake, + int nr_requeue, int opflags) +{ + return futex(uaddr, FUTEX_CMP_REQUEUE_PI, nr_wake, nr_requeue, uaddr2, + val, opflags); +} + +/** + * futex_cmpxchg() - atomic compare and exchange + * @uaddr: The address of the futex to be modified + * @oldval: The expected value of the futex + * @newval: The new value to try and assign the futex + * + * Implement cmpxchg using gcc atomic builtins. + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * + * Return the old futex value. + */ +static inline u_int32_t +futex_cmpxchg(futex_t *uaddr, u_int32_t oldval, u_int32_t newval) +{ + return __sync_val_compare_and_swap(uaddr, oldval, newval); +} + +/** + * futex_dec() - atomic decrement of the futex value + * @uaddr: The address of the futex to be modified + * + * Return the new futex value. + */ +static inline u_int32_t +futex_dec(futex_t *uaddr) +{ + return __sync_sub_and_fetch(uaddr, 1); +} + +/** + * futex_inc() - atomic increment of the futex value + * @uaddr: the address of the futex to be modified + * + * Return the new futex value. + */ +static inline u_int32_t +futex_inc(futex_t *uaddr) +{ + return __sync_add_and_fetch(uaddr, 1); +} + +/** + * futex_set() - atomic decrement of the futex value + * @uaddr: the address of the futex to be modified + * @newval: New value for the atomic_t + * + * Return the new futex value. + */ +static inline u_int32_t +futex_set(futex_t *uaddr, u_int32_t newval) +{ + *uaddr = newval; + return newval; +} + +#endif diff --git a/tools/testing/selftests/futex/include/logging.h b/tools/testing/selftests/futex/include/logging.h new file mode 100644 index 0000000..f6ed5c2 --- /dev/null +++ b/tools/testing/selftests/futex/include/logging.h @@ -0,0 +1,150 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Glibc independent futex library for testing kernel functionality. + * + * AUTHOR + * Darren Hart <dvhart@linux.intel.com> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#ifndef _LOGGING_H +#define _LOGGING_H + +#include <string.h> +#include <unistd.h> +#include <linux/futex.h> + +/* + * Define PASS, ERROR, and FAIL strings with and without color escape + * sequences, default to no color. + */ +#define ESC 0x1B, '[' +#define BRIGHT '1' +#define GREEN '3', '2' +#define YELLOW '3', '3' +#define RED '3', '1' +#define ESCEND 'm' +#define BRIGHT_GREEN ESC, BRIGHT, ';', GREEN, ESCEND +#define BRIGHT_YELLOW ESC, BRIGHT, ';', YELLOW, ESCEND +#define BRIGHT_RED ESC, BRIGHT, ';', RED, ESCEND +#define RESET_COLOR ESC, '0', 'm' +static const char PASS_COLOR[] = {BRIGHT_GREEN, ' ', 'P', 'A', 'S', 'S', + RESET_COLOR, 0}; +static const char ERROR_COLOR[] = {BRIGHT_YELLOW, 'E', 'R', 'R', 'O', 'R', + RESET_COLOR, 0}; +static const char FAIL_COLOR[] = {BRIGHT_RED, ' ', 'F', 'A', 'I', 'L', + RESET_COLOR, 0}; +static const char INFO_NORMAL[] = " INFO"; +static const char PASS_NORMAL[] = " PASS"; +static const char ERROR_NORMAL[] = "ERROR"; +static const char FAIL_NORMAL[] = " FAIL"; +const char *INFO = INFO_NORMAL; +const char *PASS = PASS_NORMAL; +const char *ERROR = ERROR_NORMAL; +const char *FAIL = FAIL_NORMAL; + +/* Verbosity setting for INFO messages */ +#define VQUIET 0 +#define VCRITICAL 1 +#define VINFO 2 +#define VMAX VINFO +int _verbose = VCRITICAL; + +/* Functional test return codes */ +#define RET_PASS 0 +#define RET_ERROR -1 +#define RET_FAIL -2 + +/** + * log_color() - Use colored output for PASS, ERROR, and FAIL strings + * @use_color: use color (1) or not (0) + */ +void log_color(int use_color) +{ + if (use_color) { + PASS = PASS_COLOR; + ERROR = ERROR_COLOR; + FAIL = FAIL_COLOR; + } else { + PASS = PASS_NORMAL; + ERROR = ERROR_NORMAL; + FAIL = FAIL_NORMAL; + } +} + +/** + * log_verbosity() - Set verbosity of test output + * @verbose: Enable (1) verbose output or not (0) + * + * Currently setting verbose=1 will enable INFO messages and 0 will disable + * them. FAIL and ERROR messages are always displayed. + */ +void log_verbosity(int level) +{ + if (level > VMAX) + level = VMAX; + else if (level < 0) + level = 0; + _verbose = level; +} + +/** + * print_result() - Print standard PASS | ERROR | FAIL results + * @ret: the return value to be considered: 0 | RET_ERROR | RET_FAIL + * + * print_result() is primarily intended for functional tests. + */ +void print_result(int ret) +{ + const char *result = "Unknown return code"; + + switch (ret) { + case RET_PASS: + result = PASS; + break; + case RET_ERROR: + result = ERROR; + break; + case RET_FAIL: + result = FAIL; + break; + } + printf("Result: %s\n", result); +} + +/* log level macros */ +#define info(message, vargs...) \ +do { \ + if (_verbose >= VINFO) \ + fprintf(stderr, "\t%s: "message, INFO, ##vargs); \ +} while (0) + +#define error(message, err, args...) \ +do { \ + if (_verbose >= VCRITICAL) {\ + if (err) \ + fprintf(stderr, "\t%s: %s: "message, \ + ERROR, strerror(err), ##args); \ + else \ + fprintf(stderr, "\t%s: "message, ERROR, ##args); \ + } \ +} while (0) + +#define fail(message, args...) \ +do { \ + if (_verbose >= VCRITICAL) \ + fprintf(stderr, "\t%s: "message, FAIL, ##args); \ +} while (0) + +#endif diff --git a/tools/testing/selftests/futex/run.sh b/tools/testing/selftests/futex/run.sh new file mode 100755 index 0000000..4126312 --- /dev/null +++ b/tools/testing/selftests/futex/run.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +############################################################################### +# +# Copyright © International Business Machines Corp., 2009 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DESCRIPTION +# Run all tests under the functional, performance, and stress directories. +# Format and summarize the results. +# +# AUTHOR +# Darren Hart <dvhart@linux.intel.com> +# +# HISTORY +# 2009-Nov-9: Initial version by Darren Hart <dvhart@linux.intel.com> +# +############################################################################### + +# Test for a color capable shell and pass the result to the subdir scripts +USE_COLOR=0 +tput setf 7 +if [ $? -eq 0 ]; then + USE_COLOR=1 + tput sgr0 +fi +export USE_COLOR + +(cd functional; ./run.sh) -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <cover.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
[parent not found: <57d921b1c30e8258ca4b2f55637424527317e92f.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk [not found] ` <57d921b1c30e8258ca4b2f55637424527317e92f.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-08 22:09 ` Darren Hart 2015-05-08 22:09 ` [PATCH 4/5] selftest: Add futex tests to the top-level Makefile Darren Hart 2015-05-08 22:09 ` [PATCH 5/5] kselftest: Add exit code defines Darren Hart 2 siblings, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Adapt the futextest Makefiles to use lib.mk macros for RUN_TESTS and EMIT_TESTS. For now, we reuse the run.sh mechanism provided by futextest. This doesn't provide the standard selftests: [PASS|FAIL] format, but the tests provide very similar output already. This results in the run_kselftest.sh script for futexes including a single line: ./run.sh Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- tools/testing/selftests/futex/Makefile | 20 +++++++++++++++++++- tools/testing/selftests/futex/functional/Makefile | 5 +++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile index 2c26d59..6a17529 100644 --- a/tools/testing/selftests/futex/Makefile +++ b/tools/testing/selftests/futex/Makefile @@ -1,11 +1,29 @@ SUBDIRS := functional +TEST_PROGS := run.sh + .PHONY: all clean all: for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done -run_tests: all +include ../lib.mk + +override define RUN_TESTS ./run.sh +endef + +override define INSTALL_RULE + mkdir -p $(INSTALL_PATH) + install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) + + @for SUBDIR in $(SUBDIRS); do \ + $(MAKE) -C $$SUBDIR INSTALL_PATH=$(INSTALL_PATH)/$$SUBDIR install; \ + done; +endef + +override define EMIT_TESTS + echo "./run.sh" +endef clean: for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index 4098340..fb96927 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -12,13 +12,14 @@ TARGETS := \ futex_wait_uninitialized_heap \ futex_wait_private_mapped_file +TEST_PROGS := $(TARGETS) run.sh + .PHONY: all clean all: $(TARGETS) $(TARGETS): $(HEADERS) -run_tests: all - ./run.sh +include ../../lib.mk clean: rm -f $(TARGETS) -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 4/5] selftest: Add futex tests to the top-level Makefile [not found] ` <57d921b1c30e8258ca4b2f55637424527317e92f.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2015-05-08 22:09 ` [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk Darren Hart @ 2015-05-08 22:09 ` Darren Hart 2015-05-08 22:09 ` [PATCH 5/5] kselftest: Add exit code defines Darren Hart 2 siblings, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Enable futex tests to be built and run with the make kselftest and associated targets. Most of the tests require escalated privileges. These return ERROR, and run.sh continues. Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- tools/testing/selftests/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 95abddc..ebac6b8 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -4,6 +4,7 @@ TARGETS += efivarfs TARGETS += exec TARGETS += firmware TARGETS += ftrace +TARGETS += futex TARGETS += kcmp TARGETS += memfd TARGETS += memory-hotplug -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* [PATCH 5/5] kselftest: Add exit code defines [not found] ` <57d921b1c30e8258ca4b2f55637424527317e92f.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2015-05-08 22:09 ` [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk Darren Hart 2015-05-08 22:09 ` [PATCH 4/5] selftest: Add futex tests to the top-level Makefile Darren Hart @ 2015-05-08 22:09 ` Darren Hart 2 siblings, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Define the exit codes with KSFT_PASS and similar so tests can use these directly if they choose. Also enable harnesses and other tooling to use the defines instead of hardcoding the return codes. Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- tools/testing/selftests/kselftest.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index 572c888..ef1c80d 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -13,6 +13,13 @@ #include <stdlib.h> #include <unistd.h> +/* define kselftest exit codes */ +#define KSFT_PASS 0 +#define KSFT_FAIL 1 +#define KSFT_XFAIL 2 +#define KSFT_XPASS 3 +#define KSFT_SKIP 4 + /* counters */ struct ksft_count { unsigned int ksft_pass; @@ -40,23 +47,23 @@ static inline void ksft_print_cnts(void) static inline int ksft_exit_pass(void) { - exit(0); + exit(KSFT_PASS); } static inline int ksft_exit_fail(void) { - exit(1); + exit(KSFT_FAIL); } static inline int ksft_exit_xfail(void) { - exit(2); + exit(KSFT_XFAIL); } static inline int ksft_exit_xpass(void) { - exit(3); + exit(KSFT_XPASS); } static inline int ksft_exit_skip(void) { - exit(4); + exit(KSFT_SKIP); } #endif /* __KSELFTEST_H */ -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-08 22:09 ` [PATCH 1/5] selftests: " Darren Hart [not found] ` <cover.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-11 18:06 ` Shuah Khan 2015-05-11 18:22 ` Darren Hart 1 sibling, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-11 18:06 UTC (permalink / raw) To: Darren Hart, linux-api, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/08/2015 04:09 PM, Darren Hart wrote: > The futextest testsuite [1] provides functional, stress, and > performance tests for the various futex op codes. Those tests will be of > more use to futex developers if they are included with the kernel > source. > > Copy the core infrastructure and the functional tests into selftests, > but adapt them for inclusion in the kernel: > > - Update the Makefile to include the run_tests target, remove reference > to the performance and stress tests from the contributed sources. > - Replace my dead IBM email address with my current Intel email address. > - Remove the warrantee and write-to paragraphs from the license blurbs. > - Remove the NAME section as the filename is easily determined. ;-) > - Make the whitespace usage consistent in a couple of places. > - Cleanup various CodingStyle violations. > > A future effort will explore moving the performance and stress tests > into the kernel. > > 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git > > Cc: Shuah Khan <shuahkh@osg.samsung.com> > Cc: linux-api@vger.kernel.org > Cc: Ingo Molnar <mingo@elte.hu> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Davidlohr Bueso <dave@stgolabs.net> > Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > --- Daren, I am seeing fatal: cannot convert from y to UTF-8 when I try to apply the patch. Did you use git send-email? -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-11 18:06 ` [PATCH 1/5] selftests: Add futex functional tests Shuah Khan @ 2015-05-11 18:22 ` Darren Hart 2015-05-11 18:55 ` Shuah Khan 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-11 18:22 UTC (permalink / raw) To: Shuah Khan, linux-api, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh@osg.samsung.com> wrote: >On 05/08/2015 04:09 PM, Darren Hart wrote: >> The futextest testsuite [1] provides functional, stress, and >> performance tests for the various futex op codes. Those tests will be of >> more use to futex developers if they are included with the kernel >> source. >> >> Copy the core infrastructure and the functional tests into selftests, >> but adapt them for inclusion in the kernel: >> >> - Update the Makefile to include the run_tests target, remove reference >> to the performance and stress tests from the contributed sources. >> - Replace my dead IBM email address with my current Intel email address. >> - Remove the warrantee and write-to paragraphs from the license blurbs. >> - Remove the NAME section as the filename is easily determined. ;-) >> - Make the whitespace usage consistent in a couple of places. >> - Cleanup various CodingStyle violations. >> >> A future effort will explore moving the performance and stress tests >> into the kernel. >> >> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >> >> Cc: Shuah Khan <shuahkh@osg.samsung.com> >> Cc: linux-api@vger.kernel.org >> Cc: Ingo Molnar <mingo@elte.hu> >> Cc: Peter Zijlstra <peterz@infradead.org> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Davidlohr Bueso <dave@stgolabs.net> >> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> >> Signed-off-by: Darren Hart <dvhart@linux.intel.com> >> --- > >Daren, > >I am seeing > >fatal: cannot convert from y to UTF-8 > >when I try to apply the patch. Did you use git send-email? Hi Shuah, I've seen that from one of my contributors earlier this month as well. I dropped the Content... Header and it applied without problems. I created the patch using git format-patch and then sent them using git send-email - via a script I've been using for years now... Checking the files locally: $ file * 0000-cover-letter.patch: ASCII text 0001-selftests-Add-futex-functional-tests.patch: unified diff output, UTF-8 Unicode text 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: unified diff output, ASCII text 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: unified diff output, ASCII text 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: unified diff output, ASCII text 0005-kselftest-Add-exit-code-defines.patch: unified diff output, ASCII text This shows that only the first in UTF-8 and the rest are ASCII. I presume this is due to the Copyright notices in the original files: Copyright © International Business Machines Corp., 2006-2008 Which use © instead of (C). I just checked and there are 545 instances of © in the kernel itself, so this should not present a problem. I apologize for the glitch in applying. If you use the pull request I included that will avoid the mail transport issues, and I will be sure to fix my scripts to avoid the issue in the future. If you want to use the patches directly, please have a look at 1 of 5 and just remove the "Content..." header, and I think you'll find "git am" will apply it without complaint. Thanks, -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-11 18:22 ` Darren Hart @ 2015-05-11 18:55 ` Shuah Khan [not found] ` <5550FB2C.1000403-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-11 18:55 UTC (permalink / raw) To: Darren Hart, linux-api, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/11/2015 12:22 PM, Darren Hart wrote: > On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh@osg.samsung.com> wrote: > >> On 05/08/2015 04:09 PM, Darren Hart wrote: >>> The futextest testsuite [1] provides functional, stress, and >>> performance tests for the various futex op codes. Those tests will be of >>> more use to futex developers if they are included with the kernel >>> source. >>> >>> Copy the core infrastructure and the functional tests into selftests, >>> but adapt them for inclusion in the kernel: >>> >>> - Update the Makefile to include the run_tests target, remove reference >>> to the performance and stress tests from the contributed sources. >>> - Replace my dead IBM email address with my current Intel email address. >>> - Remove the warrantee and write-to paragraphs from the license blurbs. >>> - Remove the NAME section as the filename is easily determined. ;-) >>> - Make the whitespace usage consistent in a couple of places. >>> - Cleanup various CodingStyle violations. >>> >>> A future effort will explore moving the performance and stress tests >>> into the kernel. >>> >>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>> >>> Cc: Shuah Khan <shuahkh@osg.samsung.com> >>> Cc: linux-api@vger.kernel.org >>> Cc: Ingo Molnar <mingo@elte.hu> >>> Cc: Peter Zijlstra <peterz@infradead.org> >>> Cc: Thomas Gleixner <tglx@linutronix.de> >>> Cc: Davidlohr Bueso <dave@stgolabs.net> >>> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> >>> Signed-off-by: Darren Hart <dvhart@linux.intel.com> >>> --- >> >> Daren, >> >> I am seeing >> >> fatal: cannot convert from y to UTF-8 >> >> when I try to apply the patch. Did you use git send-email? > > Hi Shuah, > > I've seen that from one of my contributors earlier this month as well. I > dropped the Content... Header and it applied without problems. > > I created the patch using git format-patch and then sent them using git > send-email - via a script I've been using for years now... > > Checking the files locally: > $ file * > 0000-cover-letter.patch: ASCII text > 0001-selftests-Add-futex-functional-tests.patch: unified > diff output, UTF-8 Unicode text > 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: unified > diff output, ASCII text > 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: unified > diff output, ASCII text > 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: unified > diff output, ASCII text > 0005-kselftest-Add-exit-code-defines.patch: unified > diff output, ASCII text > > > This shows that only the first in UTF-8 and the rest are ASCII. I presume > this is due to the Copyright notices in the original files: > > Copyright © International Business Machines Corp., 2006-2008 > > Which use © instead of (C). I just checked and there are 545 instances of > © in the kernel itself, so this should not present a problem. > > I apologize for the glitch in applying. If you use the pull request I > included that will avoid the mail transport issues, and I will be sure to > fix my scripts to avoid the issue in the future. > > If you want to use the patches directly, please have a look at 1 of 5 and > just remove the "Content..." header, and I think you'll find "git am" will > apply it without complaint. > Hi Daren, Removing the Content header got me past the utf error. However, git am complains: git am --signoff ../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbox Applying: selftests: Add futex functional tests /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank line at EOF. + warning: 1 line adds whitespace errors. Could you look into these. Rest of the patches applied fine. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <5550FB2C.1000403-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <5550FB2C.1000403-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-11 19:47 ` Darren Hart [not found] ` <D17653E0.CC29F%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-11 19:47 UTC (permalink / raw) To: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/11/15, 11:55 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >On 05/11/2015 12:22 PM, Darren Hart wrote: >> On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >> >>> On 05/08/2015 04:09 PM, Darren Hart wrote: >>>> The futextest testsuite [1] provides functional, stress, and >>>> performance tests for the various futex op codes. Those tests will be >>>>of >>>> more use to futex developers if they are included with the kernel >>>> source. >>>> >>>> Copy the core infrastructure and the functional tests into selftests, >>>> but adapt them for inclusion in the kernel: >>>> >>>> - Update the Makefile to include the run_tests target, remove >>>>reference >>>> to the performance and stress tests from the contributed sources. >>>> - Replace my dead IBM email address with my current Intel email >>>>address. >>>> - Remove the warrantee and write-to paragraphs from the license >>>>blurbs. >>>> - Remove the NAME section as the filename is easily determined. ;-) >>>> - Make the whitespace usage consistent in a couple of places. >>>> - Cleanup various CodingStyle violations. >>>> >>>> A future effort will explore moving the performance and stress tests >>>> into the kernel. >>>> >>>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>>> >>>> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >>>> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >>>> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >>>> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >>>> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >>>> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >>>> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >>>> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >>>> --- >>> >>> Daren, >>> >>> I am seeing >>> >>> fatal: cannot convert from y to UTF-8 >>> >>> when I try to apply the patch. Did you use git send-email? >> >> Hi Shuah, >> >> I've seen that from one of my contributors earlier this month as well. I >> dropped the Content... Header and it applied without problems. >> >> I created the patch using git format-patch and then sent them using git >> send-email - via a script I've been using for years now... >> >> Checking the files locally: >> $ file * >> 0000-cover-letter.patch: ASCII >>text >> 0001-selftests-Add-futex-functional-tests.patch: unified >> diff output, UTF-8 Unicode text >> 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: unified >> diff output, ASCII text >> 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: unified >> diff output, ASCII text >> 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: unified >> diff output, ASCII text >> 0005-kselftest-Add-exit-code-defines.patch: unified >> diff output, ASCII text >> >> >> This shows that only the first in UTF-8 and the rest are ASCII. I >>presume >> this is due to the Copyright notices in the original files: >> >> Copyright © International Business Machines Corp., 2006-2008 >> >> Which use © instead of (C). I just checked and there are 545 instances >>of >> © in the kernel itself, so this should not present a problem. >> >> I apologize for the glitch in applying. If you use the pull request I >> included that will avoid the mail transport issues, and I will be sure >>to >> fix my scripts to avoid the issue in the future. >> >> If you want to use the patches directly, please have a look at 1 of 5 >>and >> just remove the "Content..." header, and I think you'll find "git am" >>will >> apply it without complaint. >> > >Hi Daren, > >Removing the Content header got me past the utf error. However, git am >complains: > >git am --signoff >../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbox >Applying: selftests: Add futex functional tests >/mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank >line at EOF. >+ >warning: 1 line adds whitespace errors. > >Could you look into these. Rest of the patches applied fine. Hi Shuah, This was due to a newline at the end of: tools/testing/selftests/futex/functional/run.sh Which unfortunately checkpatch.pl doesn't catch. My fault for not applying the series from the generated patches first. Sorry for the hassle. I have corrected this in the first patch and pushed v3 of the series to: git://git.infradead.org/users/dvhart/linux.git futextest-v3 $ git diff infradead/futextest-v2 infradead/futextest-v3 diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh index 46827a8..e87dbe2 100755 --- a/tools/testing/selftests/futex/functional/run.sh +++ b/tools/testing/selftests/futex/functional/run.sh @@ -77,4 +77,3 @@ echo echo ./futex_wait_uninitialized_heap $COLOR ./futex_wait_private_mapped_file $COLOR - Is this sufficient or do would you prefer a new pull request? Thanks, -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <D17653E0.CC29F%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D17653E0.CC29F%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-11 20:51 ` Shuah Khan [not found] ` <5551164E.5080409-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-11 20:51 UTC (permalink / raw) To: Darren Hart, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/11/2015 01:47 PM, Darren Hart wrote: > On 5/11/15, 11:55 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: > >> On 05/11/2015 12:22 PM, Darren Hart wrote: >>> On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>> >>>> On 05/08/2015 04:09 PM, Darren Hart wrote: >>>>> The futextest testsuite [1] provides functional, stress, and >>>>> performance tests for the various futex op codes. Those tests will be >>>>> of >>>>> more use to futex developers if they are included with the kernel >>>>> source. >>>>> >>>>> Copy the core infrastructure and the functional tests into selftests, >>>>> but adapt them for inclusion in the kernel: >>>>> >>>>> - Update the Makefile to include the run_tests target, remove >>>>> reference >>>>> to the performance and stress tests from the contributed sources. >>>>> - Replace my dead IBM email address with my current Intel email >>>>> address. >>>>> - Remove the warrantee and write-to paragraphs from the license >>>>> blurbs. >>>>> - Remove the NAME section as the filename is easily determined. ;-) >>>>> - Make the whitespace usage consistent in a couple of places. >>>>> - Cleanup various CodingStyle violations. >>>>> >>>>> A future effort will explore moving the performance and stress tests >>>>> into the kernel. >>>>> >>>>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>>>> >>>>> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >>>>> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >>>>> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >>>>> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >>>>> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >>>>> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >>>>> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >>>>> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >>>>> --- >>>> >>>> Daren, >>>> >>>> I am seeing >>>> >>>> fatal: cannot convert from y to UTF-8 >>>> >>>> when I try to apply the patch. Did you use git send-email? >>> >>> Hi Shuah, >>> >>> I've seen that from one of my contributors earlier this month as well. I >>> dropped the Content... Header and it applied without problems. >>> >>> I created the patch using git format-patch and then sent them using git >>> send-email - via a script I've been using for years now... >>> >>> Checking the files locally: >>> $ file * >>> 0000-cover-letter.patch: ASCII >>> text >>> 0001-selftests-Add-futex-functional-tests.patch: unified >>> diff output, UTF-8 Unicode text >>> 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: unified >>> diff output, ASCII text >>> 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: unified >>> diff output, ASCII text >>> 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: unified >>> diff output, ASCII text >>> 0005-kselftest-Add-exit-code-defines.patch: unified >>> diff output, ASCII text >>> >>> >>> This shows that only the first in UTF-8 and the rest are ASCII. I >>> presume >>> this is due to the Copyright notices in the original files: >>> >>> Copyright © International Business Machines Corp., 2006-2008 >>> >>> Which use © instead of (C). I just checked and there are 545 instances >>> of >>> © in the kernel itself, so this should not present a problem. >>> >>> I apologize for the glitch in applying. If you use the pull request I >>> included that will avoid the mail transport issues, and I will be sure >>> to >>> fix my scripts to avoid the issue in the future. >>> >>> If you want to use the patches directly, please have a look at 1 of 5 >>> and >>> just remove the "Content..." header, and I think you'll find "git am" >>> will >>> apply it without complaint. >>> >> >> Hi Daren, >> >> Removing the Content header got me past the utf error. However, git am >> complains: >> >> git am --signoff >> ../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbox >> Applying: selftests: Add futex functional tests >> /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank >> line at EOF. >> + >> warning: 1 line adds whitespace errors. >> >> Could you look into these. Rest of the patches applied fine. > > Hi Shuah, > > This was due to a newline at the end of: > tools/testing/selftests/futex/functional/run.sh > > Which unfortunately checkpatch.pl doesn't catch. My fault for not applying > the series from the generated patches first. Sorry for the hassle. > > I have corrected this in the first patch and pushed v3 of the series to: > > git://git.infradead.org/users/dvhart/linux.git futextest-v3 > > > $ git diff infradead/futextest-v2 infradead/futextest-v3 > diff --git a/tools/testing/selftests/futex/functional/run.sh > b/tools/testing/selftests/futex/functional/run.sh > index 46827a8..e87dbe2 100755 > --- a/tools/testing/selftests/futex/functional/run.sh > +++ b/tools/testing/selftests/futex/functional/run.sh > @@ -77,4 +77,3 @@ echo > echo > ./futex_wait_uninitialized_heap $COLOR > ./futex_wait_private_mapped_file $COLOR > - > > No need for a new pull request. Have you seen these errors before: make[2]: Entering directory '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' for DIR in functional; do make -C $DIR all ; done make[3]: Entering directory '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi /tmp/cc2UgUVs.o: In function `create_rt_thread': /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/futex_requeue_pi.c:102: undefined reference to `pthread_create' /tmp/cc2UgUVs.o: In function `unit_test': /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/futex_requeue_pi.c:342: undefined reference to `pthread_join' /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/futex_requeue_pi.c:347: undefined reference to `pthread_join' /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/futex_requeue_pi.c:346: undefined reference to `pthread_join' collect2: error: ld returned 1 exit status <builtin>: recipe for target 'futex_requeue_pi' failed make[3]: *** [futex_requeue_pi] Error 1 make[3]: Leaving directory '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' Makefile:7: recipe for target 'all' failed I am running make kselftest target when I saw the above build failures. kselftest run doesn't fail which is good, however futex tests won't run with this failure. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <5551164E.5080409-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <5551164E.5080409-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-11 21:50 ` Darren Hart [not found] ` <D17670E1.CC354%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-11 21:50 UTC (permalink / raw) To: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/11/15, 1:51 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >On 05/11/2015 01:47 PM, Darren Hart wrote: >> On 5/11/15, 11:55 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >> >>> On 05/11/2015 12:22 PM, Darren Hart wrote: >>>> On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>>> >>>>> On 05/08/2015 04:09 PM, Darren Hart wrote: >>>>>> The futextest testsuite [1] provides functional, stress, and >>>>>> performance tests for the various futex op codes. Those tests will >>>>>>be >>>>>> of >>>>>> more use to futex developers if they are included with the kernel >>>>>> source. >>>>>> >>>>>> Copy the core infrastructure and the functional tests into >>>>>>selftests, >>>>>> but adapt them for inclusion in the kernel: >>>>>> >>>>>> - Update the Makefile to include the run_tests target, remove >>>>>> reference >>>>>> to the performance and stress tests from the contributed sources. >>>>>> - Replace my dead IBM email address with my current Intel email >>>>>> address. >>>>>> - Remove the warrantee and write-to paragraphs from the license >>>>>> blurbs. >>>>>> - Remove the NAME section as the filename is easily determined. ;-) >>>>>> - Make the whitespace usage consistent in a couple of places. >>>>>> - Cleanup various CodingStyle violations. >>>>>> >>>>>> A future effort will explore moving the performance and stress tests >>>>>> into the kernel. >>>>>> >>>>>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>>>>> >>>>>> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >>>>>> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >>>>>> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >>>>>> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >>>>>> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >>>>>> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >>>>>> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >>>>>> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >>>>>> --- >>>>> >>>>> Daren, >>>>> >>>>> I am seeing >>>>> >>>>> fatal: cannot convert from y to UTF-8 >>>>> >>>>> when I try to apply the patch. Did you use git send-email? >>>> >>>> Hi Shuah, >>>> >>>> I've seen that from one of my contributors earlier this month as >>>>well. I >>>> dropped the Content... Header and it applied without problems. >>>> >>>> I created the patch using git format-patch and then sent them using >>>>git >>>> send-email - via a script I've been using for years now... >>>> >>>> Checking the files locally: >>>> $ file * >>>> 0000-cover-letter.patch: ASCII >>>> text >>>> 0001-selftests-Add-futex-functional-tests.patch: >>>>unified >>>> diff output, UTF-8 Unicode text >>>> 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: >>>>unified >>>> diff output, ASCII text >>>> 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: >>>>unified >>>> diff output, ASCII text >>>> 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: >>>>unified >>>> diff output, ASCII text >>>> 0005-kselftest-Add-exit-code-defines.patch: >>>>unified >>>> diff output, ASCII text >>>> >>>> >>>> This shows that only the first in UTF-8 and the rest are ASCII. I >>>> presume >>>> this is due to the Copyright notices in the original files: >>>> >>>> Copyright © International Business Machines Corp., 2006-2008 >>>> >>>> Which use © instead of (C). I just checked and there are 545 instances >>>> of >>>> © in the kernel itself, so this should not present a problem. >>>> >>>> I apologize for the glitch in applying. If you use the pull request I >>>> included that will avoid the mail transport issues, and I will be sure >>>> to >>>> fix my scripts to avoid the issue in the future. >>>> >>>> If you want to use the patches directly, please have a look at 1 of 5 >>>> and >>>> just remove the "Content..." header, and I think you'll find "git am" >>>> will >>>> apply it without complaint. >>>> >>> >>> Hi Daren, >>> >>> Removing the Content header got me past the utf error. However, git am >>> complains: >>> >>> git am --signoff >>> >>>../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbo >>>x >>> Applying: selftests: Add futex functional tests >>> /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank >>> line at EOF. >>> + >>> warning: 1 line adds whitespace errors. >>> >>> Could you look into these. Rest of the patches applied fine. >> >> Hi Shuah, >> >> This was due to a newline at the end of: >> tools/testing/selftests/futex/functional/run.sh >> >> Which unfortunately checkpatch.pl doesn't catch. My fault for not >>applying >> the series from the generated patches first. Sorry for the hassle. >> >> I have corrected this in the first patch and pushed v3 of the series to: >> >> git://git.infradead.org/users/dvhart/linux.git futextest-v3 >> >> >> $ git diff infradead/futextest-v2 infradead/futextest-v3 >> diff --git a/tools/testing/selftests/futex/functional/run.sh >> b/tools/testing/selftests/futex/functional/run.sh >> index 46827a8..e87dbe2 100755 >> --- a/tools/testing/selftests/futex/functional/run.sh >> +++ b/tools/testing/selftests/futex/functional/run.sh >> @@ -77,4 +77,3 @@ echo >> echo >> ./futex_wait_uninitialized_heap $COLOR >> ./futex_wait_private_mapped_file $COLOR >> - >> >> > >No need for a new pull request. Have you seen these errors before: > >make[2]: Entering directory >'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' >for DIR in functional; do make -C $DIR all ; done >make[3]: Entering directory >'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt >futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi >/tmp/cc2UgUVs.o: In function `create_rt_thread': >/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >tex_requeue_pi.c:102: >undefined reference to `pthread_create' >/tmp/cc2UgUVs.o: In function `unit_test': >/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >tex_requeue_pi.c:342: >undefined reference to `pthread_join' >/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >tex_requeue_pi.c:347: >undefined reference to `pthread_join' >/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >tex_requeue_pi.c:346: >undefined reference to `pthread_join' >collect2: error: ld returned 1 exit status ><builtin>: recipe for target 'futex_requeue_pi' failed >make[3]: *** [futex_requeue_pi] Error 1 >make[3]: Leaving directory >'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >Makefile:7: recipe for target 'all' failed > >I am running make kselftest target when I saw the above build failures. >kselftest run doesn't fail which is good, however futex tests won't >run with this failure. I have not seen these errors whilst developing with futextest for the kernel. That looks like you may be missing the pthread development headers from your build machine. Those are provided by libc6-dev on my Debian systems. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <D17670E1.CC354%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D17670E1.CC354%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-11 22:21 ` Shuah Khan [not found] ` <55512B54.50304-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-11 22:21 UTC (permalink / raw) To: Darren Hart, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/11/2015 03:50 PM, Darren Hart wrote: > On 5/11/15, 1:51 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: > >> On 05/11/2015 01:47 PM, Darren Hart wrote: >>> On 5/11/15, 11:55 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>> >>>> On 05/11/2015 12:22 PM, Darren Hart wrote: >>>>> On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>>>> >>>>>> On 05/08/2015 04:09 PM, Darren Hart wrote: >>>>>>> The futextest testsuite [1] provides functional, stress, and >>>>>>> performance tests for the various futex op codes. Those tests will >>>>>>> be >>>>>>> of >>>>>>> more use to futex developers if they are included with the kernel >>>>>>> source. >>>>>>> >>>>>>> Copy the core infrastructure and the functional tests into >>>>>>> selftests, >>>>>>> but adapt them for inclusion in the kernel: >>>>>>> >>>>>>> - Update the Makefile to include the run_tests target, remove >>>>>>> reference >>>>>>> to the performance and stress tests from the contributed sources. >>>>>>> - Replace my dead IBM email address with my current Intel email >>>>>>> address. >>>>>>> - Remove the warrantee and write-to paragraphs from the license >>>>>>> blurbs. >>>>>>> - Remove the NAME section as the filename is easily determined. ;-) >>>>>>> - Make the whitespace usage consistent in a couple of places. >>>>>>> - Cleanup various CodingStyle violations. >>>>>>> >>>>>>> A future effort will explore moving the performance and stress tests >>>>>>> into the kernel. >>>>>>> >>>>>>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>>>>>> >>>>>>> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >>>>>>> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >>>>>>> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >>>>>>> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >>>>>>> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >>>>>>> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >>>>>>> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >>>>>>> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >>>>>>> --- >>>>>> >>>>>> Daren, >>>>>> >>>>>> I am seeing >>>>>> >>>>>> fatal: cannot convert from y to UTF-8 >>>>>> >>>>>> when I try to apply the patch. Did you use git send-email? >>>>> >>>>> Hi Shuah, >>>>> >>>>> I've seen that from one of my contributors earlier this month as >>>>> well. I >>>>> dropped the Content... Header and it applied without problems. >>>>> >>>>> I created the patch using git format-patch and then sent them using >>>>> git >>>>> send-email - via a script I've been using for years now... >>>>> >>>>> Checking the files locally: >>>>> $ file * >>>>> 0000-cover-letter.patch: ASCII >>>>> text >>>>> 0001-selftests-Add-futex-functional-tests.patch: >>>>> unified >>>>> diff output, UTF-8 Unicode text >>>>> 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: >>>>> unified >>>>> diff output, ASCII text >>>>> 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: >>>>> unified >>>>> diff output, ASCII text >>>>> 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: >>>>> unified >>>>> diff output, ASCII text >>>>> 0005-kselftest-Add-exit-code-defines.patch: >>>>> unified >>>>> diff output, ASCII text >>>>> >>>>> >>>>> This shows that only the first in UTF-8 and the rest are ASCII. I >>>>> presume >>>>> this is due to the Copyright notices in the original files: >>>>> >>>>> Copyright © International Business Machines Corp., 2006-2008 >>>>> >>>>> Which use © instead of (C). I just checked and there are 545 instances >>>>> of >>>>> © in the kernel itself, so this should not present a problem. >>>>> >>>>> I apologize for the glitch in applying. If you use the pull request I >>>>> included that will avoid the mail transport issues, and I will be sure >>>>> to >>>>> fix my scripts to avoid the issue in the future. >>>>> >>>>> If you want to use the patches directly, please have a look at 1 of 5 >>>>> and >>>>> just remove the "Content..." header, and I think you'll find "git am" >>>>> will >>>>> apply it without complaint. >>>>> >>>> >>>> Hi Daren, >>>> >>>> Removing the Content header got me past the utf error. However, git am >>>> complains: >>>> >>>> git am --signoff >>>> >>>> ../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbo >>>> x >>>> Applying: selftests: Add futex functional tests >>>> /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank >>>> line at EOF. >>>> + >>>> warning: 1 line adds whitespace errors. >>>> >>>> Could you look into these. Rest of the patches applied fine. >>> >>> Hi Shuah, >>> >>> This was due to a newline at the end of: >>> tools/testing/selftests/futex/functional/run.sh >>> >>> Which unfortunately checkpatch.pl doesn't catch. My fault for not >>> applying >>> the series from the generated patches first. Sorry for the hassle. >>> >>> I have corrected this in the first patch and pushed v3 of the series to: >>> >>> git://git.infradead.org/users/dvhart/linux.git futextest-v3 >>> >>> >>> $ git diff infradead/futextest-v2 infradead/futextest-v3 >>> diff --git a/tools/testing/selftests/futex/functional/run.sh >>> b/tools/testing/selftests/futex/functional/run.sh >>> index 46827a8..e87dbe2 100755 >>> --- a/tools/testing/selftests/futex/functional/run.sh >>> +++ b/tools/testing/selftests/futex/functional/run.sh >>> @@ -77,4 +77,3 @@ echo >>> echo >>> ./futex_wait_uninitialized_heap $COLOR >>> ./futex_wait_private_mapped_file $COLOR >>> - >>> >>> >> >> No need for a new pull request. Have you seen these errors before: >> >> make[2]: Entering directory >> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' >> for DIR in functional; do make -C $DIR all ; done >> make[3]: Entering directory >> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >> gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt >> futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi >> /tmp/cc2UgUVs.o: In function `create_rt_thread': >> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >> tex_requeue_pi.c:102: >> undefined reference to `pthread_create' >> /tmp/cc2UgUVs.o: In function `unit_test': >> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >> tex_requeue_pi.c:342: >> undefined reference to `pthread_join' >> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >> tex_requeue_pi.c:347: >> undefined reference to `pthread_join' >> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >> tex_requeue_pi.c:346: >> undefined reference to `pthread_join' >> collect2: error: ld returned 1 exit status >> <builtin>: recipe for target 'futex_requeue_pi' failed >> make[3]: *** [futex_requeue_pi] Error 1 >> make[3]: Leaving directory >> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >> Makefile:7: recipe for target 'all' failed >> >> I am running make kselftest target when I saw the above build failures. >> kselftest run doesn't fail which is good, however futex tests won't >> run with this failure. > > I have not seen these errors whilst developing with futextest for the > kernel. That looks like you may be missing the pthread development headers > from your build machine. > > Those are provided by libc6-dev on my Debian systems. > I do have lib6-dev installed. timers uses pthread compiles fine. So does mqueue. I am not sure what is going on with futex tests though. I am guessing it has to do with library link order. The following fixed it for me: -LDFLAGS := $(LDFLAGS) -lpthread -lrt +LDFLAGS := $(LDFLAGS) -pthread -lrt Could you please make this change and resend the patch series. I prefer patch series over pull request. thanks, -- Shuah thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <55512B54.50304-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <55512B54.50304-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-11 22:21 ` Shuah Khan [not found] ` <55512B86.2040900-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-11 22:21 UTC (permalink / raw) To: Darren Hart, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/11/2015 04:21 PM, Shuah Khan wrote: > On 05/11/2015 03:50 PM, Darren Hart wrote: >> On 5/11/15, 1:51 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >> >>> On 05/11/2015 01:47 PM, Darren Hart wrote: >>>> On 5/11/15, 11:55 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>>> >>>>> On 05/11/2015 12:22 PM, Darren Hart wrote: >>>>>> On 5/11/15, 11:06 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>>>>> >>>>>>> On 05/08/2015 04:09 PM, Darren Hart wrote: >>>>>>>> The futextest testsuite [1] provides functional, stress, and >>>>>>>> performance tests for the various futex op codes. Those tests will >>>>>>>> be >>>>>>>> of >>>>>>>> more use to futex developers if they are included with the kernel >>>>>>>> source. >>>>>>>> >>>>>>>> Copy the core infrastructure and the functional tests into >>>>>>>> selftests, >>>>>>>> but adapt them for inclusion in the kernel: >>>>>>>> >>>>>>>> - Update the Makefile to include the run_tests target, remove >>>>>>>> reference >>>>>>>> to the performance and stress tests from the contributed sources. >>>>>>>> - Replace my dead IBM email address with my current Intel email >>>>>>>> address. >>>>>>>> - Remove the warrantee and write-to paragraphs from the license >>>>>>>> blurbs. >>>>>>>> - Remove the NAME section as the filename is easily determined. ;-) >>>>>>>> - Make the whitespace usage consistent in a couple of places. >>>>>>>> - Cleanup various CodingStyle violations. >>>>>>>> >>>>>>>> A future effort will explore moving the performance and stress tests >>>>>>>> into the kernel. >>>>>>>> >>>>>>>> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >>>>>>>> >>>>>>>> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >>>>>>>> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >>>>>>>> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >>>>>>>> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >>>>>>>> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >>>>>>>> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >>>>>>>> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >>>>>>>> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> >>>>>>>> --- >>>>>>> >>>>>>> Daren, >>>>>>> >>>>>>> I am seeing >>>>>>> >>>>>>> fatal: cannot convert from y to UTF-8 >>>>>>> >>>>>>> when I try to apply the patch. Did you use git send-email? >>>>>> >>>>>> Hi Shuah, >>>>>> >>>>>> I've seen that from one of my contributors earlier this month as >>>>>> well. I >>>>>> dropped the Content... Header and it applied without problems. >>>>>> >>>>>> I created the patch using git format-patch and then sent them using >>>>>> git >>>>>> send-email - via a script I've been using for years now... >>>>>> >>>>>> Checking the files locally: >>>>>> $ file * >>>>>> 0000-cover-letter.patch: ASCII >>>>>> text >>>>>> 0001-selftests-Add-futex-functional-tests.patch: >>>>>> unified >>>>>> diff output, UTF-8 Unicode text >>>>>> 0002-selftest-futex-Update-Makefile-to-use-lib.mk.patch: >>>>>> unified >>>>>> diff output, ASCII text >>>>>> 0003-selftest-futex-Increment-ksft-pass-and-fail-counters.patch: >>>>>> unified >>>>>> diff output, ASCII text >>>>>> 0004-selftest-Add-futex-tests-to-the-top-level-Makefile.patch: >>>>>> unified >>>>>> diff output, ASCII text >>>>>> 0005-kselftest-Add-exit-code-defines.patch: >>>>>> unified >>>>>> diff output, ASCII text >>>>>> >>>>>> >>>>>> This shows that only the first in UTF-8 and the rest are ASCII. I >>>>>> presume >>>>>> this is due to the Copyright notices in the original files: >>>>>> >>>>>> Copyright © International Business Machines Corp., 2006-2008 >>>>>> >>>>>> Which use © instead of (C). I just checked and there are 545 instances >>>>>> of >>>>>> © in the kernel itself, so this should not present a problem. >>>>>> >>>>>> I apologize for the glitch in applying. If you use the pull request I >>>>>> included that will avoid the mail transport issues, and I will be sure >>>>>> to >>>>>> fix my scripts to avoid the issue in the future. >>>>>> >>>>>> If you want to use the patches directly, please have a look at 1 of 5 >>>>>> and >>>>>> just remove the "Content..." header, and I think you'll find "git am" >>>>>> will >>>>>> apply it without complaint. >>>>>> >>>>> >>>>> Hi Daren, >>>>> >>>>> Removing the Content header got me past the utf error. However, git am >>>>> complains: >>>>> >>>>> git am --signoff >>>>> >>>>> ../4.2_patches/futex_tests/PATCH_1_5selftestsAddfutexfunctionaltests.mbo >>>>> x >>>>> Applying: selftests: Add futex functional tests >>>>> /mnt/data/lkml/linux-kselftest/.git/rebase-apply/patch:1457: new blank >>>>> line at EOF. >>>>> + >>>>> warning: 1 line adds whitespace errors. >>>>> >>>>> Could you look into these. Rest of the patches applied fine. >>>> >>>> Hi Shuah, >>>> >>>> This was due to a newline at the end of: >>>> tools/testing/selftests/futex/functional/run.sh >>>> >>>> Which unfortunately checkpatch.pl doesn't catch. My fault for not >>>> applying >>>> the series from the generated patches first. Sorry for the hassle. >>>> >>>> I have corrected this in the first patch and pushed v3 of the series to: >>>> >>>> git://git.infradead.org/users/dvhart/linux.git futextest-v3 >>>> >>>> >>>> $ git diff infradead/futextest-v2 infradead/futextest-v3 >>>> diff --git a/tools/testing/selftests/futex/functional/run.sh >>>> b/tools/testing/selftests/futex/functional/run.sh >>>> index 46827a8..e87dbe2 100755 >>>> --- a/tools/testing/selftests/futex/functional/run.sh >>>> +++ b/tools/testing/selftests/futex/functional/run.sh >>>> @@ -77,4 +77,3 @@ echo >>>> echo >>>> ./futex_wait_uninitialized_heap $COLOR >>>> ./futex_wait_private_mapped_file $COLOR >>>> - >>>> >>>> >>> >>> No need for a new pull request. Have you seen these errors before: >>> >>> make[2]: Entering directory >>> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' >>> for DIR in functional; do make -C $DIR all ; done >>> make[3]: Entering directory >>> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >>> gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt >>> futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi >>> /tmp/cc2UgUVs.o: In function `create_rt_thread': >>> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >>> tex_requeue_pi.c:102: >>> undefined reference to `pthread_create' >>> /tmp/cc2UgUVs.o: In function `unit_test': >>> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >>> tex_requeue_pi.c:342: >>> undefined reference to `pthread_join' >>> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >>> tex_requeue_pi.c:347: >>> undefined reference to `pthread_join' >>> /mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional/fu >>> tex_requeue_pi.c:346: >>> undefined reference to `pthread_join' >>> collect2: error: ld returned 1 exit status >>> <builtin>: recipe for target 'futex_requeue_pi' failed >>> make[3]: *** [futex_requeue_pi] Error 1 >>> make[3]: Leaving directory >>> '/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional' >>> Makefile:7: recipe for target 'all' failed >>> >>> I am running make kselftest target when I saw the above build failures. >>> kselftest run doesn't fail which is good, however futex tests won't >>> run with this failure. >> >> I have not seen these errors whilst developing with futextest for the >> kernel. That looks like you may be missing the pthread development headers >> from your build machine. >> >> Those are provided by libc6-dev on my Debian systems. >> > > I do have lib6-dev installed. timers uses pthread compiles fine. > So does mqueue. I am not sure what is going on with futex tests > though. I am guessing it has to do with library link order. > > The following fixed it for me: > > -LDFLAGS := $(LDFLAGS) -lpthread -lrt > +LDFLAGS := $(LDFLAGS) -pthread -lrt > > Could you please make this change and resend the patch series. > I prefer patch series over pull request. > > thanks, > -- Shuah > Sorry full diff: diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index e64d43b..b8a2e9b 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -1,6 +1,6 @@ INCLUDES := -I../include -I../../ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) -LDFLAGS := $(LDFLAGS) -lpthread -lrt +LDFLAGS := $(LDFLAGS) -pthread -lrt -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <55512B86.2040900-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <55512B86.2040900-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-11 23:07 ` Darren Hart [not found] ` <D1767EA1.CC3DA%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-11 23:07 UTC (permalink / raw) To: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz Cc: Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/11/15, 3:21 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >>>>No need for a new pull request. Have you seen these errors before: >>>> >>>>make[2]: Entering directory >>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' >>>>for DIR in functional; do make -C $DIR all ; done >>>>make[3]: Entering directory >>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functiona >>>>l' >>>>gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt >>>>futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi >>>>/tmp/cc2UgUVs.o: In function `create_rt_thread': >>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>/fu >>>>tex_requeue_pi.c:102: >>>>undefined reference to `pthread_create' >>>>/tmp/cc2UgUVs.o: In function `unit_test': >>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>/fu >>>>tex_requeue_pi.c:342: >>>>undefined reference to `pthread_join' >>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>/fu >>>>tex_requeue_pi.c:347: >>>>undefined reference to `pthread_join' >>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>/fu >>>>tex_requeue_pi.c:346: >>>>undefined reference to `pthread_join' >>>>collect2: error: ld returned 1 exit status >>>><builtin>: recipe for target 'futex_requeue_pi' failed >>>>make[3]: *** [futex_requeue_pi] Error 1 >>>>make[3]: Leaving directory >>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functiona >>>>l' >>>>Makefile:7: recipe for target 'all' failed >>>> >>>>I am running make kselftest target when I saw the above build failures. >>>>kselftest run doesn't fail which is good, however futex tests won't >>>>run with this failure. >>> >>>I have not seen these errors whilst developing with futextest for the >>>kernel. That looks like you may be missing the pthread development >>>headers >>>from your build machine. >>> >>>Those are provided by libc6-dev on my Debian systems. >>> >>I do have lib6-dev installed. timers uses pthread compiles fine. >>So does mqueue. I am not sure what is going on with futex tests >>though. I am guessing it has to do with library link order. >>The following fixed it for me: >>-LDFLAGS := $(LDFLAGS) -lpthread -lrt >>+LDFLAGS := $(LDFLAGS) -pthread -lrt >>Could you please make this change and resend the patch series. >>I prefer patch series over pull request. >>thanks, >>-- Shuah > >Sorry full diff: > > >diff --git a/tools/testing/selftests/futex/functional/Makefile >b/tools/testing/selftests/futex/functional/Makefile >index e64d43b..b8a2e9b 100644 >--- a/tools/testing/selftests/futex/functional/Makefile >+++ b/tools/testing/selftests/futex/functional/Makefile >@@ -1,6 +1,6 @@ >INCLUDES := -I../include -I../../ >CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) >-LDFLAGS := $(LDFLAGS) -lpthread -lrt >+LDFLAGS := $(LDFLAGS) -pthread -lrt I'm happy to do that, but I would like to make sure I'm doing the right thing. I'm building with: $ gcc --version gcc (Debian 4.9.2-10) 4.9.2 What's there now works for me: LDFLAGS := $(LDFLAGS) -lpthread -lrt What you propose also works for me: LDFLAGS := $(LDFLAGS) -pthread -lrt I notice that most other test cases list -lrt first, including timers: LDFLAGS += -lrt -lpthread Which works for me for timers - does that work for you? I assume so. It also works for futexes for me. I've found references out there suggesting -lrt should always come before -lpthread. I suspect you are correct as -pthread provides flags for both the preprocessor and the linker, however, I'm still concerned about the ordering. John - did you deliberately choose to use "-lrt -lpthread" ? If ordering matters and -pthread is preferred over -lpthread, then perhaps the "right way" is: LDFLAGS += -lrt -pthread Since -pthread also impacts the pre-processor, it seems that if used, it should be present in both LDFLAGS as well as CFLAGS. However, I've also read that -pthread is a non-standard compiler option and is best avoided. If so, and if the reversed order works for you, "-lrt -lpthread", perhaps that would be the "right fix". I'd like to answer this once and for all for all tests we add to selftest. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <D1767EA1.CC3DA%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D1767EA1.CC3DA%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-11 23:23 ` John Stultz 2015-05-12 10:02 ` Cyril Hrubis 1 sibling, 0 replies; 31+ messages in thread From: John Stultz @ 2015-05-11 23:23 UTC (permalink / raw) To: Darren Hart Cc: Shuah Khan, Linux API, Linux Kernel Mailing List, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On Mon, May 11, 2015 at 4:07 PM, Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> wrote: > On 5/11/15, 3:21 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: > >>>>>No need for a new pull request. Have you seen these errors before: >>>>> >>>>>make[2]: Entering directory >>>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex' >>>>>for DIR in functional; do make -C $DIR all ; done >>>>>make[3]: Entering directory >>>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functiona >>>>>l' >>>>>gcc -g -O2 -Wall -D_GNU_SOURCE -I../include -I../../ -lpthread -lrt >>>>>futex_requeue_pi.c ../include/futextest.h -o futex_requeue_pi >>>>>/tmp/cc2UgUVs.o: In function `create_rt_thread': >>>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>>/fu >>>>>tex_requeue_pi.c:102: >>>>>undefined reference to `pthread_create' >>>>>/tmp/cc2UgUVs.o: In function `unit_test': >>>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>>/fu >>>>>tex_requeue_pi.c:342: >>>>>undefined reference to `pthread_join' >>>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>>/fu >>>>>tex_requeue_pi.c:347: >>>>>undefined reference to `pthread_join' >>>>>/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functional >>>>>/fu >>>>>tex_requeue_pi.c:346: >>>>>undefined reference to `pthread_join' >>>>>collect2: error: ld returned 1 exit status >>>>><builtin>: recipe for target 'futex_requeue_pi' failed >>>>>make[3]: *** [futex_requeue_pi] Error 1 >>>>>make[3]: Leaving directory >>>>>'/mnt/data/lkml/linux-kselftest/tools/testing/selftests/futex/functiona >>>>>l' >>>>>Makefile:7: recipe for target 'all' failed >>>>> >>>>>I am running make kselftest target when I saw the above build failures. >>>>>kselftest run doesn't fail which is good, however futex tests won't >>>>>run with this failure. >>>> >>>>I have not seen these errors whilst developing with futextest for the >>>>kernel. That looks like you may be missing the pthread development >>>>headers >>>>from your build machine. >>>> >>>>Those are provided by libc6-dev on my Debian systems. >>>> >>>I do have lib6-dev installed. timers uses pthread compiles fine. >>>So does mqueue. I am not sure what is going on with futex tests >>>though. I am guessing it has to do with library link order. >>>The following fixed it for me: >>>-LDFLAGS := $(LDFLAGS) -lpthread -lrt >>>+LDFLAGS := $(LDFLAGS) -pthread -lrt >>>Could you please make this change and resend the patch series. >>>I prefer patch series over pull request. >>>thanks, >>>-- Shuah >> >>Sorry full diff: >> >> >>diff --git a/tools/testing/selftests/futex/functional/Makefile >>b/tools/testing/selftests/futex/functional/Makefile >>index e64d43b..b8a2e9b 100644 >>--- a/tools/testing/selftests/futex/functional/Makefile >>+++ b/tools/testing/selftests/futex/functional/Makefile >>@@ -1,6 +1,6 @@ >>INCLUDES := -I../include -I../../ >>CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) >>-LDFLAGS := $(LDFLAGS) -lpthread -lrt >>+LDFLAGS := $(LDFLAGS) -pthread -lrt > > > I'm happy to do that, but I would like to make sure I'm doing the right > thing. > > I'm building with: > $ gcc --version > gcc (Debian 4.9.2-10) 4.9.2 > > > What's there now works for me: > LDFLAGS := $(LDFLAGS) -lpthread -lrt > > > What you propose also works for me: > LDFLAGS := $(LDFLAGS) -pthread -lrt > > > I notice that most other test cases list -lrt first, including timers: > LDFLAGS += -lrt -lpthread > > Which works for me for timers - does that work for you? I assume so. It > also works for futexes for me. I've found references out there suggesting > -lrt should always come before -lpthread. > > I suspect you are correct as -pthread provides flags for both the > preprocessor and the linker, however, I'm still concerned about the > ordering. > > John - did you deliberately choose to use "-lrt -lpthread" ? Ooof. Possibly, but I can't say I really recall at this point. I do remember somewhere around gcc 4.6 I had to change things around since the linker arguments had to be at the end of the gcc string (where as before I was throwing them in w/ the CFLAGS). I think it was then I added the "-Wl,-no-as-needed" bit after googling around. You might look at that as well? Sorry I'm not of much help. -john ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D1767EA1.CC3DA%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2015-05-11 23:23 ` John Stultz @ 2015-05-12 10:02 ` Cyril Hrubis [not found] ` <20150512100256.GA5122-J5syqNJeCN4b1SvskN2V4Q@public.gmane.org> 1 sibling, 1 reply; 31+ messages in thread From: Cyril Hrubis @ 2015-05-12 10:02 UTC (permalink / raw) To: Darren Hart Cc: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Hi! > I'm happy to do that, but I would like to make sure I'm doing the right > thing. The right thing here is to add -pthread to CFLAGS which sets both flags for preprocessor and linker (see man gcc). -- Cyril Hrubis chrubis-AlSwsSmVLrQ@public.gmane.org ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <20150512100256.GA5122-J5syqNJeCN4b1SvskN2V4Q@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <20150512100256.GA5122-J5syqNJeCN4b1SvskN2V4Q@public.gmane.org> @ 2015-05-12 16:10 ` Darren Hart [not found] ` <D1777231.CC5D0%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2015-05-12 20:05 ` Cyril Hrubis 0 siblings, 2 replies; 31+ messages in thread From: Darren Hart @ 2015-05-12 16:10 UTC (permalink / raw) To: Cyril Hrubis Cc: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/12/15, 3:02 AM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: >Hi! >> I'm happy to do that, but I would like to make sure I'm doing the right >> thing. > >The right thing here is to add -pthread to CFLAGS which sets both flags >for preprocessor and linker (see man gcc). Hi Cyril, Thanks. I read that, and mentioned it, but my concern with -pthread in the CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I understand we have a number of gcc-isms in our build - but do we want to add more? I'm also struggling to find any kind of prescribed documentation on this beyond the short blurb in the gcc man page which describes what this option does, but not when to use it. I'll need something concrete to justify changes to testcase Makefiles to Shuah. Unfortunately, all these options are functional for me, while some are not for Shuah, so I'm currently having to rely on documentation which seems pretty sparse. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <D1777231.CC5D0%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D1777231.CC5D0%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-12 16:47 ` Shuah Khan [not found] ` <55522E92.8090609-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-12 16:47 UTC (permalink / raw) To: Darren Hart, Cyril Hrubis Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/12/2015 10:10 AM, Darren Hart wrote: > On 5/12/15, 3:02 AM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: > >> Hi! >>> I'm happy to do that, but I would like to make sure I'm doing the right >>> thing. >> >> The right thing here is to add -pthread to CFLAGS which sets both flags >> for preprocessor and linker (see man gcc). > > Hi Cyril, > > Thanks. I read that, and mentioned it, but my concern with -pthread in the > CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I > understand we have a number of gcc-isms in our build - but do we want to > add more? > > I'm also struggling to find any kind of prescribed documentation on this > beyond the short blurb in the gcc man page which describes what this > option does, but not when to use it. I'll need something concrete to > justify changes to testcase Makefiles to Shuah. > > Unfortunately, all these options are functional for me, while some are not > for Shuah, so I'm currently having to rely on documentation which seems > pretty sparse. > Hi Daren, My goals are really simple. make kselftest doesn't break. All tests compile and run and install or fail gracefully when dependencies aren't met. As long as the above are met, I don't really worry about what individual test Makefiles do. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <55522E92.8090609-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <55522E92.8090609-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-12 17:05 ` Darren Hart [not found] ` <20150512170544.GA30184-JIrPihikzLEQaXB9iyTzyw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-12 17:05 UTC (permalink / raw) To: Shuah Khan Cc: Darren Hart, Cyril Hrubis, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On Tue, May 12, 2015 at 10:47:14AM -0600, Shuah Khan wrote: > On 05/12/2015 10:10 AM, Darren Hart wrote: > > On 5/12/15, 3:02 AM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: > > > >> Hi! > >>> I'm happy to do that, but I would like to make sure I'm doing the right > >>> thing. > >> > >> The right thing here is to add -pthread to CFLAGS which sets both flags > >> for preprocessor and linker (see man gcc). > > > > Hi Cyril, > > > > Thanks. I read that, and mentioned it, but my concern with -pthread in the > > CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I > > understand we have a number of gcc-isms in our build - but do we want to > > add more? > > > > I'm also struggling to find any kind of prescribed documentation on this > > beyond the short blurb in the gcc man page which describes what this > > option does, but not when to use it. I'll need something concrete to > > justify changes to testcase Makefiles to Shuah. > > > > Unfortunately, all these options are functional for me, while some are not > > for Shuah, so I'm currently having to rely on documentation which seems > > pretty sparse. > > > > Hi Daren, > > My goals are really simple. make kselftest doesn't break. All tests > compile and run and install or fail gracefully when dependencies aren't > met. As long as the above are met, I don't really worry about what > individual test Makefiles do. Understood. Given the variability across distros/compiler versions, the "doesn't break" part isn't as straight forward as it should be. I could fix this so it builds for you and me, but I'm trying to build confidence that I'm doing this "correctly" so it doesn't break in other scenarios - since I'm not seeing any breakage on my systems. Shuah, which distro and compiler version are you seeing the build failure on? I'd like to at least reproduce that so I can be confident my next version will at least build in your environment. Currently, the only direction I have is gcc man page and Cyril's advocacy for -pthread. Does the following work for you (it still does for me)? >From 0b7284551d6419520d5ce8833e177ba5b8be2286 Mon Sep 17 00:00:00 2001 Message-Id: <0b7284551d6419520d5ce8833e177ba5b8be2286.1431449782.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> From: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Date: Tue, 12 May 2015 09:54:39 -0700 Subject: [PATCH] selftests/futex: Add -pthread to CFLAGS and LDFLAGS Certain environments fail to build with the "-lpthread -lrt" LDFLAGS. Using "-pthread" instead of "-lpthread" resolves this and is the documented mechanism in the gcc man page. Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- tools/testing/selftests/futex/functional/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index e64d43b..9d6b75e 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -1,6 +1,6 @@ INCLUDES := -I../include -I../../ -CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) -LDFLAGS := $(LDFLAGS) -lpthread -lrt +CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) +LDFLAGS := $(LDFLAGS) -pthread -lrt HEADERS := ../include/futextest.h TARGETS := \ -- 2.1.4 -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <20150512170544.GA30184-JIrPihikzLEQaXB9iyTzyw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <20150512170544.GA30184-JIrPihikzLEQaXB9iyTzyw@public.gmane.org> @ 2015-05-12 17:14 ` Shuah Khan 0 siblings, 0 replies; 31+ messages in thread From: Shuah Khan @ 2015-05-12 17:14 UTC (permalink / raw) To: Darren Hart Cc: Darren Hart, Cyril Hrubis, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/12/2015 11:05 AM, Darren Hart wrote: > On Tue, May 12, 2015 at 10:47:14AM -0600, Shuah Khan wrote: >> On 05/12/2015 10:10 AM, Darren Hart wrote: >>> On 5/12/15, 3:02 AM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: >>> >>>> Hi! >>>>> I'm happy to do that, but I would like to make sure I'm doing the right >>>>> thing. >>>> >>>> The right thing here is to add -pthread to CFLAGS which sets both flags >>>> for preprocessor and linker (see man gcc). >>> >>> Hi Cyril, >>> >>> Thanks. I read that, and mentioned it, but my concern with -pthread in the >>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >>> understand we have a number of gcc-isms in our build - but do we want to >>> add more? >>> >>> I'm also struggling to find any kind of prescribed documentation on this >>> beyond the short blurb in the gcc man page which describes what this >>> option does, but not when to use it. I'll need something concrete to >>> justify changes to testcase Makefiles to Shuah. >>> >>> Unfortunately, all these options are functional for me, while some are not >>> for Shuah, so I'm currently having to rely on documentation which seems >>> pretty sparse. >>> >> >> Hi Daren, >> >> My goals are really simple. make kselftest doesn't break. All tests >> compile and run and install or fail gracefully when dependencies aren't >> met. As long as the above are met, I don't really worry about what >> individual test Makefiles do. > > Understood. Given the variability across distros/compiler versions, the > "doesn't break" part isn't as straight forward as it should be. I could fix > this so it builds for you and me, but I'm trying to build confidence that I'm > doing this "correctly" so it doesn't break in other scenarios - since I'm not > seeing any breakage on my systems. > > Shuah, which distro and compiler version are you seeing the build failure on? > I'd like to at least reproduce that so I can be confident my next version will > at least build in your environment. > > Currently, the only direction I have is gcc man page and Cyril's advocacy for > -pthread. Does the following work for you (it still does for me)? > > >>From 0b7284551d6419520d5ce8833e177ba5b8be2286 Mon Sep 17 00:00:00 2001 > Message-Id: <0b7284551d6419520d5ce8833e177ba5b8be2286.1431449782.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > From: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Date: Tue, 12 May 2015 09:54:39 -0700 > Subject: [PATCH] selftests/futex: Add -pthread to CFLAGS and LDFLAGS > > Certain environments fail to build with the "-lpthread -lrt" LDFLAGS. > Using "-pthread" instead of "-lpthread" resolves this and is the > documented mechanism in the gcc man page. > > Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > --- > tools/testing/selftests/futex/functional/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile > index e64d43b..9d6b75e 100644 > --- a/tools/testing/selftests/futex/functional/Makefile > +++ b/tools/testing/selftests/futex/functional/Makefile > @@ -1,6 +1,6 @@ > INCLUDES := -I../include -I../../ > -CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) > -LDFLAGS := $(LDFLAGS) -lpthread -lrt > +CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) > +LDFLAGS := $(LDFLAGS) -pthread -lrt > > HEADERS := ../include/futextest.h > TARGETS := \ > Daren, The above worked on my system. I have gcc version 4.9.2 (Ubuntu 4.9.2-10ubuntu13) on mine just in case you need that info. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-12 16:10 ` Darren Hart [not found] ` <D1777231.CC5D0%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-12 20:05 ` Cyril Hrubis 2015-05-12 20:15 ` Darren Hart 1 sibling, 1 reply; 31+ messages in thread From: Cyril Hrubis @ 2015-05-12 20:05 UTC (permalink / raw) To: Darren Hart Cc: Shuah Khan, linux-api, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Hi! > >> I'm happy to do that, but I would like to make sure I'm doing the right > >> thing. > > > >The right thing here is to add -pthread to CFLAGS which sets both flags > >for preprocessor and linker (see man gcc). > > Hi Cyril, > > Thanks. I read that, and mentioned it, but my concern with -pthread in the > CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I > understand we have a number of gcc-isms in our build - but do we want to > add more? > > I'm also struggling to find any kind of prescribed documentation on this > beyond the short blurb in the gcc man page which describes what this > option does, but not when to use it. I'll need something concrete to > justify changes to testcase Makefiles to Shuah. Sorry to mislead you with the pointing at gcc man page. It is a Linux standard. Have a look at pthreads manual page: http://man7.org/linux/man-pages/man7/pthreads.7.html "On Linux, programs that use the Pthreads API should be compiled using cc -pthread." Or any pthread_foo() manual page that starts with: "Compile and link with -pthread." The portable way i.e. POSIX would be getting compiler flags with getconf but as this is a Linux kernel testsuite I would not bother with that. Hmm, and it looks like this is not implemented on Linux anyway. -- Cyril Hrubis chrubis@suse.cz ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-12 20:05 ` Cyril Hrubis @ 2015-05-12 20:15 ` Darren Hart [not found] ` <D177AD46.CC848%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-12 20:15 UTC (permalink / raw) To: Cyril Hrubis Cc: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: >Hi! >> >> I'm happy to do that, but I would like to make sure I'm doing the >>right >> >> thing. >> > >> >The right thing here is to add -pthread to CFLAGS which sets both flags >> >for preprocessor and linker (see man gcc). >> >> Hi Cyril, >> >> Thanks. I read that, and mentioned it, but my concern with -pthread in >>the >> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >> understand we have a number of gcc-isms in our build - but do we want to >> add more? >> >> I'm also struggling to find any kind of prescribed documentation on this >> beyond the short blurb in the gcc man page which describes what this >> option does, but not when to use it. I'll need something concrete to >> justify changes to testcase Makefiles to Shuah. > >Sorry to mislead you with the pointing at gcc man page. > >It is a Linux standard. Have a look at pthreads manual page: >http://man7.org/linux/man-pages/man7/pthreads.7.html > >"On Linux, programs that use the Pthreads API should be compiled using > cc -pthread." > >Or any pthread_foo() manual page that starts with: > >"Compile and link with -pthread." > >The portable way i.e. POSIX would be getting compiler flags with getconf >but as this is a Linux kernel testsuite I would not bother with that. >Hmm, and it looks like this is not implemented on Linux anyway. Thanks Cyril, that's perfect. I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS into the initial patch and resubmit the patch series as v4. Thanks all. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <D177AD46.CC848%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <D177AD46.CC848%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-12 20:40 ` Shuah Khan [not found] ` <55526544.90909-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-12 20:40 UTC (permalink / raw) To: Darren Hart, Cyril Hrubis Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/12/2015 02:15 PM, Darren Hart wrote: > On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: > >> Hi! >>>>> I'm happy to do that, but I would like to make sure I'm doing the >>> right >>>>> thing. >>>> >>>> The right thing here is to add -pthread to CFLAGS which sets both flags >>>> for preprocessor and linker (see man gcc). >>> >>> Hi Cyril, >>> >>> Thanks. I read that, and mentioned it, but my concern with -pthread in >>> the >>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >>> understand we have a number of gcc-isms in our build - but do we want to >>> add more? >>> >>> I'm also struggling to find any kind of prescribed documentation on this >>> beyond the short blurb in the gcc man page which describes what this >>> option does, but not when to use it. I'll need something concrete to >>> justify changes to testcase Makefiles to Shuah. >> >> Sorry to mislead you with the pointing at gcc man page. >> >> It is a Linux standard. Have a look at pthreads manual page: >> http://man7.org/linux/man-pages/man7/pthreads.7.html >> >> "On Linux, programs that use the Pthreads API should be compiled using >> cc -pthread." >> >> Or any pthread_foo() manual page that starts with: >> >> "Compile and link with -pthread." >> >> The portable way i.e. POSIX would be getting compiler flags with getconf >> but as this is a Linux kernel testsuite I would not bother with that. >> Hmm, and it looks like this is not implemented on Linux anyway. > > Thanks Cyril, that's perfect. > > I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS > into the initial patch and resubmit the patch series as v4. > Daren, While you are generating new version, could you also please add .gitignore for the futex binaries, so they get ignored by git. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <55526544.90909-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <55526544.90909-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-12 20:54 ` Darren Hart 2015-05-12 21:17 ` Shuah Khan 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-05-12 20:54 UTC (permalink / raw) To: Shuah Khan, Cyril Hrubis Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/12/15, 1:40 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >On 05/12/2015 02:15 PM, Darren Hart wrote: >> On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: >> >>> Hi! >>>>>> I'm happy to do that, but I would like to make sure I'm doing the >>>> right >>>>>> thing. >>>>> >>>>> The right thing here is to add -pthread to CFLAGS which sets both >>>>>flags >>>>> for preprocessor and linker (see man gcc). >>>> >>>> Hi Cyril, >>>> >>>> Thanks. I read that, and mentioned it, but my concern with -pthread in >>>> the >>>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >>>> understand we have a number of gcc-isms in our build - but do we want >>>>to >>>> add more? >>>> >>>> I'm also struggling to find any kind of prescribed documentation on >>>>this >>>> beyond the short blurb in the gcc man page which describes what this >>>> option does, but not when to use it. I'll need something concrete to >>>> justify changes to testcase Makefiles to Shuah. >>> >>> Sorry to mislead you with the pointing at gcc man page. >>> >>> It is a Linux standard. Have a look at pthreads manual page: >>> http://man7.org/linux/man-pages/man7/pthreads.7.html >>> >>> "On Linux, programs that use the Pthreads API should be compiled using >>> cc -pthread." >>> >>> Or any pthread_foo() manual page that starts with: >>> >>> "Compile and link with -pthread." >>> >>> The portable way i.e. POSIX would be getting compiler flags with >>>getconf >>> but as this is a Linux kernel testsuite I would not bother with that. >>> Hmm, and it looks like this is not implemented on Linux anyway. >> >> Thanks Cyril, that's perfect. >> >> I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS >> into the initial patch and resubmit the patch series as v4. >> > >Daren, > >While you are generating new version, could you also please add >.gitignore for the futex binaries, so they get ignored by git. Will do. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-12 20:54 ` Darren Hart @ 2015-05-12 21:17 ` Shuah Khan 2015-05-12 21:21 ` Shuah Khan 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-12 21:17 UTC (permalink / raw) To: Darren Hart, Cyril Hrubis Cc: linux-api, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 05/12/2015 02:54 PM, Darren Hart wrote: > On 5/12/15, 1:40 PM, "Shuah Khan" <shuahkh@osg.samsung.com> wrote: > >> On 05/12/2015 02:15 PM, Darren Hart wrote: >>> On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis@suse.cz> wrote: >>> >>>> Hi! >>>>>>> I'm happy to do that, but I would like to make sure I'm doing the >>>>> right >>>>>>> thing. >>>>>> >>>>>> The right thing here is to add -pthread to CFLAGS which sets both >>>>>> flags >>>>>> for preprocessor and linker (see man gcc). >>>>> >>>>> Hi Cyril, >>>>> >>>>> Thanks. I read that, and mentioned it, but my concern with -pthread in >>>>> the >>>>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >>>>> understand we have a number of gcc-isms in our build - but do we want >>>>> to >>>>> add more? >>>>> >>>>> I'm also struggling to find any kind of prescribed documentation on >>>>> this >>>>> beyond the short blurb in the gcc man page which describes what this >>>>> option does, but not when to use it. I'll need something concrete to >>>>> justify changes to testcase Makefiles to Shuah. >>>> >>>> Sorry to mislead you with the pointing at gcc man page. >>>> >>>> It is a Linux standard. Have a look at pthreads manual page: >>>> http://man7.org/linux/man-pages/man7/pthreads.7.html >>>> >>>> "On Linux, programs that use the Pthreads API should be compiled using >>>> cc -pthread." >>>> >>>> Or any pthread_foo() manual page that starts with: >>>> >>>> "Compile and link with -pthread." >>>> >>>> The portable way i.e. POSIX would be getting compiler flags with >>>> getconf >>>> but as this is a Linux kernel testsuite I would not bother with that. >>>> Hmm, and it looks like this is not implemented on Linux anyway. >>> >>> Thanks Cyril, that's perfect. >>> >>> I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS >>> into the initial patch and resubmit the patch series as v4. >>> >> >> Daren, >> >> While you are generating new version, could you also please add >> .gitignore for the futex binaries, so they get ignored by git. > > Will do. > Daren, Do you plan to add futex test install support in a later patch series? When you sent this patch series, install support was work in progress. 4.1 has the kselftest install feature. Feel free to defer it for a later patch series if you like. Would be good to get the futex install support into 4.2 if it is possible. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 1/5] selftests: Add futex functional tests 2015-05-12 21:17 ` Shuah Khan @ 2015-05-12 21:21 ` Shuah Khan [not found] ` <55526EC8.30707-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-12 21:21 UTC (permalink / raw) To: Darren Hart, Cyril Hrubis Cc: linux-api, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 05/12/2015 03:17 PM, Shuah Khan wrote: > On 05/12/2015 02:54 PM, Darren Hart wrote: >> On 5/12/15, 1:40 PM, "Shuah Khan" <shuahkh@osg.samsung.com> wrote: >> >>> On 05/12/2015 02:15 PM, Darren Hart wrote: >>>> On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis@suse.cz> wrote: >>>> >>>>> Hi! >>>>>>>> I'm happy to do that, but I would like to make sure I'm doing the >>>>>> right >>>>>>>> thing. >>>>>>> >>>>>>> The right thing here is to add -pthread to CFLAGS which sets both >>>>>>> flags >>>>>>> for preprocessor and linker (see man gcc). >>>>>> >>>>>> Hi Cyril, >>>>>> >>>>>> Thanks. I read that, and mentioned it, but my concern with -pthread in >>>>>> the >>>>>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I >>>>>> understand we have a number of gcc-isms in our build - but do we want >>>>>> to >>>>>> add more? >>>>>> >>>>>> I'm also struggling to find any kind of prescribed documentation on >>>>>> this >>>>>> beyond the short blurb in the gcc man page which describes what this >>>>>> option does, but not when to use it. I'll need something concrete to >>>>>> justify changes to testcase Makefiles to Shuah. >>>>> >>>>> Sorry to mislead you with the pointing at gcc man page. >>>>> >>>>> It is a Linux standard. Have a look at pthreads manual page: >>>>> http://man7.org/linux/man-pages/man7/pthreads.7.html >>>>> >>>>> "On Linux, programs that use the Pthreads API should be compiled using >>>>> cc -pthread." >>>>> >>>>> Or any pthread_foo() manual page that starts with: >>>>> >>>>> "Compile and link with -pthread." >>>>> >>>>> The portable way i.e. POSIX would be getting compiler flags with >>>>> getconf >>>>> but as this is a Linux kernel testsuite I would not bother with that. >>>>> Hmm, and it looks like this is not implemented on Linux anyway. >>>> >>>> Thanks Cyril, that's perfect. >>>> >>>> I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS >>>> into the initial patch and resubmit the patch series as v4. >>>> >>> >>> Daren, >>> >>> While you are generating new version, could you also please add >>> .gitignore for the futex binaries, so they get ignored by git. >> >> Will do. >> > > Daren, > > Do you plan to add futex test install support in a later patch > series? When you sent this patch series, install support was > work in progress. 4.1 has the kselftest install feature. > > Feel free to defer it for a later patch series if you like. Would > be good to get the futex install support into 4.2 if it is possible. > I am blind. Never mind. futex tests are installed. -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <55526EC8.30707-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <55526EC8.30707-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-13 3:34 ` Darren Hart 0 siblings, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-13 3:34 UTC (permalink / raw) To: Shuah Khan Cc: Darren Hart, Cyril Hrubis, linux-api-u79uwXL29TY76Z2rM5mHXA, Linux Kernel Mailing List, John Stultz, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On Tue, May 12, 2015 at 03:21:12PM -0600, Shuah Khan wrote: > On 05/12/2015 03:17 PM, Shuah Khan wrote: > > On 05/12/2015 02:54 PM, Darren Hart wrote: > >> On 5/12/15, 1:40 PM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: > >> > >>> On 05/12/2015 02:15 PM, Darren Hart wrote: > >>>> On 5/12/15, 1:05 PM, "Cyril Hrubis" <chrubis-AlSwsSmVLrQ@public.gmane.org> wrote: > >>>> > >>>>> Hi! > >>>>>>>> I'm happy to do that, but I would like to make sure I'm doing the > >>>>>> right > >>>>>>>> thing. > >>>>>>> > >>>>>>> The right thing here is to add -pthread to CFLAGS which sets both > >>>>>>> flags > >>>>>>> for preprocessor and linker (see man gcc). > >>>>>> > >>>>>> Hi Cyril, > >>>>>> > >>>>>> Thanks. I read that, and mentioned it, but my concern with -pthread in > >>>>>> the > >>>>>> CFLAGS and LDFLAGS is that it is a non-standard compiler flag. I > >>>>>> understand we have a number of gcc-isms in our build - but do we want > >>>>>> to > >>>>>> add more? > >>>>>> > >>>>>> I'm also struggling to find any kind of prescribed documentation on > >>>>>> this > >>>>>> beyond the short blurb in the gcc man page which describes what this > >>>>>> option does, but not when to use it. I'll need something concrete to > >>>>>> justify changes to testcase Makefiles to Shuah. > >>>>> > >>>>> Sorry to mislead you with the pointing at gcc man page. > >>>>> > >>>>> It is a Linux standard. Have a look at pthreads manual page: > >>>>> http://man7.org/linux/man-pages/man7/pthreads.7.html > >>>>> > >>>>> "On Linux, programs that use the Pthreads API should be compiled using > >>>>> cc -pthread." > >>>>> > >>>>> Or any pthread_foo() manual page that starts with: > >>>>> > >>>>> "Compile and link with -pthread." > >>>>> > >>>>> The portable way i.e. POSIX would be getting compiler flags with > >>>>> getconf > >>>>> but as this is a Linux kernel testsuite I would not bother with that. > >>>>> Hmm, and it looks like this is not implemented on Linux anyway. > >>>> > >>>> Thanks Cyril, that's perfect. > >>>> > >>>> I'll roll my latest example patch adding -pthread to LDFLAGS and CFLAGS > >>>> into the initial patch and resubmit the patch series as v4. > >>>> > >>> > >>> Daren, > >>> > >>> While you are generating new version, could you also please add > >>> .gitignore for the futex binaries, so they get ignored by git. > >> > >> Will do. > >> > > > > Daren, > > > > Do you plan to add futex test install support in a later patch > > series? When you sent this patch series, install support was > > work in progress. 4.1 has the kselftest install feature. > > > > Feel free to defer it for a later patch series if you like. Would > > be good to get the futex install support into 4.2 if it is possible. > > > > I am blind. Never mind. futex tests are installed. Oh good - I just reviewed my patches and could swear it was all there! I'll add the .gitignore now and roll out v4 with all the cleanups and pthread linker fixes. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 3/5] selftest/futex: Increment ksft pass and fail counters 2015-05-08 22:09 [GIT PULL v2] selftest: Add futex functional tests Darren Hart 2015-05-08 22:09 ` [PATCH 1/5] selftests: " Darren Hart @ 2015-05-08 22:09 ` Darren Hart 1 sibling, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-08 22:09 UTC (permalink / raw) To: linux-api, Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro Add kselftest.h to logging.h and increment the pass and fail counters as part of the print_result routine which is called by all futex tests. Cc: Shuah Khan <shuahkh@osg.samsung.com> Cc: linux-api@vger.kernel.org Cc: Ingo Molnar <mingo@elte.hu> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- tools/testing/selftests/futex/functional/Makefile | 2 +- tools/testing/selftests/futex/include/logging.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index fb96927..e64d43b 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile @@ -1,4 +1,4 @@ -INCLUDES := -I../include +INCLUDES := -I../include -I../../ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) LDFLAGS := $(LDFLAGS) -lpthread -lrt diff --git a/tools/testing/selftests/futex/include/logging.h b/tools/testing/selftests/futex/include/logging.h index f6ed5c2..014aa01 100644 --- a/tools/testing/selftests/futex/include/logging.h +++ b/tools/testing/selftests/futex/include/logging.h @@ -24,6 +24,7 @@ #include <string.h> #include <unistd.h> #include <linux/futex.h> +#include "kselftest.h" /* * Define PASS, ERROR, and FAIL strings with and without color escape @@ -111,12 +112,14 @@ void print_result(int ret) switch (ret) { case RET_PASS: + ksft_inc_pass_cnt(); result = PASS; break; case RET_ERROR: result = ERROR; break; case RET_FAIL: + ksft_inc_fail_cnt(); result = FAIL; break; } -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* [GIT PULL] selftest: Add futex functional tests
@ 2015-03-27 22:17 Darren Hart
[not found] ` <cover.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
0 siblings, 1 reply; 31+ messages in thread
From: Darren Hart @ 2015-03-27 22:17 UTC (permalink / raw)
To: Linux Kernel Mailing List
Cc: Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Ingo Molnar,
Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro,
Darren Hart
Hi Shuah,
This series begins the process of migrating my futextest tests into kselftest.
I've started with only the functional tests, as the performance and stress may
not be appropriate for kselftest as they stand.
I cleaned up various complaints from checkpatch, but I ignored others that would
require significant rework of the testcases, such as not using volatile and not
creating new typedefs.
The patches will follow, but I'm providing a pull request for your convenience
as well.
The following changes since commit 0b63accf87225b5eb7e52814c374cf02d733d4bb:
tools, update rtctest.c to verify passage of time (2015-03-24 22:02:59 -0600)
are available in the git repository at:
git://git.infradead.org/users/dvhart/linux.git futextest
Darren Hart (5):
selftests: Add futex functional tests
selftest/futex: Update Makefile to use lib.mk
selftest/futex: Increment ksft pass and fail counters
selftest: Add futex tests to the top-level Makefile
kselftest: Add exit code defines
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/futex/Makefile | 29 ++
tools/testing/selftests/futex/README | 62 ++++
tools/testing/selftests/futex/functional/Makefile | 25 ++
.../selftests/futex/functional/futex_requeue_pi.c | 402 +++++++++++++++++++++
.../functional/futex_requeue_pi_mismatched_ops.c | 136 +++++++
.../functional/futex_requeue_pi_signal_restart.c | 220 +++++++++++
.../functional/futex_wait_private_mapped_file.c | 126 +++++++
.../futex/functional/futex_wait_timeout.c | 85 +++++
.../functional/futex_wait_uninitialized_heap.c | 124 +++++++
.../futex/functional/futex_wait_wouldblock.c | 79 ++++
tools/testing/selftests/futex/functional/run.sh | 79 ++++
tools/testing/selftests/futex/include/atomic.h | 83 +++++
tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++
tools/testing/selftests/futex/include/logging.h | 150 ++++++++
tools/testing/selftests/futex/run.sh | 33 ++
tools/testing/selftests/kselftest.h | 17 +-
17 files changed, 1912 insertions(+), 5 deletions(-)
create mode 100644 tools/testing/selftests/futex/Makefile
create mode 100644 tools/testing/selftests/futex/README
create mode 100644 tools/testing/selftests/futex/functional/Makefile
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
create mode 100755 tools/testing/selftests/futex/functional/run.sh
create mode 100644 tools/testing/selftests/futex/include/atomic.h
create mode 100644 tools/testing/selftests/futex/include/futextest.h
create mode 100644 tools/testing/selftests/futex/include/logging.h
create mode 100755 tools/testing/selftests/futex/run.sh
--
2.1.4
^ permalink raw reply [flat|nested] 31+ messages in thread[parent not found: <cover.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* [PATCH 1/5] selftests: Add futex functional tests [not found] ` <cover.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-03-27 22:17 ` Darren Hart [not found] ` <597c9eabcac5da9456d6cfd6de9117591d73385e.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Darren Hart @ 2015-03-27 22:17 UTC (permalink / raw) To: Linux Kernel Mailing List Cc: Darren Hart, Shuah Khan, linux-api-u79uwXL29TY76Z2rM5mHXA, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro The futextest testsuite [1] provides functional, stress, and performance tests for the various futex op codes. Those tests will be of more use to futex developers if they are included with the kernel source. Copy the core infrastructure and the functional tests into selftests. Remove reference to the performance and stress tests from the contributed sources. Remove the Free Software Foundation address paragraph from all contributed files to avoid checkpatch complaints. A future effort will explore moving the performance and stress tests into the kernel. 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- tools/testing/selftests/futex/Makefile | 8 + tools/testing/selftests/futex/README | 62 ++++ tools/testing/selftests/futex/functional/Makefile | 21 ++ .../selftests/futex/functional/futex_requeue_pi.c | 402 +++++++++++++++++++++ .../functional/futex_requeue_pi_mismatched_ops.c | 136 +++++++ .../functional/futex_requeue_pi_signal_restart.c | 220 +++++++++++ .../functional/futex_wait_private_mapped_file.c | 126 +++++++ .../futex/functional/futex_wait_timeout.c | 85 +++++ .../functional/futex_wait_uninitialized_heap.c | 124 +++++++ .../futex/functional/futex_wait_wouldblock.c | 79 ++++ tools/testing/selftests/futex/functional/run.sh | 79 ++++ tools/testing/selftests/futex/include/atomic.h | 83 +++++ tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++ tools/testing/selftests/futex/include/logging.h | 147 ++++++++ tools/testing/selftests/futex/run.sh | 33 ++ 15 files changed, 1871 insertions(+) create mode 100644 tools/testing/selftests/futex/Makefile create mode 100644 tools/testing/selftests/futex/README create mode 100644 tools/testing/selftests/futex/functional/Makefile create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c create mode 100755 tools/testing/selftests/futex/functional/run.sh create mode 100644 tools/testing/selftests/futex/include/atomic.h create mode 100644 tools/testing/selftests/futex/include/futextest.h create mode 100644 tools/testing/selftests/futex/include/logging.h create mode 100755 tools/testing/selftests/futex/run.sh diff --git a/tools/testing/selftests/futex/Makefile b/tools/testing/selftests/futex/Makefile new file mode 100644 index 0000000..8629187 --- /dev/null +++ b/tools/testing/selftests/futex/Makefile @@ -0,0 +1,8 @@ +SUBDIRS := functional + +.PHONY: all clean +all: + for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done + +clean: + for DIR in $(SUBDIRS); do $(MAKE) -C $$DIR $@ ; done diff --git a/tools/testing/selftests/futex/README b/tools/testing/selftests/futex/README new file mode 100644 index 0000000..3224a04 --- /dev/null +++ b/tools/testing/selftests/futex/README @@ -0,0 +1,62 @@ +Futex Test +========== +Futex Test is intended to thoroughly test the Linux kernel futex system call +API. + +Functional tests shall test the documented behavior of the futex operation +code under test. This includes checking for proper behavior under normal use, +odd corner cases, regression tests, and abject abuse and misuse. + +Futextest will also provide example implementation of mutual exclusion +primitives. These can be used as is in user applications or can serve as +examples for system libraries. These will likely be added to either a new lib/ +directory or purely as header files under include/, I'm leaning toward the +latter. + +Quick Start +----------- +# make +# ./run.sh + +Design and Implementation Goals +------------------------------- +o Tests should be as self contained as is practical so as to facilitate sharing + the individual tests on mailing list discussions and bug reports. +o The build system shall remain as simple as possible, avoiding any archive or + shared object building and linking. +o Where possible, any helper functions or other package-wide code shall be + implemented in header files, avoiding the need to compile intermediate object + files. +o External dependendencies shall remain as minimal as possible. Currently gcc + and glibc are the only dependencies. +o Tests return 0 for success and < 0 for failure. + +Output Formatting +----------------- +Test output shall be easily parsable by both human and machine. Title and +results are printed to stdout, while intermediate ERROR or FAIL messages are +sent to stderr. Tests shall support the -c option to print PASS, FAIL, and +ERROR strings in color for easy visual parsing. Output shall conform to the +following format: + +test_name: Description of the test + Arguments: arg1=val1 #units specified for clarity where appropriate + ERROR: Description of unexpected error + FAIL: Reason for test failure + # FIXME: Perhaps an " INFO: informational message" option would be + # useful here. Using -v to toggle it them on and off, as with -c. + # there may be multiple ERROR or FAIL messages +Result: (PASS|FAIL|ERROR) + +Naming +------ +o FIXME: decide on a sane test naming scheme. Currently the tests are named + based on the primary futex operation they test. Eventually this will become a + problem as we intend to write multiple tests which collide in this namespace. + Perhaps something like "wait-wake-1" "wait-wake-2" is adequate, leaving the + detailed description in the test source and the output. + +Coding Style +------------ +o The Futex Test project adheres to the coding standards set forth by Linux + kernel as defined in the Linux source Documentation/CodingStyle. diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile new file mode 100644 index 0000000..6ecb42c --- /dev/null +++ b/tools/testing/selftests/futex/functional/Makefile @@ -0,0 +1,21 @@ +INCLUDES := -I../include +CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE $(INCLUDES) +LDFLAGS := $(LDFLAGS) -lpthread -lrt + +HEADERS := ../include/futextest.h +TARGETS := \ + futex_wait_timeout \ + futex_wait_wouldblock \ + futex_requeue_pi \ + futex_requeue_pi_signal_restart \ + futex_requeue_pi_mismatched_ops \ + futex_wait_uninitialized_heap \ + futex_wait_private_mapped_file + +.PHONY: all clean +all: $(TARGETS) + +$(TARGETS): $(HEADERS) + +clean: + rm -f $(TARGETS) diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi.c b/tools/testing/selftests/futex/functional/futex_requeue_pi.c new file mode 100644 index 0000000..fbeb9f7 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi.c @@ -0,0 +1,402 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2006-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * This test excercises the futex syscall op codes needed for requeuing + * priority inheritance aware POSIX condition variables and mutexes. + * + * AUTHORS + * Sripathi Kodi <sripathik-xthvdsQ13ZrQT0dZR+AlfA@public.gmane.org> + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2008-Jan-13: Initial version by Sripathi Kodi <sripathik-rWuWpvqGGmM@public.gmane.orgm.com> + * 2009-Nov-6: futex test adaptation by Darren Hart <dvhart@linux.intel.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <limits.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <signal.h> +#include <string.h> +#include "atomic.h" +#include "futextest.h" +#include "logging.h" + +#define MAX_WAKE_ITERS 1000 +#define THREAD_MAX 10 +#define SIGNAL_PERIOD_US 100 + +atomic_t waiters_blocked = ATOMIC_INITIALIZER; +atomic_t waiters_woken = ATOMIC_INITIALIZER; + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +futex_t wake_complete = FUTEX_INITIALIZER; + +/* Test options default to 0 */ +static long timeout_ns; +static int broadcast; +static int owner; +static int locked; + +typedef struct { + long id; + struct timespec *timeout; + int lock; + int ret; +} thread_arg_t; +#define THREAD_ARG_INITIALIZER { 0, NULL, 0, 0 } + +void usage(char *prog) +{ + printf("Usage: %s\n", prog); + printf(" -b Broadcast wakeup (all waiters)\n"); + printf(" -c Use color\n"); + printf(" -h Display this help message\n"); + printf(" -l Lock the pi futex across requeue\n"); + printf(" -o Use a third party pi futex owner during requeue (cancels -l)\n"); + printf(" -t N Timeout in nanoseconds (default: 0)\n"); + printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n", + VQUIET, VCRITICAL, VINFO); +} + +int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg, int policy, int prio) +{ + int ret; + struct sched_param schedp; + pthread_attr_t attr; + + pthread_attr_init(&attr); + memset(&schedp, 0, sizeof(schedp)); + + if ((ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED)) != 0) { + error("pthread_attr_setinheritsched\n", ret); + return -1; + } + + if ((ret = pthread_attr_setschedpolicy(&attr, policy)) != 0) { + error("pthread_attr_setschedpolicy\n", ret); + return -1; + } + + schedp.sched_priority = prio; + if ((ret = pthread_attr_setschedparam(&attr, &schedp)) != 0) { + error("pthread_attr_setschedparam\n", ret); + return -1; + } + + if ((ret = pthread_create(pth, &attr, func, arg)) != 0) { + error("pthread_create\n", ret); + return -1; + } + return 0; +} + + +void *waiterfn(void *arg) +{ + thread_arg_t *args = (thread_arg_t *)arg; + futex_t old_val; + + info("Waiter %ld: running\n", 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 */ + usleep(1000 * (long)args->id); + + old_val = f1; + atomic_inc(&waiters_blocked); + info("Calling futex_wait_requeue_pi: %p (%u) -> %p\n", + &f1, f1, &f2); + args->ret = futex_wait_requeue_pi(&f1, old_val, &f2, args->timeout, + FUTEX_PRIVATE_FLAG); + + info("waiter %ld woke with %d %s\n", args->id, args->ret, + args->ret < 0 ? strerror(errno) : ""); + atomic_inc(&waiters_woken); + if (args->ret < 0) { + if (args->timeout && errno == ETIMEDOUT) + args->ret = 0; + else { + args->ret = RET_ERROR; + error("futex_wait_requeue_pi\n", errno); + } + futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG); + } + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + info("Waiter %ld: exiting with %d\n", args->id, args->ret); + pthread_exit((void *)&args->ret); +} + +void *broadcast_wakerfn(void *arg) +{ + thread_arg_t *args = (thread_arg_t *)arg; + int nr_requeue = INT_MAX; + int task_count = 0; + futex_t old_val; + int nr_wake = 1; + int i = 0; + + info("Waker: waiting for waiters to block\n"); + while (waiters_blocked.val < THREAD_MAX) + usleep(1000); + usleep(1000); + + info("Waker: Calling broadcast\n"); + if (args->lock) { + info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", 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); + if (args->ret < 0) { + args->ret = RET_ERROR; + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + } else if (++i < MAX_WAKE_ITERS) { + task_count += args->ret; + if (task_count < THREAD_MAX - waiters_woken.val) + goto continue_requeue; + } else { + error("max broadcast iterations (%d) reached with %d/%d tasks woken or requeued\n", + 0, MAX_WAKE_ITERS, task_count, THREAD_MAX); + args->ret = RET_ERROR; + } + + futex_wake(&wake_complete, 1, FUTEX_PRIVATE_FLAG); + + if (args->lock) + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + if (args->ret > 0) + args->ret = task_count; + + info("Waker: exiting with %d\n", args->ret); + pthread_exit((void *)&args->ret); +} + +void *signal_wakerfn(void *arg) +{ + thread_arg_t *args = (thread_arg_t *)arg; + unsigned int old_val; + int nr_requeue = 0; + int task_count = 0; + int nr_wake = 1; + int i = 0; + + info("Waker: waiting for waiters to block\n"); + while (waiters_blocked.val < THREAD_MAX) + usleep(1000); + usleep(1000); + + while (task_count < THREAD_MAX && waiters_woken.val < THREAD_MAX) { + info("task_count: %d, waiters_woken: %d\n", + task_count, waiters_woken.val); + if (args->lock) { + info("Calling FUTEX_LOCK_PI on mutex=%x @ %p\n", + f2, &f2); + futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG); + } + info("Waker: Calling signal\n"); + /* cond_signal */ + old_val = f1; + args->ret = futex_cmp_requeue_pi(&f1, old_val, &f2, + nr_wake, nr_requeue, + FUTEX_PRIVATE_FLAG); + if (args->ret < 0) + args->ret = -errno; + info("futex: %x\n", f2); + if (args->lock) { + info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", + f2, &f2); + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + } + info("futex: %x\n", f2); + if (args->ret < 0) { + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + args->ret = RET_ERROR; + break; + } + + 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) { + error("max signaling iterations (%d) reached, giving up on pending waiters.\n", + 0, MAX_WAKE_ITERS + THREAD_MAX); + args->ret = RET_ERROR; + break; + } + } + + futex_wake(&wake_complete, 1, FUTEX_PRIVATE_FLAG); + + if (args->ret >= 0) + args->ret = task_count; + + info("Waker: exiting with %d\n", args->ret); + info("Waker: waiters_woken: %d\n", waiters_woken.val); + pthread_exit((void *)&args->ret); +} + +void *third_party_blocker(void *arg) +{ + thread_arg_t *args = (thread_arg_t *)arg; + int ret2 = 0; + + if ((args->ret = futex_lock_pi(&f2, NULL, 0, FUTEX_PRIVATE_FLAG))) + goto out; + args->ret = futex_wait(&wake_complete, wake_complete, NULL, + FUTEX_PRIVATE_FLAG); + ret2 = futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + + out: + if (args->ret || ret2) { + error("third_party_blocker() futex error", 0); + args->ret = RET_ERROR; + } + + pthread_exit((void *)&args->ret); +} + +int unit_test(int broadcast, long lock, int third_party_owner, long timeout_ns) +{ + void *(*wakerfn)(void *) = signal_wakerfn; + thread_arg_t blocker_arg = THREAD_ARG_INITIALIZER; + thread_arg_t waker_arg = THREAD_ARG_INITIALIZER; + pthread_t waiter[THREAD_MAX], waker, blocker; + struct timespec ts, *tsp = NULL; + thread_arg_t args[THREAD_MAX]; + int *waiter_ret; + int i, ret = RET_PASS; + + if (timeout_ns) { + time_t secs; + + info("timeout_ns = %ld\n", 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; + info("ts.tv_sec = %ld\n", ts.tv_sec); + info("ts.tv_nsec = %ld\n", ts.tv_nsec); + tsp = &ts; + } + + if (broadcast) + wakerfn = broadcast_wakerfn; + + if (third_party_owner) { + if (create_rt_thread(&blocker, third_party_blocker, + (void *)&blocker_arg, SCHED_FIFO, 1)) { + error("Creating third party blocker thread failed\n", + errno); + ret = RET_ERROR; + goto out; + } + } + + atomic_set(&waiters_woken, 0); + for (i = 0; i < THREAD_MAX; i++) { + args[i].id = i; + args[i].timeout = tsp; + info("Starting thread %d\n", i); + if (create_rt_thread(&waiter[i], waiterfn, (void *)&args[i], + SCHED_FIFO, 1)) { + error("Creating waiting thread failed\n", errno); + ret = RET_ERROR; + goto out; + } + } + waker_arg.lock = lock; + if (create_rt_thread(&waker, wakerfn, (void *)&waker_arg, + SCHED_FIFO, 1)) { + error("Creating waker thread failed\n", errno); + ret = RET_ERROR; + goto out; + } + + /* 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); + + if (third_party_owner) + pthread_join(blocker, NULL); + pthread_join(waker, NULL); + +out: + if (!ret) { + if (*waiter_ret) + ret = *waiter_ret; + else if (waker_arg.ret < 0) + ret = waker_arg.ret; + else if (blocker_arg.ret) + ret = blocker_arg.ret; + } + + return ret; +} + +int main(int argc, char *argv[]) +{ + int c, ret; + + while ((c = getopt(argc, argv, "bchlot:v:")) != -1) { + switch (c) { + case 'b': + broadcast = 1; + break; + case 'c': + log_color(1); + break; + case 'h': + usage(basename(argv[0])); + exit(0); + case 'l': + locked = 1; + break; + case 'o': + owner = 1; + locked = 0; + break; + case 't': + timeout_ns = atoi(optarg); + break; + case 'v': + log_verbosity(atoi(optarg)); + break; + default: + usage(basename(argv[0])); + exit(1); + } + } + + printf("%s: Test requeue functionality\n", basename(argv[0])); + printf("\tArguments: broadcast=%d locked=%d owner=%d timeout=%ldns\n", + broadcast, locked, owner, timeout_ns); + + /* + * FIXME: unit_test is obsolete now that we parse options and the + * various style of runs are done by run.sh - simplify the code and move + * unit_test into main() + */ + ret = unit_test(broadcast, locked, owner, timeout_ns); + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c new file mode 100644 index 0000000..4bf8fc9 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c @@ -0,0 +1,136 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * 1. Block a thread using FUTEX_WAIT + * 2. Attempt to use FUTEX_CMP_REQUEUE_PI on the futex from 1. + * 3. The kernel must detect the mismatch and return -EINVAL. + * + * AUTHOR + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2009-Nov-9: Initial version by Darren Hart <dvhart-VuQAYsv1560/9W2qTSuDoA@public.gmane.org.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +int child_ret = 0; + +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); +} + +void *blocking_child(void *arg) +{ + child_ret = futex_wait(&f1, f1, NULL, FUTEX_PRIVATE_FLAG); + if (child_ret < 0) { + child_ret = -errno; + error("futex_wait\n", errno); + } + return (void *)&child_ret; +} + +int main(int argc, char *argv[]) +{ + int ret = RET_PASS; + pthread_t child; + int c; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Detect mismatched requeue_pi operations\n", + basename(argv[0])); + + if (pthread_create(&child, NULL, blocking_child, NULL)) { + error("pthread_create\n", errno); + ret = RET_ERROR; + goto out; + } + /* Allow the child to block in the kernel. */ + sleep(1); + + /* + * The kernel should detect the waiter did not setup the + * q->requeue_pi_key and return -EINVAL. If it does not, + * it likely gave the lock to the child, which is now hung + * in the kernel. + */ + ret = futex_cmp_requeue_pi(&f1, f1, &f2, 1, 0, FUTEX_PRIVATE_FLAG); + if (ret < 0) { + if (errno == EINVAL) { + /* + * The kernel correctly detected the mismatched + * requeue_pi target and aborted. Wake the child with + * FUTEX_WAKE. + */ + ret = futex_wake(&f1, 1, FUTEX_PRIVATE_FLAG); + if (ret == 1) + ret = RET_PASS; + else if (ret < 0) { + error("futex_wake\n", errno); + ret = RET_ERROR; + } else { + error("futex_wake did not wake the child\n", 0); + ret = RET_ERROR; + } + } else { + error("futex_cmp_requeue_pi\n", errno); + ret = RET_ERROR; + } + } else if (ret > 0) { + fail("futex_cmp_requeue_pi failed to detect the mismatch\n"); + ret = RET_FAIL; + } else { + error("futex_cmp_requeue_pi found no waiters\n", 0); + ret = RET_ERROR; + } + + pthread_join(child, NULL); + + if (!ret) + ret = child_ret; + + + out: + /* If the kernel crashes, we shouldn't return at all. */ + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c new file mode 100644 index 0000000..6cb2a6a --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c @@ -0,0 +1,220 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2006-2008 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * This test exercises the futex_wait_requeue_pi() signal handling both + * before and after the requeue. The first should be restarted by the + * kernel. The latter should return EWOULDBLOCK to the waiter. + * + * AUTHORS + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2008-May-5: Initial version by Darren Hart <dvhart-VuQAYsv1560/9W2qTSuDoA@public.gmane.org.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <limits.h> +#include <pthread.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "atomic.h" +#include "futextest.h" +#include "logging.h" + +#define DELAY_US 100 + +futex_t f1 = FUTEX_INITIALIZER; +futex_t f2 = FUTEX_INITIALIZER; +atomic_t requeued = ATOMIC_INITIALIZER; + +typedef struct struct_waiter_arg { + long id; + struct timespec *timeout; +} waiter_arg_t; + +int waiter_ret = 0; + +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); +} + +int create_rt_thread(pthread_t *pth, void*(*func)(void *), void *arg, int policy, int prio) +{ + int ret; + struct sched_param schedp; + pthread_attr_t attr; + + pthread_attr_init(&attr); + memset(&schedp, 0, sizeof(schedp)); + + if ((ret = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED)) != 0) { + error("pthread_attr_setinheritsched\n", ret); + return -1; + } + + if ((ret = pthread_attr_setschedpolicy(&attr, policy)) != 0) { + error("pthread_attr_setschedpolicy\n", ret); + return -1; + } + + schedp.sched_priority = prio; + if ((ret = pthread_attr_setschedparam(&attr, &schedp)) != 0) { + error("pthread_attr_setschedparam\n", ret); + return -1; + } + + if ((ret = pthread_create(pth, &attr, func, arg)) != 0) { + error("pthread_create\n", ret); + return -1; + } + return 0; +} + +void handle_signal(int signo) +{ + info("signal received %s requeue\n", + requeued.val ? "after" : "prior to"); +} + +void *waiterfn(void *arg) +{ + unsigned int old_val; + int res; + + waiter_ret = RET_PASS; + + info("Waiter running\n"); + info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &f2); + old_val = f1; + res = futex_wait_requeue_pi(&f1, old_val, &(f2), NULL, FUTEX_PRIVATE_FLAG); + if (!requeued.val || errno != EWOULDBLOCK) { + fail("unexpected return from futex_wait_requeue_pi: %d (%s)\n", + res, strerror(errno)); + info("w2:futex: %x\n", f2); + if (!res) + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + waiter_ret = RET_FAIL; + } + + info("Waiter exiting with %d\n", waiter_ret); + pthread_exit(NULL); +} + + +int main(int argc, char *argv[]) +{ + unsigned int old_val; + struct sigaction sa; + pthread_t waiter; + int c, res, ret = RET_PASS; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Test signal handling during requeue_pi\n", basename(argv[0])); + printf("\tArguments: <none>\n"); + + sa.sa_handler = handle_signal; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + if (sigaction(SIGUSR1, &sa, NULL)) { + error("sigaction\n", errno); + exit(1); + } + + info("m1:f2: %x\n", f2); + info("Creating waiter\n"); + if ((res = create_rt_thread(&waiter, waiterfn, NULL, SCHED_FIFO, 1))) { + error("Creating waiting thread failed", res); + ret = RET_ERROR; + goto out; + } + + info("Calling FUTEX_LOCK_PI on f2=%x @ %p\n", f2, &f2); + info("m2:f2: %x\n", f2); + futex_lock_pi(&f2, 0, 0, FUTEX_PRIVATE_FLAG); + info("m3:f2: %x\n", f2); + + while (1) { + /* + * signal the waiter before requeue, waiter should automatically + * restart futex_wait_requeue_pi() in the kernel. Wait for the + * waiter to block on f1 again. + */ + info("Issuing SIGUSR1 to waiter\n"); + pthread_kill(waiter, SIGUSR1); + usleep(DELAY_US); + + info("Requeueing waiter via FUTEX_CMP_REQUEUE_PI\n"); + old_val = f1; + res = futex_cmp_requeue_pi(&f1, old_val, &(f2), 1, 0, + FUTEX_PRIVATE_FLAG); + /* + * If res is non-zero, we either requeued the waiter or hit an + * error, break out and handle it. If it is zero, then the + * signal may have hit before the the waiter was blocked on f1. + * Try again. + */ + if (res > 0) { + atomic_set(&requeued, 1); + break; + } else if (res > 0) { + error("FUTEX_CMP_REQUEUE_PI failed\n", errno); + ret = RET_ERROR; + break; + } + } + info("m4:f2: %x\n", f2); + + /* + * Signal the waiter after requeue, waiter should return from + * futex_wait_requeue_pi() with EWOULDBLOCK. Join the thread here so the + * futex_unlock_pi() can't happen before the signal wakeup is detected + * in the kernel. + */ + info("Issuing SIGUSR1 to waiter\n"); + pthread_kill(waiter, SIGUSR1); + info("Waiting for waiter to return\n"); + pthread_join(waiter, NULL); + + info("Calling FUTEX_UNLOCK_PI on mutex=%x @ %p\n", f2, &f2); + futex_unlock_pi(&f2, FUTEX_PRIVATE_FLAG); + info("m5:f2: %x\n", f2); + + out: + if (ret == RET_PASS && waiter_ret) + ret = waiter_ret; + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c b/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c new file mode 100644 index 0000000..cdd54b9 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c @@ -0,0 +1,126 @@ +/****************************************************************************** + * + * Copyright FUJITSU LIMITED 2010 + * Copyright KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Internally, Futex has two handling mode, anon and file. The private file + * mapping is special. At first it behave as file, but after write anything + * it behave as anon. This test is intent to test such case. + * + * AUTHOR + * KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> + * + * HISTORY + * 2010-Jan-6: Initial version by KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + *****************************************************************************/ + +#include <stdio.h> +#include <stdlib.h> +#include <syscall.h> +#include <unistd.h> +#include <errno.h> +#include <linux/futex.h> +#include <pthread.h> +#include <libgen.h> +#include <signal.h> + +#include "logging.h" +#include "futextest.h" + +#define PAGE_SZ 4096 + +char pad[PAGE_SZ] = {1}; +futex_t val = 1; +char pad2[PAGE_SZ] = {1}; + +#define WAKE_WAIT_US 3000000 +struct timespec wait_timeout = { .tv_sec = 5, .tv_nsec = 0 }; + +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); +} + +void *thr_futex_wait(void *arg) +{ + int ret; + + info("futex wait\n"); + ret = futex_wait(&val, 1, &wait_timeout, 0); + + if (ret && errno != EWOULDBLOCK && errno != ETIMEDOUT) { + error("futex error.\n", errno); + print_result(RET_ERROR); + exit(RET_ERROR); + } + + if (ret && errno == ETIMEDOUT) + fail("waiter timedout\n"); + + info("futex_wait: ret = %d, errno = %d\n", ret, errno); + + return NULL; +} + +int main(int argc, char **argv) +{ + pthread_t thr; + int ret = RET_PASS; + int res; + int c; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + printf("%s: Test the futex value of private file mappings in FUTEX_WAIT\n", + basename(argv[0])); + + ret = pthread_create(&thr, NULL, thr_futex_wait, NULL); + if (ret < 0) { + fprintf(stderr, "pthread_create error\n"); + ret = RET_ERROR; + goto out; + } + + info("wait a while\n"); + usleep(WAKE_WAIT_US); + val = 2; + res = futex_wake(&val, 1, 0); + info("futex_wake %d\n", res); + if (res != 1) { + fail("FUTEX_WAKE didn't find the waiting thread.\n"); + ret = RET_FAIL; + } + + info("join\n"); + pthread_join(thr, NULL); + + out: + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_timeout.c b/tools/testing/selftests/futex/functional/futex_wait_timeout.c new file mode 100644 index 0000000..95c2d28 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_timeout.c @@ -0,0 +1,85 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Block on a futex and wait for timeout. + * + * AUTHOR + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart-VuQAYsv1560/9W2qTSuDoA@public.gmane.org.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +static long timeout_ns = 100000; /* 100us default timeout */ + +void usage(char *prog) +{ + printf("Usage: %s\n", prog); + printf(" -c Use color\n"); + printf(" -h Display this help message\n"); + printf(" -t N Timeout in nanoseconds (default: 100,000)\n"); + printf(" -v L Verbosity level: %d=QUIET %d=CRITICAL %d=INFO\n", + VQUIET, VCRITICAL, VINFO); +} + +int main(int argc, char *argv[]) +{ + futex_t f1 = FUTEX_INITIALIZER; + struct timespec to; + int res, ret = RET_PASS; + int c; + + 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 't': + timeout_ns = atoi(optarg); + break; + case 'v': + log_verbosity(atoi(optarg)); + break; + default: + usage(basename(argv[0])); + exit(1); + } + } + + printf("%s: Block on a futex and wait for timeout\n", basename(argv[0])); + printf("\tArguments: timeout=%ldns\n", timeout_ns); + + /* initialize timeout */ + to.tv_sec = 0; + to.tv_nsec = timeout_ns; + + info("Calling futex_wait on f1: %u @ %p\n", f1, &f1); + res = futex_wait(&f1, f1, &to, FUTEX_PRIVATE_FLAG); + if (!res || errno != ETIMEDOUT) { + fail("futex_wait returned %d\n", ret < 0 ? errno : ret); + ret = RET_FAIL; + } + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c b/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c new file mode 100644 index 0000000..db077ae --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c @@ -0,0 +1,124 @@ +/****************************************************************************** + * + * Copyright FUJITSU LIMITED 2010 + * Copyright KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Wait on uninitialized heap. It shold be zero and FUTEX_WAIT should return + * immediately. This test is intent to test zero page handling in futex. + * + * AUTHOR + * KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> + * + * HISTORY + * 2010-Jan-6: Initial version by KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> + * + *****************************************************************************/ + +#include <pthread.h> +#include <stdio.h> +#include <stdlib.h> +#include <sys/mman.h> +#include <syscall.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <errno.h> +#include <linux/futex.h> +#include <libgen.h> + +#include "logging.h" +#include "futextest.h" + +#define WAIT_US 5000000 + +static int child_blocked = 1; +static int child_ret; +void *buf; + +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); +} + +void *wait_thread(void *arg) +{ + int res; + + child_ret = RET_PASS; + res = futex_wait(buf, 1, NULL, 0); + child_blocked = 0; + + if (res != 0 && errno != EWOULDBLOCK) { + error("futex failure\n", errno); + child_ret = RET_ERROR; + } + pthread_exit(NULL); +} + +int main(int argc, char **argv) +{ + int c, ret = RET_PASS; + long page_size; + pthread_t thr; + + while ((c = getopt(argc, argv, "chv:")) != -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); + } + } + + page_size = sysconf(_SC_PAGESIZE); + + buf = mmap(NULL, page_size, PROT_READ|PROT_WRITE, + MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); + if (buf == (void *)-1) { + error("mmap\n", errno); + exit(1); + } + + printf("%s: Test the uninitialized futex value in FUTEX_WAIT\n", + basename(argv[0])); + + + ret = pthread_create(&thr, NULL, wait_thread, NULL); + if (ret) { + error("pthread_create\n", errno); + ret = RET_ERROR; + goto out; + } + + info("waiting %dus for child to return\n", WAIT_US); + usleep(WAIT_US); + + if (child_blocked) { + fail("child blocked in kernel\n"); + ret = RET_FAIL; + } else { + ret = child_ret; + } + + out: + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c new file mode 100644 index 0000000..b6b0274 --- /dev/null +++ b/tools/testing/selftests/futex/functional/futex_wait_wouldblock.c @@ -0,0 +1,79 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Test if FUTEX_WAIT op returns -EWOULDBLOCK if the futex value differs + * from the expected one. + * + * AUTHOR + * Gowrishankar <gowrishankar.m-xthvdsQ13ZrQT0dZR+AlfA@public.gmane.org> + * + * HISTORY + * 2009-Nov-14: Initial version by Gowrishankar <gowrishankar.m@in.ibm.com> + * + *****************************************************************************/ + +#include <errno.h> +#include <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include "futextest.h" +#include "logging.h" + +#define timeout_ns 100000 + +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); +} + +int main(int argc, char *argv[]) +{ + struct timespec to = {.tv_sec = 0, .tv_nsec = timeout_ns}; + futex_t f1 = FUTEX_INITIALIZER; + int res, ret = RET_PASS; + int c; + + 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); + } + } + + printf("%s: Test the unexpected futex value in FUTEX_WAIT\n", + basename(argv[0])); + + info("Calling futex_wait on f1: %u @ %p with val=%u\n", f1, &f1, f1+1); + res = futex_wait(&f1, f1+1, &to, FUTEX_PRIVATE_FLAG); + if (!res || errno != EWOULDBLOCK) { + fail("futex_wait returned: %d %s\n", + res ? errno : res, res ? strerror(errno) : ""); + ret = RET_FAIL; + } + + print_result(ret); + return ret; +} diff --git a/tools/testing/selftests/futex/functional/run.sh b/tools/testing/selftests/futex/functional/run.sh new file mode 100755 index 0000000..e87dbe2 --- /dev/null +++ b/tools/testing/selftests/futex/functional/run.sh @@ -0,0 +1,79 @@ +#!/bin/sh + +############################################################################### +# +# Copyright © International Business Machines Corp., 2009 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DESCRIPTION +# Run tests in the current directory. +# +# AUTHOR +# Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> +# +# HISTORY +# 2009-Nov-9: Initial version by Darren Hart <dvhart-VuQAYsv1562uYJLRA6qg5Q@public.gmane.orgcom> +# 2010-Jan-6: Add futex_wait_uninitialized_heap and futex_wait_private_mapped_file +# by KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> +# +############################################################################### + +# Test for a color capable console +if [ -z "$USE_COLOR" ]; then + tput setf 7 + if [ $? -eq 0 ]; then + USE_COLOR=1 + tput sgr0 + fi +fi +if [ "$USE_COLOR" -eq 1 ]; then + COLOR="-c" +fi + + +echo +# requeue pi testing +# without timeouts +./futex_requeue_pi $COLOR +./futex_requeue_pi $COLOR -b +./futex_requeue_pi $COLOR -b -l +./futex_requeue_pi $COLOR -b -o +./futex_requeue_pi $COLOR -l +./futex_requeue_pi $COLOR -o +# with timeouts +./futex_requeue_pi $COLOR -b -l -t 5000 +./futex_requeue_pi $COLOR -l -t 5000 +./futex_requeue_pi $COLOR -b -l -t 500000 +./futex_requeue_pi $COLOR -l -t 500000 +./futex_requeue_pi $COLOR -b -t 5000 +./futex_requeue_pi $COLOR -t 5000 +./futex_requeue_pi $COLOR -b -t 500000 +./futex_requeue_pi $COLOR -t 500000 +./futex_requeue_pi $COLOR -b -o -t 5000 +./futex_requeue_pi $COLOR -l -t 5000 +./futex_requeue_pi $COLOR -b -o -t 500000 +./futex_requeue_pi $COLOR -l -t 500000 +# with long timeout +./futex_requeue_pi $COLOR -b -l -t 2000000000 +./futex_requeue_pi $COLOR -l -t 2000000000 + + +echo +./futex_requeue_pi_mismatched_ops $COLOR + +echo +./futex_requeue_pi_signal_restart $COLOR + +echo +./futex_wait_timeout $COLOR + +echo +./futex_wait_wouldblock $COLOR + +echo +./futex_wait_uninitialized_heap $COLOR +./futex_wait_private_mapped_file $COLOR diff --git a/tools/testing/selftests/futex/include/atomic.h b/tools/testing/selftests/futex/include/atomic.h new file mode 100644 index 0000000..f861da3 --- /dev/null +++ b/tools/testing/selftests/futex/include/atomic.h @@ -0,0 +1,83 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * GCC atomic builtin wrappers + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * + * AUTHOR + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2009-Nov-17: Initial version by Darren Hart <dvhart-VuQAYsv1563N0uC3ymp8PA@public.gmane.orgl.com> + * + *****************************************************************************/ + +#ifndef _ATOMIC_H +#define _ATOMIC_H + +typedef struct { + volatile int val; +} atomic_t; + +#define ATOMIC_INITIALIZER { 0 } + +/** + * atomic_cmpxchg() - Atomic compare and exchange + * @uaddr: The address of the futex to be modified + * @oldval: The expected value of the futex + * @newval: The new value to try and assign the futex + * + * Return the old value of addr->val. + */ +static inline int +atomic_cmpxchg(atomic_t *addr, int oldval, int newval) +{ + return __sync_val_compare_and_swap(&addr->val, oldval, newval); +} + +/** + * atomic_inc() - Atomic incrememnt + * @addr: Address of the variable to increment + * + * Return the new value of addr->val. + */ +static inline int +atomic_inc(atomic_t *addr) +{ + return __sync_add_and_fetch(&addr->val, 1); +} + +/** + * atomic_dec() - Atomic decrement + * @addr: Address of the variable to decrement + * + * Return the new value of addr-val. + */ +static inline int +atomic_dec(atomic_t *addr) +{ + return __sync_sub_and_fetch(&addr->val, 1); +} + +/** + * atomic_set() - Atomic set + * @addr: Address of the variable to set + * @newval: New value for the atomic_t + * + * Return the new value of addr->val. + */ +static inline int +atomic_set(atomic_t *addr, int newval) +{ + addr->val = newval; + return newval; +} + +#endif diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h new file mode 100644 index 0000000..7b4bbab --- /dev/null +++ b/tools/testing/selftests/futex/include/futextest.h @@ -0,0 +1,266 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Glibc independent futex library for testing kernel functionality. + * + * AUTHOR + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart-VuQAYsv1560/9W2qTSuDoA@public.gmane.org.com> + * + *****************************************************************************/ + +#ifndef _FUTEXTEST_H +#define _FUTEXTEST_H + +#include <unistd.h> +#include <sys/syscall.h> +#include <sys/types.h> +#include <linux/futex.h> + +typedef volatile u_int32_t futex_t; +#define FUTEX_INITIALIZER 0 + +/* Define the newer op codes if the system header file is not up to date. */ +#ifndef FUTEX_WAIT_BITSET +#define FUTEX_WAIT_BITSET 9 +#endif +#ifndef FUTEX_WAKE_BITSET +#define FUTEX_WAKE_BITSET 10 +#endif +#ifndef FUTEX_WAIT_REQUEUE_PI +#define FUTEX_WAIT_REQUEUE_PI 11 +#endif +#ifndef FUTEX_CMP_REQUEUE_PI +#define FUTEX_CMP_REQUEUE_PI 12 +#endif +#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE +#define FUTEX_WAIT_REQUEUE_PI_PRIVATE (FUTEX_WAIT_REQUEUE_PI | \ + FUTEX_PRIVATE_FLAG) +#endif +#ifndef FUTEX_REQUEUE_PI_PRIVATE +#define FUTEX_CMP_REQUEUE_PI_PRIVATE (FUTEX_CMP_REQUEUE_PI | \ + FUTEX_PRIVATE_FLAG) +#endif + +/** + * futex() - SYS_futex syscall wrapper + * @uaddr: address of first futex + * @op: futex op code + * @val: typically expected value of uaddr, but varies by op + * @timeout: typically an absolute struct timespec (except where noted + * otherwise). Overloaded by some ops + * @uaddr2: address of second futex for some ops\ + * @val3: varies by op + * @opflags: flags to be bitwise OR'd with op, such as FUTEX_PRIVATE_FLAG + * + * futex() is used by all the following futex op wrappers. It can also be + * used for misuse and abuse testing. Generally, the specific op wrappers + * should be used instead. It is a macro instead of an static inline function as + * some of the types over overloaded (timeout is used for nr_requeue for + * example). + * + * These argument descriptions are the defaults for all + * like-named arguments in the following wrappers except where noted below. + */ +#define futex(uaddr, op, val, timeout, uaddr2, val3, opflags) \ + syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3) + +/** + * futex_wait() - block on uaddr with optional timeout + * @timeout: relative timeout + */ +static inline int +futex_wait(futex_t *uaddr, futex_t val, struct timespec *timeout, int opflags) +{ + return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags); +} + +/** + * futex_wake() - wake one or more tasks blocked on uaddr + * @nr_wake: wake up to this many tasks + */ +static inline int +futex_wake(futex_t *uaddr, int nr_wake, int opflags) +{ + return futex(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags); +} + +/** + * futex_wait_bitset() - block on uaddr with bitset + * @bitset: bitset to be used with futex_wake_bitset + */ +static inline int +futex_wait_bitset(futex_t *uaddr, futex_t val, struct timespec *timeout, + u_int32_t bitset, int opflags) +{ + return futex(uaddr, FUTEX_WAIT_BITSET, val, timeout, NULL, bitset, + opflags); +} + +/** + * futex_wake_bitset() - wake one or more tasks blocked on uaddr with bitset + * @bitset: bitset to compare with that used in futex_wait_bitset + */ +static inline int +futex_wake_bitset(futex_t *uaddr, int nr_wake, u_int32_t bitset, int opflags) +{ + return futex(uaddr, FUTEX_WAKE_BITSET, nr_wake, NULL, NULL, bitset, + opflags); +} + +/** + * futex_lock_pi() - block on uaddr as a PI mutex + * @detect: whether (1) or not (0) to perform deadlock detection + */ +static inline int +futex_lock_pi(futex_t *uaddr, struct timespec *timeout, int detect, + int opflags) +{ + return futex(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, opflags); +} + +/** + * futex_unlock_pi() - release uaddr as a PI mutex, waking the top waiter + */ +static inline int +futex_unlock_pi(futex_t *uaddr, int opflags) +{ + return futex(uaddr, FUTEX_UNLOCK_PI, 0, NULL, NULL, 0, opflags); +} + +/** + * futex_wake_op() - FIXME: COME UP WITH A GOOD ONE LINE DESCRIPTION + */ +static inline int +futex_wake_op(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_wake2, + int wake_op, int opflags) +{ + return futex(uaddr, FUTEX_WAKE_OP, nr_wake, nr_wake2, uaddr2, wake_op, + opflags); +} + +/** + * futex_requeue() - requeue without expected value comparison, deprecated + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + * + * Due to its inherently racy implementation, futex_requeue() is deprecated in + * favor of futex_cmp_requeue(). + */ +static inline int +futex_requeue(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_requeue, + int opflags) +{ + return futex(uaddr, FUTEX_REQUEUE, nr_wake, nr_requeue, uaddr2, 0, + opflags); +} + +/** + * futex_cmp_requeue() - requeue tasks from uaddr to uaddr2 + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + */ +static inline int +futex_cmp_requeue(futex_t *uaddr, futex_t val, futex_t *uaddr2, int nr_wake, + int nr_requeue, int opflags) +{ + return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2, + val, opflags); +} + +/** + * futex_wait_requeue_pi() - block on uaddr and prepare to requeue to uaddr2 + * @uaddr: non-PI futex source + * @uaddr2: PI futex target + * + * This is the first half of the requeue_pi mechanism. It shall always be + * paired with futex_cmp_requeue_pi(). + */ +static inline int +futex_wait_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, + struct timespec *timeout, int opflags) +{ + return futex(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2, 0, + opflags); +} + +/** + * futex_cmp_requeue_pi() - requeue tasks from uaddr to uaddr2 (PI aware) + * @uaddr: non-PI futex source + * @uaddr2: PI futex target + * @nr_wake: wake up to this many tasks + * @nr_requeue: requeue up to this many tasks + */ +static inline int +futex_cmp_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, int nr_wake, + int nr_requeue, int opflags) +{ + return futex(uaddr, FUTEX_CMP_REQUEUE_PI, nr_wake, nr_requeue, uaddr2, val, + opflags); +} + +/** + * futex_cmpxchg() - atomic compare and exchange + * @uaddr: The address of the futex to be modified + * @oldval: The expected value of the futex + * @newval: The new value to try and assign the futex + * + * Implement cmpxchg using gcc atomic builtins. + * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html + * + * Return the old futex value. + */ +static inline u_int32_t +futex_cmpxchg(futex_t *uaddr, u_int32_t oldval, u_int32_t newval) +{ + return __sync_val_compare_and_swap(uaddr, oldval, newval); +} + +/** + * futex_dec() - atomic decrement of the futex value + * @uaddr: The address of the futex to be modified + * + * Return the new futex value. + */ +static inline u_int32_t +futex_dec(futex_t *uaddr) +{ + return __sync_sub_and_fetch(uaddr, 1); +} + +/** + * futex_inc() - atomic increment of the futex value + * @uaddr: the address of the futex to be modified + * + * Return the new futex value. + */ +static inline u_int32_t +futex_inc(futex_t *uaddr) +{ + return __sync_add_and_fetch(uaddr, 1); +} + +/** + * futex_set() - atomic decrement of the futex value + * @uaddr: the address of the futex to be modified + * @newval: New value for the atomic_t + * + * Return the new futex value. + */ +static inline u_int32_t +futex_set(futex_t *uaddr, u_int32_t newval) +{ + *uaddr = newval; + return newval; +} + +#endif diff --git a/tools/testing/selftests/futex/include/logging.h b/tools/testing/selftests/futex/include/logging.h new file mode 100644 index 0000000..3220b90 --- /dev/null +++ b/tools/testing/selftests/futex/include/logging.h @@ -0,0 +1,147 @@ +/****************************************************************************** + * + * Copyright © International Business Machines Corp., 2009 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DESCRIPTION + * Glibc independent futex library for testing kernel functionality. + * + * AUTHOR + * Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> + * + * HISTORY + * 2009-Nov-6: Initial version by Darren Hart <dvhart-VuQAYsv1560/9W2qTSuDoA@public.gmane.org.com> + * + *****************************************************************************/ + +#ifndef _LOGGING_H +#define _LOGGING_H + +#include <string.h> +#include <unistd.h> +#include <linux/futex.h> + +/* + * Define PASS, ERROR, and FAIL strings with and without color escape + * sequences, default to no color. + */ +#define ESC 0x1B, '[' +#define BRIGHT '1' +#define GREEN '3', '2' +#define YELLOW '3', '3' +#define RED '3', '1' +#define ESCEND 'm' +#define BRIGHT_GREEN ESC, BRIGHT, ';', GREEN, ESCEND +#define BRIGHT_YELLOW ESC, BRIGHT, ';', YELLOW, ESCEND +#define BRIGHT_RED ESC, BRIGHT, ';', RED, ESCEND +#define RESET_COLOR ESC, '0', 'm' +static const char PASS_COLOR[] = {BRIGHT_GREEN, ' ', 'P', 'A', 'S', 'S', RESET_COLOR, 0}; +static const char ERROR_COLOR[] = {BRIGHT_YELLOW, 'E', 'R', 'R', 'O', 'R', RESET_COLOR, 0}; +static const char FAIL_COLOR[] = {BRIGHT_RED, ' ', 'F', 'A', 'I', 'L', RESET_COLOR, 0}; +static const char INFO_NORMAL[] = " INFO"; +static const char PASS_NORMAL[] = " PASS"; +static const char ERROR_NORMAL[] = "ERROR"; +static const char FAIL_NORMAL[] = " FAIL"; +char *INFO = INFO_NORMAL; +char *PASS = PASS_NORMAL; +char *ERROR = ERROR_NORMAL; +char *FAIL = FAIL_NORMAL; + +/* Verbosity setting for INFO messages */ +#define VQUIET 0 +#define VCRITICAL 1 +#define VINFO 2 +#define VMAX VINFO +int _verbose = VCRITICAL; + +/* Functional test return codes */ +#define RET_PASS 0 +#define RET_ERROR -1 +#define RET_FAIL -2 + +/** + * log_color() - Use colored output for PASS, ERROR, and FAIL strings + * @use_color: use color (1) or not (0) + */ +void log_color(int use_color) +{ + if (use_color) { + PASS = PASS_COLOR; + ERROR = ERROR_COLOR; + FAIL = FAIL_COLOR; + } else { + PASS = PASS_NORMAL; + ERROR = ERROR_NORMAL; + FAIL = FAIL_NORMAL; + } +} + +/** + * log_verbosity() - Set verbosity of test output + * @verbose: Enable (1) verbose output or not (0) + * + * Currently setting verbose=1 will enable INFO messages and 0 will disable + * them. FAIL and ERROR messages are always displayed. + */ +void log_verbosity(int level) +{ + if (level > VMAX) + level = VMAX; + else if (level < 0) + level = 0; + _verbose = level; +} + +/** + * print_result() - Print standard PASS | ERROR | FAIL results + * @ret: the return value to be considered: 0 | RET_ERROR | RET_FAIL + * + * print_result() is primarily intended for functional tests. + */ +void print_result(int ret) +{ + char *result = "Unknown return code"; + + switch (ret) { + case RET_PASS: + result = PASS; + break; + case RET_ERROR: + result = ERROR; + break; + case RET_FAIL: + result = FAIL; + break; + } + printf("Result: %s\n", result); +} + +/* log level macros */ +#define info(message, vargs...) \ +do { \ + if (_verbose >= VINFO) \ + fprintf(stderr, "\t%s: "message, INFO, ##vargs); \ +} while (0) + +#define error(message, err, args...) \ +do { \ + if (_verbose >= VCRITICAL) {\ + if (err) \ + fprintf(stderr, "\t%s: %s: "message, \ + ERROR, strerror(err), ##args); \ + else \ + fprintf(stderr, "\t%s: "message, ERROR, ##args); \ + } \ +} while (0) + +#define fail(message, args...) \ +do { \ + if (_verbose >= VCRITICAL) \ + fprintf(stderr, "\t%s: "message, FAIL, ##args); \ +} while (0) + +#endif diff --git a/tools/testing/selftests/futex/run.sh b/tools/testing/selftests/futex/run.sh new file mode 100755 index 0000000..4126312 --- /dev/null +++ b/tools/testing/selftests/futex/run.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +############################################################################### +# +# Copyright © International Business Machines Corp., 2009 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DESCRIPTION +# Run all tests under the functional, performance, and stress directories. +# Format and summarize the results. +# +# AUTHOR +# Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> +# +# HISTORY +# 2009-Nov-9: Initial version by Darren Hart <dvhart-VuQAYsv1562uYJLRA6qg5Q@public.gmane.orgcom> +# +############################################################################### + +# Test for a color capable shell and pass the result to the subdir scripts +USE_COLOR=0 +tput setf 7 +if [ $? -eq 0 ]; then + USE_COLOR=1 + tput sgr0 +fi +export USE_COLOR + +(cd functional; ./run.sh) -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <597c9eabcac5da9456d6cfd6de9117591d73385e.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <597c9eabcac5da9456d6cfd6de9117591d73385e.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> @ 2015-05-06 17:28 ` Shuah Khan [not found] ` <554A4F3A.7020504-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> 0 siblings, 1 reply; 31+ messages in thread From: Shuah Khan @ 2015-05-06 17:28 UTC (permalink / raw) To: Darren Hart, Linux Kernel Mailing List Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro, Shuah Khan On 03/27/2015 04:17 PM, Darren Hart wrote: > The futextest testsuite [1] provides functional, stress, and > performance tests for the various futex op codes. Those tests will be of > more use to futex developers if they are included with the kernel > source. > > Copy the core infrastructure and the functional tests into selftests. > Remove reference to the performance and stress tests from the > contributed sources. > > Remove the Free Software Foundation address paragraph from all > contributed files to avoid checkpatch complaints. > > A future effort will explore moving the performance and stress tests > into the kernel. > > 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git > > Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> > Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> > Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> > Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> > Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> > Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> > Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Sorry it took so long. I am just about to apply these to linux-kselftest next and ran into checkpatch errors on this patch. Could you clean them and resend this patch. Other patches in this series are good. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978 ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <554A4F3A.7020504-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>]
* Re: [PATCH 1/5] selftests: Add futex functional tests [not found] ` <554A4F3A.7020504-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> @ 2015-05-06 18:04 ` Darren Hart 0 siblings, 0 replies; 31+ messages in thread From: Darren Hart @ 2015-05-06 18:04 UTC (permalink / raw) To: Shuah Khan, Linux Kernel Mailing List Cc: linux-api-u79uwXL29TY76Z2rM5mHXA, Ingo Molnar, Peter Zijlstra, Thomas Gleixner, Davidlohr Bueso, KOSAKI Motohiro On 5/6/15, 10:28 AM, "Shuah Khan" <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: >On 03/27/2015 04:17 PM, Darren Hart wrote: >> The futextest testsuite [1] provides functional, stress, and >> performance tests for the various futex op codes. Those tests will be of >> more use to futex developers if they are included with the kernel >> source. >> >> Copy the core infrastructure and the functional tests into selftests. >> Remove reference to the performance and stress tests from the >> contributed sources. >> >> Remove the Free Software Foundation address paragraph from all >> contributed files to avoid checkpatch complaints. >> >> A future effort will explore moving the performance and stress tests >> into the kernel. >> >> 1. http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git >> >> Cc: Shuah Khan <shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> >> Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >> Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> >> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> >> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> >> Cc: Davidlohr Bueso <dave-h16yJtLeMjHk1uMJSBkQmQ@public.gmane.org> >> Cc: KOSAKI Motohiro <kosaki.motohiro-+CUm20s59erQFUHtdCDX3A@public.gmane.org> >> Signed-off-by: Darren Hart <dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > >Sorry it took so long. I am just about to apply these to linux-kselftest >next and ran into checkpatch errors on this patch. *GASP* How humiliating.... Of course. Something by late tonight. -- Darren Hart Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2015-05-13 3:34 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-08 22:09 [GIT PULL v2] selftest: Add futex functional tests Darren Hart
2015-05-08 22:09 ` [PATCH 1/5] selftests: " Darren Hart
[not found] ` <cover.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
[not found] ` <57d921b1c30e8258ca4b2f55637424527317e92f.1431121818.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-08 22:09 ` [PATCH 2/5] selftest/futex: Update Makefile to use lib.mk Darren Hart
2015-05-08 22:09 ` [PATCH 4/5] selftest: Add futex tests to the top-level Makefile Darren Hart
2015-05-08 22:09 ` [PATCH 5/5] kselftest: Add exit code defines Darren Hart
2015-05-11 18:06 ` [PATCH 1/5] selftests: Add futex functional tests Shuah Khan
2015-05-11 18:22 ` Darren Hart
2015-05-11 18:55 ` Shuah Khan
[not found] ` <5550FB2C.1000403-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-11 19:47 ` Darren Hart
[not found] ` <D17653E0.CC29F%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-11 20:51 ` Shuah Khan
[not found] ` <5551164E.5080409-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-11 21:50 ` Darren Hart
[not found] ` <D17670E1.CC354%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-11 22:21 ` Shuah Khan
[not found] ` <55512B54.50304-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-11 22:21 ` Shuah Khan
[not found] ` <55512B86.2040900-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-11 23:07 ` Darren Hart
[not found] ` <D1767EA1.CC3DA%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-11 23:23 ` John Stultz
2015-05-12 10:02 ` Cyril Hrubis
[not found] ` <20150512100256.GA5122-J5syqNJeCN4b1SvskN2V4Q@public.gmane.org>
2015-05-12 16:10 ` Darren Hart
[not found] ` <D1777231.CC5D0%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-12 16:47 ` Shuah Khan
[not found] ` <55522E92.8090609-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-12 17:05 ` Darren Hart
[not found] ` <20150512170544.GA30184-JIrPihikzLEQaXB9iyTzyw@public.gmane.org>
2015-05-12 17:14 ` Shuah Khan
2015-05-12 20:05 ` Cyril Hrubis
2015-05-12 20:15 ` Darren Hart
[not found] ` <D177AD46.CC848%dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-12 20:40 ` Shuah Khan
[not found] ` <55526544.90909-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-12 20:54 ` Darren Hart
2015-05-12 21:17 ` Shuah Khan
2015-05-12 21:21 ` Shuah Khan
[not found] ` <55526EC8.30707-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-13 3:34 ` Darren Hart
2015-05-08 22:09 ` [PATCH 3/5] selftest/futex: Increment ksft pass and fail counters Darren Hart
-- strict thread matches above, loose matches on Subject: below --
2015-03-27 22:17 [GIT PULL] selftest: Add futex functional tests Darren Hart
[not found] ` <cover.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-03-27 22:17 ` [PATCH 1/5] selftests: " Darren Hart
[not found] ` <597c9eabcac5da9456d6cfd6de9117591d73385e.1427493640.git.dvhart-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-06 17:28 ` Shuah Khan
[not found] ` <554A4F3A.7020504-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org>
2015-05-06 18:04 ` Darren Hart
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).