From: Konrad Rzeszutek Wilk <konrad@kernel.org>
To: xen-devel@lists.xenproject.org, andrew.cooper3@citrix.com,
david.vrabel@citrix.com, JBeulich@suse.com, keir.xen@gmail.com
Subject: [PATCH 2/2] microcode: Check whether the microcode is correct.
Date: Thu, 26 Sep 2013 21:09:50 -0400 [thread overview]
Message-ID: <1380244190-1953-3-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1380244190-1953-1-git-send-email-konrad.wilk@oracle.com>
We do the microcode code update in two steps - the presmp:
'microcode_presmp_init' and when CPUs are brought up:
'microcode_init'. The earlier performs the microcode update
on the BSP - but unfortunately it does not check whether the
update failed. Which means that we might try later to update
a incorrect payload on the rest of CPUs.
This patch handles this odd situation.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
[v2: Redid it as we are not doing scan and <index> at the same time]
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
xen/arch/x86/microcode.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index e6344cf..091d5d1 100644
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -418,6 +418,7 @@ static int __init microcode_presmp_init(void)
{
void *data;
size_t len;
+ int rc = 0;
if ( ucode_blob.size )
{
@@ -430,10 +431,24 @@ static int __init microcode_presmp_init(void)
data = ucode_mod_map(&ucode_mod);
}
if ( data )
- microcode_update_cpu(data, len);
+ rc = microcode_update_cpu(data, len);
+ else
+ rc = -ENOMEM;
if ( !ucode_blob.size )
ucode_mod_map(NULL);
+
+ if ( rc )
+ {
+ if ( ucode_blob.size )
+ {
+ xfree(ucode_blob.data);
+ ucode_blob.size = 0;
+ ucode_blob.data = NULL;
+ }
+ else
+ ucode_mod.mod_end = 0;
+ }
}
register_cpu_notifier(µcode_percpu_nfb);
--
1.7.7.6
next prev parent reply other threads:[~2013-09-27 1:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 1:09 [PATCH] microcode: Scan the multiboot payloads for cpio format microcode blob. (v3.3) Konrad Rzeszutek Wilk
2013-09-27 1:09 ` [PATCH 1/2] microcode: Scan the initramfs payload for microcode blob Konrad Rzeszutek Wilk
2013-09-27 1:09 ` Konrad Rzeszutek Wilk [this message]
2013-09-27 5:31 ` [PATCH] microcode: Scan the multiboot payloads for cpio format microcode blob. (v3.3) Keir Fraser
-- strict thread matches above, loose matches on Subject: below --
2013-09-25 15:29 [PATCH] microcode: Scan the multiboot payloads for cpio format microcode blob. (v3.2) Konrad Rzeszutek Wilk
2013-09-25 15:29 ` [PATCH 2/2] microcode: Check whether the microcode is correct Konrad Rzeszutek Wilk
2013-09-25 15:39 ` Andrew Cooper
2013-09-25 15:57 ` Konrad Rzeszutek Wilk
2013-09-25 12:57 [PATCH] microcode: Scan the multiboot payloads for cpio format microcode blob. (v3) Konrad Rzeszutek Wilk
2013-09-25 12:57 ` [PATCH 2/2] microcode: Check whether the microcode is correct Konrad Rzeszutek Wilk
2013-09-25 13:13 ` Andrew Cooper
2013-09-25 13:59 ` Konrad Rzeszutek Wilk
2013-09-25 14:10 ` Andrew Cooper
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=1380244190-1953-3-git-send-email-konrad.wilk@oracle.com \
--to=konrad@kernel.org \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=keir.xen@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).