Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1543370
| From | Borislav Petkov <bp@suse.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: Can't boot as Xen dom0 due to commit fe055896 |
| Date | 2016-12-16 12:10 +0100 |
| Message-ID | <sOYyJ-2L0-3@gated-at.bofh.it> (permalink) |
| References | (5 earlier) <sOV7P-oP-1@gated-at.bofh.it> <sOWGD-1t7-53@gated-at.bofh.it> <sOWZX-1DO-1@gated-at.bofh.it> <sOXjj-1Nk-1@gated-at.bofh.it> <sOXCG-29N-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Fri, Dec 16, 2016 at 11:00:29AM +0100, Juergen Gross wrote:
> Should work. I'm happy to test any patch. :-)
I'm happy that you're happy to! :-)
Let's try this below.
Thanks!
---
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index 6996413c78c3..c4bb2f7169f6 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -44,7 +44,7 @@
#define DRIVER_VERSION "2.2"
static struct microcode_ops *microcode_ops;
-static bool dis_ucode_ldr;
+static bool dis_ucode_ldr = true;
LIST_HEAD(microcode_cache);
@@ -76,6 +76,7 @@ struct cpu_info_ctx {
static bool __init check_loader_disabled_bsp(void)
{
static const char *__dis_opt_str = "dis_ucode_ldr";
+ u32 a, b, c, d;
#ifdef CONFIG_X86_32
const char *cmdline = (const char *)__pa_nodebug(boot_command_line);
@@ -88,8 +89,23 @@ static bool __init check_loader_disabled_bsp(void)
bool *res = &dis_ucode_ldr;
#endif
- if (cmdline_find_option_bool(cmdline, option))
- *res = true;
+ if (!have_cpuid_p())
+ return *res;
+
+ a = 1;
+ c = 0;
+ native_cpuid(&a, &b, &c, &d);
+
+ /*
+ * CPUID(1).ECX[31]: reserved for hypervisor use. This is still not
+ * completely accurate as xen pv guests don't see that CPUID bit set but
+ * that's good enough as they don't land on the BSP path anyway.
+ */
+ if (c & BIT(31))
+ return *res;
+
+ if (cmdline_find_option_bool(cmdline, option) <= 0)
+ *res = false;
return *res;
}
@@ -121,9 +137,6 @@ void __init load_ucode_bsp(void)
if (check_loader_disabled_bsp())
return;
- if (!have_cpuid_p())
- return;
-
vendor = x86_cpuid_vendor();
family = x86_cpuid_family();
@@ -157,9 +170,6 @@ void load_ucode_ap(void)
if (check_loader_disabled_ap())
return;
- if (!have_cpuid_p())
- return;
-
vendor = x86_cpuid_vendor();
family = x86_cpuid_family();
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-15 17:20 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 17:50 +0100
Re: [Xen-devel] Can't boot as Xen dom0 due to commit fe055896 "Jan Beulich" <JBeulich@suse.com> - 2016-12-15 18:00 +0100
Re: [Xen-devel] Can't boot as Xen dom0 due to commit fe055896 Andrew Cooper <andrew.cooper3@citrix.com> - 2016-12-15 18:10 +0100
Re: [Xen-devel] Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 18:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-15 18:00 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 18:20 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-15 18:30 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 18:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-15 20:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-15 20:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 21:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-16 00:00 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 00:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-16 05:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 10:10 +0100
Re: [Xen-devel] Can't boot as Xen dom0 due to commit fe055896 Andrew Cooper <andrew.cooper3@citrix.com> - 2016-12-16 10:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Henrique de Moraes Holschuh <hmh@hmh.eng.br> - 2016-12-16 05:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-15 20:50 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-16 08:30 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 10:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-16 10:30 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 10:50 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-16 11:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 12:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-16 13:20 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 13:50 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 14:10 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-16 15:40 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Borislav Petkov <bp@suse.de> - 2016-12-16 16:20 +0100
Re: Can't boot as Xen dom0 due to commit fe055896 Juergen Gross <jgross@suse.com> - 2016-12-15 18:30 +0100
csiph-web