mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
x86/pv: _toggle_guest_pt() may not skip TLB flush for shadow mode guests
For shadow mode guests (e.g. PV ones forced into that mode as L1TF mitigation, or during migration) update_cr3() -> sh_update_cr3() may result in a change to the (shadow) root page table (compared to the previous one when running the same vCPU with the same PCID). This can, first and foremost, be a result of memory pressure on the shadow memory pool of the domain. Shadow code legitimately relies on the original (prior to commit5c81d260c2["xen/x86: use PCID feature"]) behavior of the subsequent CR3 write to flush the TLB of entries still left from walks with an earlier, different (shadow) root page table. Restore the flushing behavior, also for the second CR3 write on the exit path to guest context when XPTI is active. For the moment accept that this will introduce more flushes than are strictly necessary - no flush would be needed when the (shadow) root page table doesn't actually change, but this information isn't readily (i.e. without introducing a layering violation) available here. This is XSA-294. Signed-off-by: Jan Beulich <jbeulich@suse.com> Tested-by: Juergen Gross <jgross@suse.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> master commit:329b00e4d4master date: 2019-03-05 13:54:42 +0100
This commit is contained in:
1 parent
f111e9334d
commit
88f936d44d
1 file changed
+19
-4
@@ -20,6 +20,7 @@
|
||||
#include <asm/event.h>
|
||||
#include <asm/msr.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/shadow.h>
|
||||
#include <asm/shared.h>
|
||||
#include <asm/hvm/hvm.h>
|
||||
#include <asm/hvm/support.h>
|
||||
@@ -282,6 +283,8 @@ void toggle_guest_mode(struct vcpu *v)
|
||||
void toggle_guest_pt(struct vcpu *v)
|
||||
{
|
||||
const struct domain *d = v->domain;
|
||||
struct cpu_info *cpu_info = get_cpu_info();
|
||||
unsigned long cr3;
|
||||
|
||||
if ( is_pv_32bit_vcpu(v) )
|
||||
return;
|
||||
@@ -290,16 +293,28 @@ void toggle_guest_pt(struct vcpu *v)
|
||||
update_cr3(v);
|
||||
if ( d->arch.pv_domain.xpti )
|
||||
{
|
||||
struct cpu_info *cpu_info = get_cpu_info();
|
||||
|
||||
cpu_info->root_pgt_changed = 1;
|
||||
cpu_info->pv_cr3 = __pa(this_cpu(root_pgt)) |
|
||||
(d->arch.pv_domain.pcid
|
||||
? get_pcid_bits(v, 1) : 0);
|
||||
}
|
||||
|
||||
/* Don't flush user global mappings from the TLB. Don't tick TLB clock. */
|
||||
write_cr3(v->arch.cr3);
|
||||
/*
|
||||
* Don't flush user global mappings from the TLB. Don't tick TLB clock.
|
||||
*
|
||||
* In shadow mode, though, update_cr3() may need to be accompanied by a
|
||||
* TLB flush (for just the incoming PCID), as the top level page table may
|
||||
* have changed behind our backs. To be on the safe side, suppress the
|
||||
* no-flush unconditionally in this case. The XPTI CR3 write, if enabled,
|
||||
* will then need to be a flushing one too.
|
||||
*/
|
||||
cr3 = v->arch.cr3;
|
||||
if ( shadow_mode_enabled(d) )
|
||||
{
|
||||
cr3 &= ~X86_CR3_NOFLUSH;
|
||||
cpu_info->pv_cr3 &= ~X86_CR3_NOFLUSH;
|
||||
}
|
||||
write_cr3(cr3);
|
||||
|
||||
if ( !(v->arch.flags & TF_kernel_mode) )
|
||||
return;
|
||||
|
||||