From: Chao Gao <chao.gao@intel.com>
To: xen-devel@lists.xenproject.org
Cc: "Sergey Dyasli" <sergey.dyasli@citrix.com>,
"Ashok Raj" <ashok.raj@intel.com>, "Wei Liu" <wl@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Jan Beulich" <jbeulich@suse.com>,
"Chao Gao" <chao.gao@intel.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH v7 02/10] microcode/intel: extend microcode_update_match()
Date: Mon, 27 May 2019 16:31:23 +0800 [thread overview]
Message-ID: <1558945891-3015-3-git-send-email-chao.gao@intel.com> (raw)
Message-ID: <20190527083123.2ie7Y4joBCGwDCk75d6O78y4FfK1nalrC5oqOViVg30@z> (raw)
In-Reply-To: <1558945891-3015-1-git-send-email-chao.gao@intel.com>
to a more generic function. Then, this function can compare two given
microcodes' signature/revision as well. Comparing two microcodes is
used to update the global microcode cache (introduced by the later
patches in this series) when a new microcode is given.
Note that enum microcode_match_result will be used in common code
(aka microcode.c), it has been placed in the common header.
Signed-off-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes in v6:
- eliminate unnecessary type casting in microcode_update_match
- check if a patch has an extend header
Changes in v5:
- constify the extended_signature
- use named enum type for the return value of microcode_update_match
---
xen/arch/x86/microcode_intel.c | 48 +++++++++++++++++++----------------------
xen/include/asm-x86/microcode.h | 6 ++++++
2 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c
index 22fdeca..ecec83b 100644
--- a/xen/arch/x86/microcode_intel.c
+++ b/xen/arch/x86/microcode_intel.c
@@ -134,14 +134,28 @@ static int collect_cpu_info(unsigned int cpu_num, struct cpu_signature *csig)
return 0;
}
-static inline int microcode_update_match(
- unsigned int cpu_num, const struct microcode_header_intel *mc_header,
- int sig, int pf)
+static enum microcode_match_result microcode_update_match(
+ const struct microcode_header_intel *mc_header, unsigned int sig,
+ unsigned int pf, unsigned int rev)
{
- struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num);
+ const struct extended_sigtable *ext_header;
+ const struct extended_signature *ext_sig;
+ unsigned long data_size = get_datasize(mc_header);
+ unsigned int i;
+
+ if ( sigmatch(sig, mc_header->sig, pf, mc_header->pf) )
+ return (mc_header->rev > rev) ? NEW_UCODE : OLD_UCODE;
- return (sigmatch(sig, uci->cpu_sig.sig, pf, uci->cpu_sig.pf) &&
- (mc_header->rev > uci->cpu_sig.rev));
+ if ( get_totalsize(mc_header) == (data_size + MC_HEADER_SIZE) )
+ return MIS_UCODE;
+
+ ext_header = (const void *)(mc_header + 1) + data_size;
+ ext_sig = (const void *)(ext_header + 1);
+ for ( i = 0; i < ext_header->count; i++ )
+ if ( sigmatch(sig, ext_sig[i].sig, pf, ext_sig[i].pf) )
+ return (mc_header->rev > rev) ? NEW_UCODE : OLD_UCODE;
+
+ return MIS_UCODE;
}
static int microcode_sanity_check(void *mc)
@@ -243,31 +257,13 @@ static int get_matching_microcode(const void *mc, unsigned int cpu)
{
struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu);
const struct microcode_header_intel *mc_header = mc;
- const struct extended_sigtable *ext_header;
unsigned long total_size = get_totalsize(mc_header);
- int ext_sigcount, i;
- struct extended_signature *ext_sig;
void *new_mc;
- if ( microcode_update_match(cpu, mc_header,
- mc_header->sig, mc_header->pf) )
- goto find;
-
- if ( total_size <= (get_datasize(mc_header) + MC_HEADER_SIZE) )
+ if ( microcode_update_match(mc, uci->cpu_sig.sig, uci->cpu_sig.pf,
+ uci->cpu_sig.rev) != NEW_UCODE )
return 0;
- ext_header = mc + get_datasize(mc_header) + MC_HEADER_SIZE;
- ext_sigcount = ext_header->count;
- ext_sig = (void *)ext_header + EXT_HEADER_SIZE;
- for ( i = 0; i < ext_sigcount; i++ )
- {
- if ( microcode_update_match(cpu, mc_header,
- ext_sig->sig, ext_sig->pf) )
- goto find;
- ext_sig++;
- }
- return 0;
- find:
pr_debug("microcode: CPU%d found a matching microcode update with"
" version %#x (current=%#x)\n",
cpu, mc_header->rev, uci->cpu_sig.rev);
diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h
index 23ea954..73ebe9a 100644
--- a/xen/include/asm-x86/microcode.h
+++ b/xen/include/asm-x86/microcode.h
@@ -3,6 +3,12 @@
#include <xen/percpu.h>
+enum microcode_match_result {
+ OLD_UCODE, /* signature matched, but revision id isn't newer */
+ NEW_UCODE, /* signature matched, but revision id is newer */
+ MIS_UCODE, /* signature mismatched */
+};
+
struct cpu_signature;
struct ucode_cpu_info;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-05-27 8:27 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 8:31 [PATCH v7 00/10] improve late microcode loading Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-05-27 8:31 ` [PATCH v7 01/10] misc/xen-ucode: Upload a microcode blob to the hypervisor Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-04 16:14 ` Andrew Cooper
2019-06-04 16:23 ` Jan Beulich
2019-06-06 2:29 ` Chao Gao
2019-05-27 8:31 ` Chao Gao [this message]
2019-05-27 8:31 ` [Xen-devel] [PATCH v7 02/10] microcode/intel: extend microcode_update_match() Chao Gao
2019-06-04 14:39 ` Jan Beulich
2019-06-05 13:22 ` Roger Pau Monné
2019-06-05 14:16 ` Jan Beulich
2019-06-06 8:26 ` Chao Gao
2019-06-06 9:01 ` Jan Beulich
2019-05-27 8:31 ` [PATCH v7 03/10] microcode: introduce a global cache of ucode patch Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-04 15:03 ` Jan Beulich
2019-06-10 5:33 ` Chao Gao
2019-06-11 6:50 ` Jan Beulich
2019-05-27 8:31 ` [PATCH v7 04/10] microcode: remove struct ucode_cpu_info Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-04 15:13 ` Jan Beulich
2019-06-10 7:19 ` Chao Gao
2019-05-27 8:31 ` [PATCH v7 05/10] microcode: remove pointless 'cpu' parameter Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-04 15:29 ` Jan Beulich
2019-06-10 7:31 ` Chao Gao
2019-05-27 8:31 ` [PATCH v7 06/10] microcode: split out apply_microcode() from cpu_request_microcode() Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-05 12:37 ` Jan Beulich
2019-06-11 3:32 ` Chao Gao
2019-06-11 7:08 ` Jan Beulich
2019-06-11 8:53 ` Chao Gao
2019-06-11 9:15 ` Jan Beulich
2019-05-27 8:31 ` [PATCH v7 07/10] microcode/intel: Writeback and invalidate caches before updating microcode Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-05 13:20 ` Jan Beulich
2019-05-27 8:31 ` [PATCH v7 08/10] x86/microcode: Synchronize late microcode loading Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-05 14:09 ` Jan Beulich
2019-06-11 12:36 ` Chao Gao
2019-06-11 12:58 ` Jan Beulich
2019-06-11 15:47 ` Raj, Ashok
2019-06-05 14:42 ` Roger Pau Monné
2019-05-27 8:31 ` [PATCH v7 09/10] microcode: remove microcode_update_lock Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-05 14:52 ` Roger Pau Monné
2019-06-05 15:15 ` Jan Beulich
2019-06-05 14:53 ` Jan Beulich
2019-06-11 12:46 ` Chao Gao
2019-06-11 13:23 ` Jan Beulich
2019-06-11 16:04 ` Raj, Ashok
2019-06-12 7:38 ` Jan Beulich
2019-06-13 14:05 ` Chao Gao
2019-06-13 14:08 ` Jan Beulich
2019-06-13 14:58 ` Chao Gao
2019-06-13 17:47 ` Raj, Ashok
2019-06-14 8:58 ` Jan Beulich
2019-05-27 8:31 ` [PATCH v7 10/10] x86/microcode: always collect_cpu_info() during boot Chao Gao
2019-05-27 8:31 ` [Xen-devel] " Chao Gao
2019-06-05 14:56 ` Roger Pau Monné
2019-06-11 13:02 ` Chao Gao
2019-06-05 15:05 ` Jan Beulich
2019-06-11 12:58 ` Chao Gao
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=1558945891-3015-3-git-send-email-chao.gao@intel.com \
--to=chao.gao@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=ashok.raj@intel.com \
--cc=jbeulich@suse.com \
--cc=roger.pau@citrix.com \
--cc=sergey.dyasli@citrix.com \
--cc=wl@xen.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;
as well as URLs for NNTP newsgroup(s).