| Message ID | 1564654971-31328-14-git-send-email-chao.gao@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | improve late microcode loading | expand |
On 01.08.2019 12:22, Chao Gao wrote: > Both are loading the cached patch. Since APs call the unified function, > microcode_update_one(), during wakeup, the 'start_update' parameter > which originally used to distinguish BSP and APs is redundant. So remove > this parameter. > > Signed-off-by: Chao Gao <chao.gao@intel.com> > --- > Changes in v8: > - split out from the previous patch > --- > xen/arch/x86/acpi/power.c | 2 +- > xen/arch/x86/microcode.c | 36 +++++++++++------------------------- > xen/arch/x86/smpboot.c | 5 +---- > xen/include/asm-x86/processor.h | 4 ++-- > 4 files changed, 15 insertions(+), 32 deletions(-) > > diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c > index 4f21903..24798d5 100644 > --- a/xen/arch/x86/acpi/power.c > +++ b/xen/arch/x86/acpi/power.c > @@ -253,7 +253,7 @@ static int enter_state(u32 state) > > console_end_sync(); > > - microcode_resume_cpu(); > + microcode_update_one(); > > if ( !recheck_cpu_features(0) ) > panic("Missing previously available feature(s)\n"); > diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c > index f0b1e39..cbaf13d 100644 > --- a/xen/arch/x86/microcode.c > +++ b/xen/arch/x86/microcode.c > @@ -204,24 +204,6 @@ static struct microcode_patch *microcode_parse_blob(const char *buf, > return NULL; > } > > -int microcode_resume_cpu(void) > -{ > - int err; > - struct cpu_signature *sig = &this_cpu(cpu_sig); > - > - if ( !microcode_ops ) > - return 0; > - > - spin_lock(µcode_mutex); > - > - err = microcode_ops->collect_cpu_info(sig); > - if ( likely(!err) ) > - err = microcode_ops->apply_microcode(microcode_cache); > - spin_unlock(µcode_mutex); > - > - return err; > -} > - > void microcode_free_patch(struct microcode_patch *microcode_patch) > { > microcode_ops->free_patch(microcode_patch->mc); > @@ -402,7 +384,16 @@ static int __init microcode_init(void) > } > __initcall(microcode_init); > > -int __init early_microcode_update_cpu(bool start_update) > +/* Load a cached update to current cpu */ > +int microcode_update_one(void) > +{ > + return microcode_ops ? microcode_update_cpu(NULL) : 0; > +} With both callers ignoring the return value, I wonder if the function should return void. Else it might be better (but I'm not entirely certain) for it to return -EOPNOTSUPP rather than 0. > +/* > + * BSP calls this function to parse ucode blob and then apply an update. > + */ This is a single line comment, and hence wants its style changed accordingly. Jan
diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 4f21903..24798d5 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -253,7 +253,7 @@ static int enter_state(u32 state) console_end_sync(); - microcode_resume_cpu(); + microcode_update_one(); if ( !recheck_cpu_features(0) ) panic("Missing previously available feature(s)\n"); diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index f0b1e39..cbaf13d 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -204,24 +204,6 @@ static struct microcode_patch *microcode_parse_blob(const char *buf, return NULL; } -int microcode_resume_cpu(void) -{ - int err; - struct cpu_signature *sig = &this_cpu(cpu_sig); - - if ( !microcode_ops ) - return 0; - - spin_lock(µcode_mutex); - - err = microcode_ops->collect_cpu_info(sig); - if ( likely(!err) ) - err = microcode_ops->apply_microcode(microcode_cache); - spin_unlock(µcode_mutex); - - return err; -} - void microcode_free_patch(struct microcode_patch *microcode_patch) { microcode_ops->free_patch(microcode_patch->mc); @@ -402,7 +384,16 @@ static int __init microcode_init(void) } __initcall(microcode_init); -int __init early_microcode_update_cpu(bool start_update) +/* Load a cached update to current cpu */ +int microcode_update_one(void) +{ + return microcode_ops ? microcode_update_cpu(NULL) : 0; +} + +/* + * BSP calls this function to parse ucode blob and then apply an update. + */ +int __init early_microcode_update_cpu(void) { int rc = 0; void *data = NULL; @@ -422,11 +413,6 @@ int __init early_microcode_update_cpu(bool start_update) data = bootstrap_map(&ucode_mod); } - microcode_ops->collect_cpu_info(&this_cpu(cpu_sig)); - - if ( !start_update ) - return microcode_update_cpu(NULL); - if ( data ) { struct microcode_patch *patch; @@ -480,7 +466,7 @@ int __init early_microcode_init(void) microcode_ops->collect_cpu_info(&this_cpu(cpu_sig)); if ( ucode_mod.mod_end || ucode_blob.size ) - rc = early_microcode_update_cpu(true); + rc = early_microcode_update_cpu(); } return rc; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index c818cfc..e62a1ca 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -361,10 +361,7 @@ void start_secondary(void *unused) initialize_cpu_data(cpu); - if ( system_state <= SYS_STATE_smp_boot ) - early_microcode_update_cpu(false); - else - microcode_resume_cpu(); + microcode_update_one(); /* * If MSR_SPEC_CTRL is available, apply Xen's default setting and discard diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 104faa9..2a76d90 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -568,9 +568,9 @@ int guest_wrmsr_xen(struct vcpu *v, uint32_t idx, uint64_t val); void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); -int microcode_resume_cpu(void); -int early_microcode_update_cpu(bool start_update); +int early_microcode_update_cpu(void); int early_microcode_init(void); +int microcode_update_one(void); int microcode_init_intel(void); int microcode_init_amd(void);
Both are loading the cached patch. Since APs call the unified function, microcode_update_one(), during wakeup, the 'start_update' parameter which originally used to distinguish BSP and APs is redundant. So remove this parameter. Signed-off-by: Chao Gao <chao.gao@intel.com> --- Changes in v8: - split out from the previous patch --- xen/arch/x86/acpi/power.c | 2 +- xen/arch/x86/microcode.c | 36 +++++++++++------------------------- xen/arch/x86/smpboot.c | 5 +---- xen/include/asm-x86/processor.h | 4 ++-- 4 files changed, 15 insertions(+), 32 deletions(-)