1 files changed, 44 insertions, 4 deletions

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4971100a8cab..1b9a51a1bccb 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -32,12 +32,15 @@ struct hrtimer_cpu_base;
  *                                when starting the timer)
  * HRTIMER_MODE_SOFT            - Timer callback function will be executed in
  *                                soft irq context
+ * HRTIMER_MODE_HARD            - Timer callback function will be executed in
+ *                                hard irq context even on PREEMPT_RT.
  */
 enum hrtimer_mode {
         HRTIMER_MODE_ABS        = 0x00,
         HRTIMER_MODE_REL        = 0x01,
         HRTIMER_MODE_PINNED     = 0x02,
         HRTIMER_MODE_SOFT       = 0x04,
+        HRTIMER_MODE_HARD       = 0x08,
 
         HRTIMER_MODE_ABS_PINNED = HRTIMER_MODE_ABS | HRTIMER_MODE_PINNED,
         HRTIMER_MODE_REL_PINNED = HRTIMER_MODE_REL | HRTIMER_MODE_PINNED,
@@ -48,6 +51,11 @@ enum hrtimer_mode {
         HRTIMER_MODE_ABS_PINNED_SOFT = HRTIMER_MODE_ABS_PINNED | HRTIMER_MODE_SOFT,
         HRTIMER_MODE_REL_PINNED_SOFT = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_SOFT,
 
+        HRTIMER_MODE_ABS_HARD   = HRTIMER_MODE_ABS | HRTIMER_MODE_HARD,
+        HRTIMER_MODE_REL_HARD   = HRTIMER_MODE_REL | HRTIMER_MODE_HARD,
+
+        HRTIMER_MODE_ABS_PINNED_HARD = HRTIMER_MODE_ABS_PINNED | HRTIMER_MODE_HARD,
+        HRTIMER_MODE_REL_PINNED_HARD = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_HARD,
 };
 
 /*
@@ -101,6 +109,8 @@ enum hrtimer_restart {
  * @state:      state information (See bit values above)
  * @is_rel:     Set if the timer was armed relative
  * @is_soft:    Set if hrtimer will be expired in soft interrupt context.
+ * @is_hard:    Set if hrtimer will be expired in hard interrupt context
+ *              even on RT.
  *
  * The hrtimer structure must be initialized by hrtimer_init()
  */
@@ -112,6 +122,7 @@ struct hrtimer {
         u8                              state;
         u8                              is_rel;
         u8                              is_soft;
+        u8                              is_hard;
 };
 
 /**
@@ -183,6 +194,10 @@ enum  hrtimer_base_type {
  * @nr_retries:         Total number of hrtimer interrupt retries
  * @nr_hangs:           Total number of hrtimer interrupt hangs
  * @max_hang_time:      Maximum time spent in hrtimer_interrupt
+ * @softirq_expiry_lock: Lock which is taken while softirq based hrtimer are
+ *                       expired
+ * @timer_waiters:      A hrtimer_cancel() invocation waits for the timer
+ *                      callback to finish.
  * @expires_next:       absolute time of the next event, is required for remote
  *                      hrtimer enqueue; it is the total first expiry time (hard
  *                      and soft hrtimer are taken into account)
@@ -210,6 +225,10 @@ struct hrtimer_cpu_base {
         unsigned short                  nr_hangs;
         unsigned int                    max_hang_time;
 #endif
+#ifdef CONFIG_PREEMPT_RT
+        spinlock_t                      softirq_expiry_lock;
+        atomic_t                        timer_waiters;
+#endif
         ktime_t                         expires_next;
         struct hrtimer                  *next_timer;
         ktime_t                         softirq_expires_next;
@@ -341,16 +360,29 @@ extern void hrtimers_resume(void);
 
 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
 
+#ifdef CONFIG_PREEMPT_RT
+void hrtimer_cancel_wait_running(const struct hrtimer *timer);
+#else
+static inline void hrtimer_cancel_wait_running(struct hrtimer *timer)
+{
+        cpu_relax();
+}
+#endif
 
 /* Exported timer functions: */
 
 /* Initialize timers: */
 extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock,
                          enum hrtimer_mode mode);
+extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,
+                                 enum hrtimer_mode mode);
 
 #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
 extern void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t which_clock,
                                   enum hrtimer_mode mode);
+extern void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
+                                          clockid_t clock_id,
+                                          enum hrtimer_mode mode);
 
 extern void destroy_hrtimer_on_stack(struct hrtimer *timer);
 #else
@@ -360,6 +392,14 @@ static inline void hrtimer_init_on_stack(struct hrtimer *timer,
 {
         hrtimer_init(timer, which_clock, mode);
 }
+
+static inline void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
+                                                 clockid_t clock_id,
+                                                 enum hrtimer_mode mode)
+{
+        hrtimer_init_sleeper(sl, clock_id, mode);
+}
+
 static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }
 #endif
 
@@ -395,6 +435,9 @@ static inline void hrtimer_start_expires(struct hrtimer *timer,
         hrtimer_start_range_ns(timer, soft, delta, mode);
 }
 
+void hrtimer_sleeper_start_expires(struct hrtimer_sleeper *sl,
+                                   enum hrtimer_mode mode);
+
 static inline void hrtimer_restart(struct hrtimer *timer)
 {
         hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
@@ -463,11 +506,8 @@ extern long hrtimer_nanosleep(const struct timespec64 *rqtp,
                               const enum hrtimer_mode mode,
                               const clockid_t clockid);
 
-extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
-                                 struct task_struct *tsk);
-
 extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
-                                                const enum hrtimer_mode mode);
+                                    const enum hrtimer_mode mode);
 extern int schedule_hrtimeout_range_clock(ktime_t *expires,
                                           u64 delta,
                                           const enum hrtimer_mode mode,