update microcode support
PATCH 1/1 update microcode support
Hi,
Attached patch updates microcode patch loading support:
- Container header file holding the patches changed. Update to new format.
- in cpu_request_microcode() move heap re-allocation & copy out of the loop.
Side-effect: Remove limitation in only supporting fixed sized microcode patches. Also simplifies code a lot.
- cleanup: use rdmsr and wrmsrl instead of inlined assembler
- pass ucode_cpu_info as arguments. Improves reentrancy.
- cleanup: simplify struct ucode_cpu_info and remove get_matching_microcode hook. Side-effect: reduces kernel size.
- bugfix: fix xen kernel memory leak in error path. equiv_cpu_table was not freed.
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
xen/arch/x86/microcode.c +22 -39
@@ -49,39 +49,28 @@ struct microcode_info {char buffer[1 ]; }; -static void microcode_fini_cpu (int cpu) +static void microcode_fini_cpu (struct ucode_cpu_info *uci,int cpu) { -struct ucode_cpu_info *uci = ucode_cpu_info + cpu; -spin_lock (µcode_mutex); -xfree (uci->mc.valid_mc); - uci->mc.valid_mc =NULL ; - uci->valid =0 ; +xfree (uci->mc.mc_valid); + uci->mc.mc_valid =NULL ;spin_unlock (µcode_mutex); } -static int collect_cpu_info (int cpu) +static int collect_cpu_info (struct ucode_cpu_info *uci,int cpu) +{ +memset (uci,0 ,sizeof (*uci)); +return microcode_ops->collect_cpu_info (cpu, &uci->cpu_sig); +} + +static int microcode_resume_cpu (struct ucode_cpu_info *uci,int cpu) {int err =0 ; -struct ucode_cpu_info *uci = ucode_cpu_info + cpu; - -memset (uci,0 ,sizeof (*uci)); - err = microcode_ops->collect_cpu_info (cpu, &uci->cpu_sig); -if ( !err ) - uci->valid =1 ; - -return err; -} - -static int microcode_resume_cpu (int cpu) -{ -int err =0 ; -struct ucode_cpu_info *uci = ucode_cpu_info + cpu;struct cpu_signature nsig;gdprintk (XENLOG_INFO ,"microcode: CPU%d resumed\n" , cpu); -if ( !uci->mc.valid_mc ) +if ( !uci->mc.mc_valid )return -EIO ;/*
@@ -91,43 +80,38 @@ static int microcode_resume_cpu(int cpu) err = microcode_ops->collect_cpu_info (cpu, &nsig);if ( err ) { -microcode_fini_cpu (cpu); +microcode_fini_cpu (uci, cpu);return err; }if (memcmp (&nsig, &uci->cpu_sig,sizeof (nsig)) ) { -microcode_fini_cpu (cpu); +microcode_fini_cpu (uci, cpu);/* Should we look for a new ucode here? */ return -EIO ; } - err = microcode_ops->apply_microcode (cpu); - -return err; +return microcode_ops->apply_microcode (uci, cpu); }static int microcode_update_cpu (const void *buf,size_t size) {int err;unsigned int cpu =smp_processor_id (); -struct ucode_cpu_info *uci = ucode_cpu_info + cpu; +struct ucode_cpu_info *uci = &ucode_cpu_info[cpu];spin_lock (µcode_mutex);/* -* Check if the system resume is in progress (uci->valid != NULL), +* Check if the system resume is in progress (uci->mc.mc_valid != NULL), * otherwise just request a firmware: */ -if ( uci->valid ) - { - err =microcode_resume_cpu (cpu); - } -else - { - err =collect_cpu_info (cpu); -if ( !err && uci->valid ) - err = microcode_ops->cpu_request_microcode (cpu, buf, size); +if ( uci->mc.mc_valid ) { + err =microcode_resume_cpu (uci, cpu); + }else { + err =collect_cpu_info (uci, cpu); +if ( !err ) + err = microcode_ops->cpu_request_microcode (uci, cpu, buf, size); }spin_unlock (µcode_mutex);
@@ -153,7 +137,6 @@ static long do_microcode_update(void *_i error = info->error;xfree (info);return error; - }int microcode_update (XEN_GUEST_HANDLE (const_void) buf,unsigned long len)
xen/arch/x86/microcode_amd.c +100 -135
406 lines not on this page · raw message
xen/arch/x86/microcode_intel.c +4 -5
@@ -244,12 +244,11 @@ static int get_matching_microcode(void *return 1 ; } -static int apply_microcode (int cpu) +static int apply_microcode (struct ucode_cpu_info *uci,int cpu) {unsigned long flags;unsigned int val[2 ];int cpu_num =raw_smp_processor_id (); -struct ucode_cpu_info *uci = ucode_cpu_info + cpu_num;/* We should bind the task to the CPU */ BUG_ON (cpu_num != cpu);
@@ -318,7 +317,8 @@ static long get_next_ucode_from_buffer(vreturn offset + total_size; } -static int cpu_request_microcode (int cpu,const void *buf,size_t size) +static int cpu_request_microcode (struct ucode_cpu_info *uci, +int cpu,const void *buf,size_t size) {long offset =0 ;int error =0 ;
@@ -341,7 +341,7 @@ static int cpu_request_microcode(int cpu*/ if ( error ==1 ) { -apply_microcode (cpu); +apply_microcode (uci, cpu); error =0 ; }xfree (mc);
@@ -355,7 +355,6 @@ static int cpu_request_microcode(int cpu }static struct microcode_ops microcode_intel_ops = { - .get_matching_microcode = get_matching_microcode, .cpu_request_microcode = cpu_request_microcode, .collect_cpu_info = collect_cpu_info, .apply_microcode = apply_microcode,
xen/include/asm-x86/microcode.h +27 -26
78 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel