Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 280a9ca5 authored by Dmitry Adamushko's avatar Dmitry Adamushko Committed by Ingo Molnar
Browse files

x86: fix resume (S2R) broken by Intel microcode module, on A110L 

Impact: fix deadlock

This is in response to the following bug report:

Bug-Entry       : http://bugzilla.kernel.org/show_bug.cgi?id=12100
Subject         : resume (S2R) broken by Intel microcode module, on A110L
Submitter       : Andreas Mohr <andi@lisas.de>
Date            : 2008-11-25 08:48 (19 days old)
Handled-By      : Dmitry Adamushko <dmitry.adamushko@gmail.com>

[ The deadlock scenario has been discovered by Andreas Mohr ]

I think I might have a logical explanation why the system:

  (http://bugzilla.kernel.org/show_bug.cgi?id=12100

)

might hang upon resuming, OTOH it should have likely hanged each and every time.

(1) possible deadlock in microcode_resume_cpu() if either 'if' section is
taken;

(2) now, I don't see it in spec. and can't experimentally verify it (newer
ucodes don't seem to be available for my Core2duo)... but logically-wise, I'd
think that when read upon resuming, the 'microcode revision' (MSR 0x8B) should
be back to its original one (we need to reload ucode anyway so it doesn't seem
logical if a cpu doesn't drop the version)... if so, the comparison with
memcmp() for the full 'struct cpu_signature' is wrong... and that's how one of
the aforementioned 'if' sections might have been triggered - leading to a
deadlock.

Obviously, in my tests I simulated loading/resuming with the ucode of the same
version (just to see that the file is loaded/re-loaded upon resuming) so this
issue has never popped up.

I'd appreciate if someone with an appropriate system might give a try to the
2nd patch (titled "fix a comparison && deadlock...").

In any case, the deadlock situation is a must-have fix.

Reported-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarDmitry Adamushko <dmitry.adamushko@gmail.com>
Tested-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: <stable@kernel.org>

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c9bc03ac

arch/x86/kernel/microcode_core.c

+14 −5
Original line number Diff line number Diff line
@@ -272,13 +272,18 @@ static struct attribute_group mc_attr_group = { 
	.name = "microcode",

};



static void microcode_fini_cpu(int cpu)

static void __microcode_fini_cpu(int cpu)

{

	struct ucode_cpu_info *uci = ucode_cpu_info + cpu;



	mutex_lock(&microcode_mutex);

	microcode_ops->microcode_fini_cpu(cpu);

	uci->valid = 0;

}



static void microcode_fini_cpu(int cpu)

{

	mutex_lock(&microcode_mutex);

	__microcode_fini_cpu(cpu);

	mutex_unlock(&microcode_mutex);

}
@@ -306,12 +311,16 @@ static int microcode_resume_cpu(int cpu) 
	 * to this cpu (a bit of paranoia):

	 */

	if (microcode_ops->collect_cpu_info(cpu, &nsig)) {

		microcode_fini_cpu(cpu);

		__microcode_fini_cpu(cpu);

		printk(KERN_ERR "failed to collect_cpu_info for resuming cpu #%d\n",

				cpu);

		return -1;

	}



	if (memcmp(&nsig, &uci->cpu_sig, sizeof(nsig))) {

		microcode_fini_cpu(cpu);

	if ((nsig.sig != uci->cpu_sig.sig) || (nsig.pf != uci->cpu_sig.pf)) {

		__microcode_fini_cpu(cpu);

		printk(KERN_ERR "cached ucode doesn't match the resuming cpu #%d\n",

				cpu);

		/* Should we look for a new ucode here? */

		return 1;

	}

arch/x86/kernel/microcode_intel.c

+6 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static DEFINE_SPINLOCK(microcode_update_lock); 
static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)

{

	struct cpuinfo_x86 *c = &cpu_data(cpu_num);

	unsigned long flags;

	unsigned int val[2];



	memset(csig, 0, sizeof(*csig));
@@ -174,11 +175,16 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) 
		csig->pf = 1 << ((val[1] >> 18) & 7);

	}



	/* serialize access to the physical write to MSR 0x79 */

	spin_lock_irqsave(&microcode_update_lock, flags);



	wrmsr(MSR_IA32_UCODE_REV, 0, 0);

	/* see notes above for revision 1.07.  Apparent chip bug */

	sync_core();

	/* get the current revision from MSR 0x8B */

	rdmsr(MSR_IA32_UCODE_REV, val[0], csig->rev);

	spin_unlock_irqrestore(&microcode_update_lock, flags);



	pr_debug("microcode: collect_cpu_info : sig=0x%x, pf=0x%x, rev=0x%x\n",

			csig->sig, csig->pf, csig->rev);