Skip to contentSkip to conversation

kthread_bind: don't wait in kthread_bind for presmp initcalls

PATCH In review Abbas Raza 1 participant 2 messages Sep 27, 2013 – Oct 30, 2013

lore
Share & tools
lore

Abbas Raza

author
#0 lore raw

PATCH 1/1 kthread_bind: don't wait in kthread_bind for presmp initcalls

From: Abbas Raza <[email protected]>

wait_task_inactive shouldn't be called in __kthread_bind for presmp initcalls the same way it is done in !SMP case.

more info here:
http://permalink.gmane.org/gmane.linux.kernel.embedded/4046

This patch improves boot time for pre-smp initcalls as given below

boot time with this patch:

calling spawn_ksoftirqd+0x0/0x30 @ 1
initcall spawn_ksoftirqd+0x0/0x30 returned 0 after 0 usecs

boot time without this patch:

calling spawn_ksoftirqd+0x0/0x30 @ 1
initcall spawn_ksoftirqd+0x0/0x30 returned 0 after 19531 usecs

---
 kernel/kthread.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
kernel/kthread.c +10 -4
index 760e86d..28b5c4b 100644
@@ -290,11 +290,17 @@ EXPORT_SYMBOL(kthread_create_on_node);
 
 static void __kthread_bind(struct task_struct *p, unsigned int cpu, long state)
 {
-	/* Must have done schedule() in kthread() before we set_task_cpu */
-	if (!wait_task_inactive(p, state)) {
-		WARN_ON(1);
-		return;
+	if (!((num_online_cpus() == 1) && !cpu)) {
+		/*
+		 * Must have done schedule() in kthread() before
+		 * we set_task_cpu
+		 */
+		if (!wait_task_inactive(p, state)) {
+			WARN_ON(1);
+			return;
+		}
 	}
+
 	/* It's safe because the task is inactive. */
 	do_set_cpus_allowed(p, cpumask_of(cpu));
 	p->flags |= PF_NO_SETAFFINITY;
Signature · 1 line
1.8.3.2
author
#1 lore raw

Hi,

Any thoughts here please?

Thanks .
Abbas Raza

Quoted 51 lines · Abbas Raza

From: Abbas Raza <[email protected]>

wait_task_inactive shouldn't be called in __kthread_bind for presmp initcalls the same way it is done in !SMP case.

more info here:
http://permalink.gmane.org/gmane.linux.kernel.embedded/4046

This patch improves boot time for pre-smp initcalls as given below

boot time with this patch:

calling spawn_ksoftirqd+0x0/0x30 @ 1
initcall spawn_ksoftirqd+0x0/0x30 returned 0 after 0 usecs

boot time without this patch:

calling spawn_ksoftirqd+0x0/0x30 @ 1
initcall spawn_ksoftirqd+0x0/0x30 returned 0 after 19531 usecs

---
 kernel/kthread.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
kernel/kthread.c +10 -4
index 760e86d..28b5c4b 100644
@@ -290,11 +290,17 @@ EXPORT_SYMBOL(kthread_create_on_node);
 
 static void __kthread_bind(struct task_struct *p, unsigned int cpu, long state)
 {
-	/* Must have done schedule() in kthread() before we set_task_cpu */
-	if (!wait_task_inactive(p, state)) {
-		WARN_ON(1);
-		return;
+	if (!((num_online_cpus() == 1) && !cpu)) {
+		/*
+		 * Must have done schedule() in kthread() before
+		 * we set_task_cpu
+		 */
+		if (!wait_task_inactive(p, state)) {
+			WARN_ON(1);
+			return;
+		}
 	}
+
 	/* It's safe because the task is inactive. */
 	do_set_cpus_allowed(p, cpumask_of(cpu));
 	p->flags |= PF_NO_SETAFFINITY;