Fix a BUG_ON(), and port another from Peter's changes

For background scheduled, migrating tasks without budget enforcement
enabled, we had a BUG_ON() statement that could errantly fire. Fix
it by checking that budget is enforced first. Also move it to a more
general location.

This also adds a BUG_ON() to link_task_to_cpu() to make sure that
containers are never linked to the wrong core.

1 files changed, 4 insertions, 2 deletions

diff --git a/litmus/sched_edfsc.c b/litmus/sched_edfsc.c
index 97cead918890..3cc4d4d65b08 100644
--- a/litmus/sched_edfsc.c
+++ b/litmus/sched_edfsc.c
@@ -253,6 +253,7 @@ static noinline void link_task_to_cpu(struct task_struct* linked,
 {
         BUG_ON(linked && !is_realtime(linked));
         BUG_ON(is_fixed(linked));
+        BUG_ON(is_container(linked) && task_rt(linked)->edfsc_params.id != entry->cpu);
 
         /* Currently linked task is set to be unlinked. */
         if (entry->linked)
@@ -755,10 +756,11 @@ static struct task_struct *edfsc_gschedule(struct task_struct *prev)
                         g_job_completion(entry->scheduled, !sleep);
                 else
                         unlink(entry->scheduled);
-                // Both branches of the above should clear entry->linked
-                BUG_ON(entry->linked && budget_exhausted(entry->linked));
         }
 
+        // We should have descheduled globally scheduled tasks without budget by now
+        BUG_ON(entry->linked && budget_enforced(entry->linked) && budget_exhausted(entry->linked));
+
         // Determine what to run next (set entry->linked)
         if (!entry->linked) {
                 struct task_struct* task = __take_ready(&gsched_domain);