Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 48d13e483c5b450be451f78cc9cb43c0bdd6b7bb

Authored by Pavel Emelyanov
Committed by Linus Torvalds
1 parent 8dc86af006
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Don't operate with pid_t in rtmutex tester 

The proper behavior to store task's pid and get this task later is to get the
struct pid pointer and get the task with the pid_task() call.

Make it for rt_mutex_waiter->deadlock_task_pid field.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 10 additions and 4 deletions Side-by-side Diff

kernel/rtmutex-debug.c
Diff comments   View file @ 48d13e4
... ... @@ -130,7 +130,7 @@
130 130  
131 131 task = rt_mutex_owner(act_waiter->lock);
132 132 if (task && task != current) {
133   - act_waiter->deadlock_task_pid = task->pid;
  133 + act_waiter->deadlock_task_pid = get_pid(task_pid(task));
134 134 act_waiter->deadlock_lock = lock;
135 135 }
136 136 }
137 137  
... ... @@ -142,9 +142,12 @@
142 142 if (!waiter->deadlock_lock || !rt_trace_on)
143 143 return;
144 144  
145   - task = find_task_by_pid(waiter->deadlock_task_pid);
146   - if (!task)
  145 + rcu_read_lock();
  146 + task = pid_task(waiter->deadlock_task_pid, PIDTYPE_PID);
  147 + if (!task) {
  148 + rcu_read_unlock();
147 149 return;
  150 + }
148 151  
149 152 TRACE_OFF_NOLOCK();
150 153  
... ... @@ -173,6 +176,7 @@
173 176 current->comm, task_pid_nr(current));
174 177 dump_stack();
175 178 debug_show_all_locks();
  179 + rcu_read_unlock();
176 180  
177 181 printk("[ turning off deadlock detection."
178 182 "Please report this trace. ]\n\n");
179 183  
... ... @@ -203,10 +207,12 @@
203 207 memset(waiter, 0x11, sizeof(*waiter));
204 208 plist_node_init(&waiter->list_entry, MAX_PRIO);
205 209 plist_node_init(&waiter->pi_list_entry, MAX_PRIO);
  210 + waiter->deadlock_task_pid = NULL;
206 211 }
207 212  
208 213 void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter)
209 214 {
  215 + put_pid(waiter->deadlock_task_pid);
210 216 TRACE_WARN_ON(!plist_node_empty(&waiter->list_entry));
211 217 TRACE_WARN_ON(!plist_node_empty(&waiter->pi_list_entry));
212 218 TRACE_WARN_ON(waiter->task);
kernel/rtmutex_common.h
Diff comments   View file @ 48d13e4
... ... @@ -51,7 +51,7 @@
51 51 struct rt_mutex *lock;
52 52 #ifdef CONFIG_DEBUG_RT_MUTEXES
53 53 unsigned long ip;
54   - pid_t deadlock_task_pid;
  54 + struct pid *deadlock_task_pid;
55 55 struct rt_mutex *deadlock_lock;
56 56 #endif
57 57 };