Augment rt_task() with is_realtime()

Whenever the kernel checks for rt_task() to avoid delaying real-time
tasks, we want it to also not delay LITMUS^RT tasks.  Hence, most
calls to rt_task() should be matched by an equivalent call to
is_realtime().

Notably, this affects the implementations of select() and nanosleep(),
which use timer_slack_ns when setting up timers for non-real-time
tasks.

2 files changed, 9 insertions, 3 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 439cc63ad903..9073c0889192 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -41,6 +41,8 @@
 
 #include "internal.h"
 
+#include <litmus/litmus.h> /* for is_realtime() */
+
 /*
  * Sleep at most 200ms at a time in balance_dirty_pages().
  */
@@ -435,7 +437,7 @@ static void domain_dirty_limits(struct dirty_throttle_control *dtc)
         if (bg_thresh >= thresh)
                 bg_thresh = thresh / 2;
         tsk = current;
-        if (tsk->flags & PF_LESS_THROTTLE || rt_task(tsk)) {
+        if (tsk->flags & PF_LESS_THROTTLE || rt_task(tsk) || is_realtime(tsk)) {
                 bg_thresh += bg_thresh / 4 + global_wb_domain.dirty_limit / 32;
                 thresh += thresh / 4 + global_wb_domain.dirty_limit / 32;
         }
@@ -485,7 +487,7 @@ static unsigned long node_dirty_limit(struct pglist_data *pgdat)
         else
                 dirty = vm_dirty_ratio * node_memory / 100;
 
-        if (tsk->flags & PF_LESS_THROTTLE || rt_task(tsk))
+        if (tsk->flags & PF_LESS_THROTTLE || rt_task(tsk) || is_realtime(tsk))
                 dirty += dirty / 4;
 
         return dirty;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5b06fb385dd7..7c51a38d5d53 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -66,6 +66,9 @@
 #include <linux/memcontrol.h>
 
 #include <asm/sections.h>
+
+#include <litmus/litmus.h> /* for is_realtime() */
+
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
 #include "internal.h"
@@ -3365,7 +3368,8 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
                  * comment for __cpuset_node_allowed().
                  */
                 alloc_flags &= ~ALLOC_CPUSET;
-        } else if (unlikely(rt_task(current)) && !in_interrupt())
+        } else if (unlikely(rt_task(current) || is_realtime(current))
+                   && !in_interrupt())
                 alloc_flags |= ALLOC_HARDER;
 
 #ifdef CONFIG_CMA