Fix AUX tasks from being dropped by Litmus.

1 files changed, 12 insertions, 30 deletions

diff --git a/litmus/edf_common.c b/litmus/edf_common.c
index ef22eb93dbf3..32ee5f464ef8 100644
--- a/litmus/edf_common.c
+++ b/litmus/edf_common.c
@@ -259,8 +259,6 @@ klmirqd_tie_break:
                 }
                 pid_break = (fhash == shash);
 #else
-
-
                 /* CONFIG_EDF_PID_TIE_BREAK */
                 pid_break = 1; // fall through to tie-break by pid;
 #endif
@@ -271,31 +269,27 @@ klmirqd_tie_break:
                                 return 1;
                         }
                         else if (first_task->pid == second_task->pid) {
+                                /* there is inheritance going on. consider inheritors. */
 #ifdef CONFIG_LITMUS_SOFTIRQD
-                                if (tsk_rt(first_task)->is_interrupt_thread < tsk_rt(second_task)->is_interrupt_thread) {
+                                /* non-interrupt thread gets prio */
+                                if (!tsk_rt(first)->is_interrupt_thread && tsk_rt(second)->is_interrupt_thread) {
                                         return 1;
                                 }
-                                else if (tsk_rt(first_task)->is_interrupt_thread == tsk_rt(second_task)->is_interrupt_thread) {
+                                else if (tsk_rt(first)->is_interrupt_thread == tsk_rt(second)->is_interrupt_thread) {
 #endif
 
 #if defined(CONFIG_REALTIME_AUX_TASK_PRIORITY_INHERITANCE)
-                                if (tsk_rt(first)->is_aux_task < tsk_rt(second)->is_aux_task) {
+                                /* non-aux thread gets prio */
+                                if (!tsk_rt(first)->is_aux_task && tsk_rt(second)->is_aux_task) {
                                         return 1;
                                 }
-                                else if (tsk_rt(first)->is_aux_task == tsk_rt(second)->is_aux_task) {
+                                else if (tsk_rt(first_task)->is_aux_task == tsk_rt(second_task)->is_aux_task) {
 #endif
-
-                                /* Something could be wrong if you get this far. */
-                                if (unlikely(tsk_rt(first)->inh_task == tsk_rt(second)->inh_task)) {
-                                        /* Both tasks have the same inherited priority.
-                                         * Likely in a bug-condition.
-                                     */
-                                        if (first->pid < second->pid) {
-                                                return 1;
-                                        }
-                                        else if (first->pid == second->pid) {
-                                                //WARN_ON(1);
-                                        }
+                                /* if both tasks inherit from the same task */
+                                if (tsk_rt(first)->inh_task == tsk_rt(second)->inh_task) {
+                                        /* TODO: Make a recurive call to edf_higher_prio,
+                                           comparing base priorities. */
+                                        return (first->pid < second->pid);
                                 }
                                 else {
                                         /* At least one task must inherit */
@@ -304,18 +298,6 @@ klmirqd_tie_break:
 
                                         /* The task withOUT the inherited priority wins. */
                                         if (tsk_rt(second)->inh_task) {
-                                                /*
-                                                 * common with aux tasks.
-                                                TRACE_CUR("unusual comparison: "
-                                                        "first = %s/%d  first_task = %s/%d  "
-                                                        "second = %s/%d  second_task = %s/%d\n",
-                                                        first->comm, first->pid,
-                                                        (tsk_rt(first)->inh_task) ? tsk_rt(first)->inh_task->comm : "(nil)",
-                                                        (tsk_rt(first)->inh_task) ? tsk_rt(first)->inh_task->pid : 0,
-                                                        second->comm, second->pid,
-                                                        (tsk_rt(second)->inh_task) ? tsk_rt(second)->inh_task->comm : "(nil)",
-                                                        (tsk_rt(second)->inh_task) ? tsk_rt(second)->inh_task->pid : 0);
-                                                 */
                                                 return 1;
                                         }
                                 }