From: Borislav Petkov <bp@suse.de>
To: Juergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
xen-devel <xen-devel@lists.xenproject.org>
Subject: Re: Can't boot as Xen dom0 due to commit fe055896
Date: Fri, 16 Dec 2016 11:45:05 +0100 [thread overview]
Message-ID: <20161216104505.lk3s7fc7brrnmbq3@pd.tnic> (raw)
In-Reply-To: <7ca8a9b9-e374-8052-6be3-d3eda78c891a@suse.com>
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)
--
next prev parent reply other threads:[~2016-12-16 11:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 16:12 Juergen Gross
2016-12-15 16:46 ` Borislav Petkov
2016-12-15 16:53 ` [Xen-devel] " Jan Beulich
2016-12-15 16:59 ` Andrew Cooper
2016-12-15 17:14 ` Borislav Petkov
2016-12-15 17:00 ` Boris Ostrovsky
2016-12-15 17:17 ` Borislav Petkov
2016-12-15 17:27 ` Boris Ostrovsky
2016-12-15 17:36 ` Borislav Petkov
2016-12-15 19:08 ` Boris Ostrovsky
2016-12-15 19:23 ` Borislav Petkov
2016-12-15 19:36 ` Boris Ostrovsky
2016-12-15 20:03 ` Borislav Petkov
2016-12-15 22:56 ` Boris Ostrovsky
2016-12-15 23:04 ` Borislav Petkov
2016-12-16 3:56 ` Boris Ostrovsky
2016-12-16 9:01 ` Borislav Petkov
2016-12-16 9:14 ` [Xen-devel] " Andrew Cooper
2016-12-16 4:14 ` Henrique de Moraes Holschuh
2016-12-16 7:28 ` Juergen Gross
2016-12-16 9:02 ` Borislav Petkov
2016-12-16 9:20 ` Juergen Gross
2016-12-16 9:43 ` Borislav Petkov
2016-12-16 10:00 ` Juergen Gross
2016-12-16 10:45 ` Borislav Petkov [this message]
2016-12-16 12:15 ` Juergen Gross
2016-12-16 12:19 ` Borislav Petkov
2016-12-16 13:07 ` Borislav Petkov
2016-12-16 14:40 ` Boris Ostrovsky
2016-12-16 15:17 ` Borislav Petkov
2016-12-15 17:06 ` Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161216104505.lk3s7fc7brrnmbq3@pd.tnic \
--to=bp@suse.de \
--cc=boris.ostrovsky@oracle.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®