Skip to content

Commit

Permalink
x86/xstate: reset cached register values on resume
Browse files Browse the repository at this point in the history
set_xcr0() and set_msr_xss() use cached value to avoid setting the
register to the same value over and over. But suspend/resume implicitly
reset the registers and since percpu areas are not deallocated on
suspend anymore, the cache gets stale.
Reset the cache on resume, to ensure the next write will really hit the
hardware. Choose value 0, as it will never be a legitimate write to
those registers - and so, will force write (and cache update).

Note the cache is used io get_xcr0() and get_msr_xss() too, but:
- set_xcr0() is called few lines below in xstate_init(), so it will
  update the cache with appropriate value
- get_msr_xss() is not used anywhere - and thus not before any
  set_msr_xss() that will fill the cache

Fixes: aca2a98 "xen: don't free percpu areas during suspend"
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
  • Loading branch information
marmarek authored and jbeulich committed Nov 4, 2021
1 parent 512863e commit f7f4a52
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions xen/arch/x86/xstate.c
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,13 @@ void xstate_init(struct cpuinfo_x86 *c)
return;
}

/*
* Zap the cached values to make set_xcr0() and set_msr_xss() really
* write it.
*/
this_cpu(xcr0) = 0;
this_cpu(xss) = ~0;

cpuid_count(XSTATE_CPUID, 0, &eax, &ebx, &ecx, &edx);
feature_mask = (((u64)edx << 32) | eax) & XCNTXT_MASK;
BUG_ON(!valid_xcr0(feature_mask));
Expand Down

0 comments on commit f7f4a52

Please sign in to comment.