1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index bc9cfeaac8bd..500f5db0de0b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4470,6 +4470,8 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
         if (likely(cfs_rq->runtime_remaining > 0))
                 return;
 
+        if (cfs_rq->throttled)
+                return;
         /*
          * if we're unable to extend our runtime we resched so that the active
          * hierarchy can be throttled
@@ -4673,6 +4675,9 @@ static u64 distribute_cfs_runtime(struct cfs_bandwidth *cfs_b,
                 if (!cfs_rq_throttled(cfs_rq))
                         goto next;
 
+                /* By the above check, this should never be true */
+                SCHED_WARN_ON(cfs_rq->runtime_remaining > 0);
+
                 runtime = -cfs_rq->runtime_remaining + 1;
                 if (runtime > remaining)
                         runtime = remaining;