* [PATCH v2] selftests/timens: handle a case when alarm clocks are not supported
2020-04-15 6:18 [PATCH] selftests/timens: handle a case when alarm clocks are not supported Andrei Vagin
@ 2020-04-17 9:28 ` Andrei Vagin
2020-05-20 11:55 ` [PATCH] " Vincenzo Frascino
1 sibling, 0 replies; 3+ messages in thread
From: Andrei Vagin @ 2020-04-17 9:28 UTC (permalink / raw)
To: Shuah Khan, Dmitry Safonov
Cc: linux-kernel, linux-kselftest, Thomas Gleixner, Andrei Vagin,
Vincenzo Frascino
This can happen if a testing node doesn't have RTC (real time clock)
hardware or it doesn't support alarms.
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
v2: fix timer.c and timerfd.c too.
tools/testing/selftests/timens/clock_nanosleep.c | 2 +-
tools/testing/selftests/timens/timens.c | 2 +-
tools/testing/selftests/timens/timens.h | 13 ++++++++++++-
tools/testing/selftests/timens/timer.c | 5 +++++
tools/testing/selftests/timens/timerfd.c | 5 +++++
5 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/timens/clock_nanosleep.c b/tools/testing/selftests/timens/clock_nanosleep.c
index 8e7b7c72ef65..72d41b955fb2 100644
--- a/tools/testing/selftests/timens/clock_nanosleep.c
+++ b/tools/testing/selftests/timens/clock_nanosleep.c
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
ksft_set_plan(4);
- check_config_posix_timers();
+ check_supported_timers();
if (unshare_timens())
return 1;
diff --git a/tools/testing/selftests/timens/timens.c b/tools/testing/selftests/timens/timens.c
index 098be7c83be3..52b6a1185f52 100644
--- a/tools/testing/selftests/timens/timens.c
+++ b/tools/testing/selftests/timens/timens.c
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
nscheck();
- check_config_posix_timers();
+ check_supported_timers();
ksft_set_plan(ARRAY_SIZE(clocks) * 2);
diff --git a/tools/testing/selftests/timens/timens.h b/tools/testing/selftests/timens/timens.h
index e09e7e39bc52..d4fc52d47146 100644
--- a/tools/testing/selftests/timens/timens.h
+++ b/tools/testing/selftests/timens/timens.h
@@ -14,15 +14,26 @@
#endif
static int config_posix_timers = true;
+static int config_alarm_timers = true;
-static inline void check_config_posix_timers(void)
+static inline void check_supported_timers(void)
{
+ struct timespec ts;
+
if (timer_create(-1, 0, 0) == -1 && errno == ENOSYS)
config_posix_timers = false;
+
+ if (clock_gettime(CLOCK_BOOTTIME_ALARM, &ts) == -1 && errno == EINVAL)
+ config_alarm_timers = false;
}
static inline bool check_skip(int clockid)
{
+ if (!config_alarm_timers && clockid == CLOCK_BOOTTIME_ALARM) {
+ ksft_test_result_skip("CLOCK_BOOTTIME_ALARM isn't supported\n");
+ return true;
+ }
+
if (config_posix_timers)
return false;
diff --git a/tools/testing/selftests/timens/timer.c b/tools/testing/selftests/timens/timer.c
index 96dba11ebe44..5e7f0051bd7b 100644
--- a/tools/testing/selftests/timens/timer.c
+++ b/tools/testing/selftests/timens/timer.c
@@ -22,6 +22,9 @@ int run_test(int clockid, struct timespec now)
timer_t fd;
int i;
+ if (check_skip(clockid))
+ return 0;
+
for (i = 0; i < 2; i++) {
struct sigevent sevp = {.sigev_notify = SIGEV_NONE};
int flags = 0;
@@ -74,6 +77,8 @@ int main(int argc, char *argv[])
nscheck();
+ check_supported_timers();
+
ksft_set_plan(3);
clock_gettime(CLOCK_MONOTONIC, &mtime_now);
diff --git a/tools/testing/selftests/timens/timerfd.c b/tools/testing/selftests/timens/timerfd.c
index eff1ec5ff215..9edd43d6b2c1 100644
--- a/tools/testing/selftests/timens/timerfd.c
+++ b/tools/testing/selftests/timens/timerfd.c
@@ -28,6 +28,9 @@ int run_test(int clockid, struct timespec now)
long long elapsed;
int fd, i;
+ if (check_skip(clockid))
+ return 0;
+
if (tclock_gettime(clockid, &now))
return pr_perror("clock_gettime(%d)", clockid);
@@ -81,6 +84,8 @@ int main(int argc, char *argv[])
nscheck();
+ check_supported_timers();
+
ksft_set_plan(3);
clock_gettime(CLOCK_MONOTONIC, &mtime_now);
--
2.24.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] selftests/timens: handle a case when alarm clocks are not supported
2020-04-15 6:18 [PATCH] selftests/timens: handle a case when alarm clocks are not supported Andrei Vagin
2020-04-17 9:28 ` [PATCH v2] " Andrei Vagin
@ 2020-05-20 11:55 ` Vincenzo Frascino
1 sibling, 0 replies; 3+ messages in thread
From: Vincenzo Frascino @ 2020-05-20 11:55 UTC (permalink / raw)
To: Andrei Vagin, Shuah Khan
Cc: linux-kernel, Dmitry Safonov, linux-kselftest, Thomas Gleixner
Hi Andrei,
thanks for this.
On 4/15/20 7:18 AM, Andrei Vagin wrote:
> This can happen if a testing node doesn't have RTC (real time clock)
> hardware or it doesn't support alarms.
>
Could you please add the "Reported-by:" tag and the "Fixes:" one?
With this:
Acked-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Signed-off-by: Andrei Vagin <avagin@gmail.com>
> ---
> tools/testing/selftests/timens/clock_nanosleep.c | 2 +-
> tools/testing/selftests/timens/timens.c | 2 +-
> tools/testing/selftests/timens/timens.h | 13 ++++++++++++-
> 3 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/timens/clock_nanosleep.c b/tools/testing/selftests/timens/clock_nanosleep.c
> index 8e7b7c72ef65..72d41b955fb2 100644
> --- a/tools/testing/selftests/timens/clock_nanosleep.c
> +++ b/tools/testing/selftests/timens/clock_nanosleep.c
> @@ -119,7 +119,7 @@ int main(int argc, char *argv[])
>
> ksft_set_plan(4);
>
> - check_config_posix_timers();
> + check_supported_timers();
>
> if (unshare_timens())
> return 1;
> diff --git a/tools/testing/selftests/timens/timens.c b/tools/testing/selftests/timens/timens.c
> index 559d26e21ba0..07feebe8e53e 100644
> --- a/tools/testing/selftests/timens/timens.c
> +++ b/tools/testing/selftests/timens/timens.c
> @@ -156,7 +156,7 @@ int main(int argc, char *argv[])
>
> nscheck();
>
> - check_config_posix_timers();
> + check_supported_timers();
>
> ksft_set_plan(ARRAY_SIZE(clocks) * 2);
>
> diff --git a/tools/testing/selftests/timens/timens.h b/tools/testing/selftests/timens/timens.h
> index e09e7e39bc52..d4fc52d47146 100644
> --- a/tools/testing/selftests/timens/timens.h
> +++ b/tools/testing/selftests/timens/timens.h
> @@ -14,15 +14,26 @@
> #endif
>
> static int config_posix_timers = true;
> +static int config_alarm_timers = true;
>
> -static inline void check_config_posix_timers(void)
> +static inline void check_supported_timers(void)
> {
> + struct timespec ts;
> +
> if (timer_create(-1, 0, 0) == -1 && errno == ENOSYS)
> config_posix_timers = false;
> +
> + if (clock_gettime(CLOCK_BOOTTIME_ALARM, &ts) == -1 && errno == EINVAL)
> + config_alarm_timers = false;
> }
>
> static inline bool check_skip(int clockid)
> {
> + if (!config_alarm_timers && clockid == CLOCK_BOOTTIME_ALARM) {
> + ksft_test_result_skip("CLOCK_BOOTTIME_ALARM isn't supported\n");
> + return true;
> + }
> +
> if (config_posix_timers)
> return false;
>
>
--
Regards,
Vincenzo
^ permalink raw reply [flat|nested] 3+ messages in thread