Re: sleeping function called from invalid context at kernel/mutex.c

["Dmitry Adamushko" <dmitry.adamushko@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 782 bytes --]

err... I appologize for spamming. I've forgot to attach the fix.

>
>
>  On 02/10/2008, Dmitry Adamushko <dmitry.adamushko@gmail.com> wrote:
>  > On 02/10/2008, Ingo Molnar <mingo@elte.hu> wrote:
>  >  >
>  >  >  * Peter Oruba <peter.oruba@amd.com> wrote:
>  >  >
>  >  >  > microcode_update_cpu() is still there, being called from
>  >  >  > microcode_init_cpu() and mc_sysdev_resume().
>  >  >
>  >  >
>  >  > ah, microcode_update_cpu, not update_microcode_cpu. So yes, the problem
>  >  >  is still there with the latest code.
>  >
>
>  Right, I've been looking at the wrong tree. Please find the fix
>  enclosed. Compiles ok, shouldn't break anything else.
>
>   >
>   >         Ingo
>   >
>
>
>
>  --
>  Best regards,
>  Dmitry Adamushko
>


-- 
Best regards,
Dmitry Adamushko

[-- Attachment #2: ucode-fix.patch --]
[-- Type: application/octet-stream, Size: 1520 bytes --]


Subject: x86-microcode: update locking scheme

Fix the following "sleeping function called from invalid context" warning:

...
__might_sleep
mutex_lock_nested
microcode_update_cpu
mc_sysdev_resume
__sysdev_resume
sysdev_resume
device_power_up
...

Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>

diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 8db2eb5..936d8d5 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -324,10 +324,6 @@ void microcode_update_cpu(int cpu)
 	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 	int err = 0;
 
-	/* We should bind the task to the CPU */
-	BUG_ON(raw_smp_processor_id() != cpu);
-
-	mutex_lock(&microcode_mutex);
 	/*
 	 * Check if the system resume is in progress (uci->valid != NULL),
 	 * otherwise just request a firmware:
@@ -340,11 +336,8 @@ void microcode_update_cpu(int cpu)
 			err = microcode_ops->request_microcode_fw(cpu,
 					&microcode_pdev->dev);
 	}
-
 	if (!err)
 		microcode_ops->apply_microcode(cpu);
-
-	mutex_unlock(&microcode_mutex);
 }
 
 static void microcode_init_cpu(int cpu)
@@ -352,7 +345,13 @@ static void microcode_init_cpu(int cpu)
 	cpumask_t old = current->cpus_allowed;
 
 	set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
+	/* We should bind the task to the CPU */
+	BUG_ON(raw_smp_processor_id() != cpu);
+
+	mutex_lock(&microcode_mutex);
 	microcode_update_cpu(cpu);
+	mutex_unlock(&microcode_mutex);
+
 	set_cpus_allowed_ptr(current, &old);
 }