microcode/amd: call svm_host_osvw_init() in common code

Introduce a vendor hook, .end_update_percpu, for svm_host_osvw_init().
The hook function is called on each cpu after loading an update.
It is a preparation for spliting out apply_microcode() from
cpu_request_microcode().

Note that svm_host_osvm_init() should be called regardless of the
result of loading an update.

Signed-off-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Chao Gao authored and Jan Beulich committed 2019-09-13 12:31:01 +02:00
1 parent 41df5999f1
commit 86f6706e4f
3 files changed
+17 -14

No files matched your search

+9 -1
View File
@@ -276,6 +276,9 @@ static long do_microcode_update(void *_info)
if ( error )
info->error = error;
if ( microcode_ops->end_update_percpu )
microcode_ops->end_update_percpu();
info->cpu = cpumask_next(info->cpu, &cpu_online_map);
if ( info->cpu < nr_cpu_ids )
return continue_hypercall_on_cpu(info->cpu, do_microcode_update, info);
@@ -376,7 +379,12 @@ int __init early_microcode_update_cpu(bool start_update)
if ( rc )
return rc;
return microcode_update_cpu(data, len);
rc = microcode_update_cpu(data, len);
if ( microcode_ops->end_update_percpu )
microcode_ops->end_update_percpu();
return rc;
}
else
return -ENOMEM;
+7 -13
View File
@@ -600,10 +600,6 @@ static int cpu_request_microcode(const void *buf, size_t bufsize)
free_patch(mc_amd);
out:
#if CONFIG_HVM
svm_host_osvw_init();
#endif
/*
* In some cases we may return an error even if processor's microcode has
* been updated. For example, the first patch in a container file is loaded
@@ -613,29 +609,27 @@ static int cpu_request_microcode(const void *buf, size_t bufsize)
return error;
}
#ifdef CONFIG_HVM
static int start_update(void)
{
#if CONFIG_HVM
/*
* We assume here that svm_host_osvw_init() will be called on each cpu (from
* cpu_request_microcode()).
*
* Note that if collect_cpu_info() returns an error then
* cpu_request_microcode() will not invoked thus leaving OSVW bits not
* updated. Currently though collect_cpu_info() will not fail on processors
* supporting OSVW so we will not deal with this possibility.
* svm_host_osvw_init() will be called on each cpu by calling '.end_update'
* in common code.
*/
svm_host_osvw_reset();
#endif
return 0;
}
#endif
static const struct microcode_ops microcode_amd_ops = {
.cpu_request_microcode = cpu_request_microcode,
.collect_cpu_info = collect_cpu_info,
.apply_microcode = apply_microcode,
#ifdef CONFIG_HVM
.start_update = start_update,
.end_update_percpu = svm_host_osvw_init,
#endif
.free_patch = free_patch,
.compare_patch = compare_patch,
.match_cpu = match_cpu,
+1
View File
@@ -24,6 +24,7 @@ struct microcode_ops {
int (*collect_cpu_info)(struct cpu_signature *csig);
int (*apply_microcode)(void);
int (*start_update)(void);
void (*end_update_percpu)(void);
void (*free_patch)(void *mc);
bool (*match_cpu)(const struct microcode_patch *patch);
enum microcode_match_result (*compare_patch)(
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.