Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer updates from Thomas Gleixner:
 "A rather largish update for everything time and timer related:

   - Cache footprint optimizations for both hrtimers and timer wheel

   - Lower the NOHZ impact on systems which have NOHZ or timer migration
     disabled at runtime.

   - Optimize run time overhead of hrtimer interrupt by making the clock
     offset updates smarter

   - hrtimer cleanups and removal of restrictions to tackle some
     problems in sched/perf

   - Some more leap second tweaks

   - Another round of changes addressing the 2038 problem

   - First step to change the internals of clock event devices by
     introducing the necessary infrastructure

   - Allow constant folding for usecs/msecs_to_jiffies()

   - The usual pile of clockevent/clocksource driver updates

  The hrtimer changes contain updates to sched, perf and x86 as they
  depend on them plus changes all over the tree to cleanup API changes
  and redundant code, which got copied all over the place.  The y2038
  changes touch s390 to remove the last non 2038 safe code related to
  boot/persistant clock"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
  clocksource: Increase dependencies of timer-stm32 to limit build wreckage
  timer: Minimize nohz off overhead
  timer: Reduce timer migration overhead if disabled
  timer: Stats: Simplify the flags handling
  timer: Replace timer base by a cpu index
  timer: Use hlist for the timer wheel hash buckets
  timer: Remove FIFO "guarantee"
  timers: Sanitize catchup_timer_jiffies() usage
  hrtimer: Allow hrtimer::function() to free the timer
  seqcount: Introduce raw_write_seqcount_barrier()
  seqcount: Rename write_seqcount_barrier()
  hrtimer: Fix hrtimer_is_queued() hole
  hrtimer: Remove HRTIMER_STATE_MIGRATE
  selftest: Timers: Avoid signal deadlock in leap-a-day
  timekeeping: Copy the shadow-timekeeper over the real timekeeper last
  clockevents: Check state instead of mode in suspend/resume path
  selftests: timers: Add leap-second timer edge testing to leap-a-day.c
  ntp: Do leapsecond adjustment in adjtimex read path
  time: Prevent early expiry of hrtimers[CLOCK_REALTIME] at the leap second edge
  ntp: Introduce and use SECS_PER_DAY macro instead of 86400
  ...

1 files changed, 73 insertions, 4 deletions

diff --git a/tools/testing/selftests/timers/leap-a-day.c b/tools/testing/selftests/timers/leap-a-day.c
index b8272e6c4b3b..fb46ad6ac92c 100644
--- a/tools/testing/selftests/timers/leap-a-day.c
+++ b/tools/testing/selftests/timers/leap-a-day.c
@@ -44,6 +44,7 @@
 #include <time.h>
 #include <sys/time.h>
 #include <sys/timex.h>
+#include <sys/errno.h>
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ -63,6 +64,9 @@ static inline int ksft_exit_fail(void)
 #define NSEC_PER_SEC 1000000000ULL
 #define CLOCK_TAI 11
 
+time_t next_leap;
+int error_found;
+
 /* returns 1 if a <= b, 0 otherwise */
 static inline int in_order(struct timespec a, struct timespec b)
 {
@@ -134,6 +138,35 @@ void handler(int unused)
         exit(0);
 }
 
+void sigalarm(int signo)
+{
+        struct timex tx;
+        int ret;
+
+        tx.modes = 0;
+        ret = adjtimex(&tx);
+
+        if (tx.time.tv_sec < next_leap) {
+                printf("Error: Early timer expiration! (Should be %ld)\n", next_leap);
+                error_found = 1;
+                printf("adjtimex: %10ld sec + %6ld us (%i)\t%s\n",
+                                        tx.time.tv_sec,
+                                        tx.time.tv_usec,
+                                        tx.tai,
+                                        time_state_str(ret));
+        }
+        if (ret != TIME_WAIT) {
+                printf("Error: Timer seeing incorrect NTP state? (Should be TIME_WAIT)\n");
+                error_found = 1;
+                printf("adjtimex: %10ld sec + %6ld us (%i)\t%s\n",
+                                        tx.time.tv_sec,
+                                        tx.time.tv_usec,
+                                        tx.tai,
+                                        time_state_str(ret));
+        }
+}
+
+
 /* Test for known hrtimer failure */
 void test_hrtimer_failure(void)
 {
@@ -144,12 +177,19 @@ void test_hrtimer_failure(void)
         clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &target, NULL);
         clock_gettime(CLOCK_REALTIME, &now);
 
-        if (!in_order(target, now))
+        if (!in_order(target, now)) {
                 printf("ERROR: hrtimer early expiration failure observed.\n");
+                error_found = 1;
+        }
 }
 
 int main(int argc, char **argv)
 {
+        timer_t tm1;
+        struct itimerspec its1;
+        struct sigevent se;
+        struct sigaction act;
+        int signum = SIGRTMAX;
         int settime = 0;
         int tai_time = 0;
         int insert = 1;
@@ -191,6 +231,12 @@ int main(int argc, char **argv)
         signal(SIGINT, handler);
         signal(SIGKILL, handler);
 
+        /* Set up timer signal handler: */
+        sigfillset(&act.sa_mask);
+        act.sa_flags = 0;
+        act.sa_handler = sigalarm;
+        sigaction(signum, &act, NULL);
+
         if (iterations < 0)
                 printf("This runs continuously. Press ctrl-c to stop\n");
         else
@@ -201,7 +247,7 @@ int main(int argc, char **argv)
                 int ret;
                 struct timespec ts;
                 struct timex tx;
-                time_t now, next_leap;
+                time_t now;
 
                 /* Get the current time */
                 clock_gettime(CLOCK_REALTIME, &ts);
@@ -251,10 +297,27 @@ int main(int argc, char **argv)
 
                 printf("Scheduling leap second for %s", ctime(&next_leap));
 
+                /* Set up timer */
+                printf("Setting timer for %ld -  %s", next_leap, ctime(&next_leap));
+                memset(&se, 0, sizeof(se));
+                se.sigev_notify = SIGEV_SIGNAL;
+                se.sigev_signo = signum;
+                se.sigev_value.sival_int = 0;
+                if (timer_create(CLOCK_REALTIME, &se, &tm1) == -1) {
+                        printf("Error: timer_create failed\n");
+                        return ksft_exit_fail();
+                }
+                its1.it_value.tv_sec = next_leap;
+                its1.it_value.tv_nsec = 0;
+                its1.it_interval.tv_sec = 0;
+                its1.it_interval.tv_nsec = 0;
+                timer_settime(tm1, TIMER_ABSTIME, &its1, NULL);
+
                 /* Wake up 3 seconds before leap */
                 ts.tv_sec = next_leap - 3;
                 ts.tv_nsec = 0;
 
+
                 while (clock_nanosleep(CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL))
                         printf("Something woke us up, returning to sleep\n");
 
@@ -276,6 +339,7 @@ int main(int argc, char **argv)
                 while (now < next_leap + 2) {
                         char buf[26];
                         struct timespec tai;
+                        int ret;
 
                         tx.modes = 0;
                         ret = adjtimex(&tx);
@@ -308,8 +372,13 @@ int main(int argc, char **argv)
                 /* Note if kernel has known hrtimer failure */
                 test_hrtimer_failure();
 
-                printf("Leap complete\n\n");
-
+                printf("Leap complete\n");
+                if (error_found) {
+                        printf("Errors observed\n");
+                        clear_time_state();
+                        return ksft_exit_fail();
+                }
+                printf("\n");
                 if ((iterations != -1) && !(--iterations))
                         break;
         }