x86/pv: Fix assertions in svm_load_segs()
PATCH v2 1/1 x86/pv: Fix assertions in svm_load_segs()
OSSTest has shown an assertion failure:
http://logs.test-lab.xenproject.org/osstest/logs/153906/test-xtf-amd64-amd64-1/serial-rimava1.log
This is because we pass a non-NUL selector into svm_load_segs(), which is something we must not do, as this path does not load the attributes/limit from the GDT/LDT.
Drop the {gs,gs}_sel parameters from svm_load_segs() and use 0 instead. This is fine even for non-zero NUL segments, as it is how the IRET instruction behaves in all CPUs.
Only use the svm_load_segs() path when FS and GS are NUL, which is the common case when scheduling a 64bit vcpu with 64bit userspace in context.
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
v2:
* Rewrite from scratch.
--- xen/arch/x86/domain.c | 7 +++---- xen/arch/x86/hvm/svm/svm.c | 9 +++------ xen/include/asm-x86/hvm/svm/svm.h | 6 ++++-- 3 files changed, 10 insertions(+), 12 deletions(-)
xen/arch/x86/domain.c +3 -4
@@ -1557,7 +1557,7 @@ static void load_segments(struct vcpu *n) : [_val] "rm" (val) )#ifdef CONFIG_HVM -if ( cpu_has_svm && !compat ) +if ( cpu_has_svm && !compat && (uregs->fs | uregs->gs) <=3 ) {unsigned long gsb = n->arch.flags & TF_kernel_mode ? n->arch.pv.gs_base_kernel : n->arch.pv.gs_base_user;
@@ -1565,8 +1565,7 @@ static void load_segments(struct vcpu *n) ? n->arch.pv.gs_base_user : n->arch.pv.gs_base_kernel; fs_gs_done =svm_load_segs (n->arch.pv.ldt_ents,LDT_VIRT_START (n), - uregs->fs, n->arch.pv.fs_base, - uregs->gs, gsb, gss); + n->arch.pv.fs_base, gsb, gss); }#endif if ( !fs_gs_done )
@@ -1929,7 +1928,7 @@ static void __context_switch(void)/* Prefetch the VMCB if we expect to use it later in the context switch */ if ( cpu_has_svm &&is_pv_domain (nd) && !is_pv_32bit_domain (nd) && !is_idle_domain (nd) ) -svm_load_segs (0 ,0 ,0 ,0 ,0 ,0 ,0 ); +svm_load_segs (0 ,0 ,0 ,0 ,0 );#endif if (need_full_gdt (nd) && !per_cpu (full_gdt_loaded, cpu) )
xen/arch/x86/hvm/svm/svm.c +3 -6
@@ -1521,8 +1521,7 @@ static void svm_init_erratum_383(const struct cpuinfo_x86 *c)#ifdef CONFIG_PV bool svm_load_segs (unsigned int ldt_ents,unsigned long ldt_base, -unsigned int fs_sel,unsigned long fs_base, -unsigned int gs_sel,unsigned long gs_base, +unsigned long fs_base,unsigned long gs_base,unsigned long gs_shadow) {unsigned int cpu =smp_processor_id ();
@@ -1559,14 +1558,12 @@ bool svm_load_segs(unsigned int ldt_ents, unsigned long ldt_base, vmcb->ldtr.base = ldt_base; } -ASSERT (!(fs_sel & ~3 )); - vmcb->fs.sel = fs_sel; + vmcb->fs.sel =0 ; vmcb->fs.attr =0 ; vmcb->fs.limit =0 ; vmcb->fs.base = fs_base; -ASSERT (!(gs_sel & ~3 )); - vmcb->gs.sel = gs_sel; + vmcb->gs.sel =0 ; vmcb->gs.attr =0 ; vmcb->gs.limit =0 ; vmcb->gs.base = gs_base;
xen/include/asm-x86/hvm/svm/svm.h +4 -2
@@ -52,10 +52,12 @@ void svm_update_guest_cr(struct vcpu *, unsigned int cr, unsigned int flags);/* * PV context switch helper. Calls with zero ldt_base request a prefetch of * the VMCB area to be loaded from, instead of an actual load of state. +* +* Must only be used for NUL FS/GS, as the segment attributes/limits are not +* read from the GDT/LDT. */ bool svm_load_segs (unsigned int ldt_ents,unsigned long ldt_base, -unsigned int fs_sel,unsigned long fs_base, -unsigned int gs_sel,unsigned long gs_base, +unsigned long fs_base,unsigned long gs_base,unsigned long gs_shadow);extern u32 svm_feature_flags;
Signature · 1 line
2.11.0
Quoted 8 lines · Andrew Cooper
OSSTest has shown an assertion failure:
http://logs.test-lab.xenproject.org/osstest/logs/153906/test-xtf-amd64-amd64-1/serial-rimava1.logThis is because we pass a non-NUL selector into
svm_load_segs(), which is something we must not do, as this path does not load the attributes/limit from the GDT/LDT.Drop the {gs,gs}_sel parameters from
svm_load_segs()and use 0 instead. This
Nit: {fs,gs}
Quoted 2 lines
is fine even for non-zero NUL segments, as it is how the IRET instruction behaves in all CPUs.
To be honest, I'd not call it "fine", but "acceptable". (And I don't consider IRET's behavior "fine" either.)
Quoted 5 lines
Only use the
svm_load_segs()path when FS and GS are NUL, which is the common case when scheduling a 64bit vcpu with 64bit userspace in context.Fixes ad0fd291c5 ("x86/pv: Rewrite segment context switching from scratch")Signed-off-by Andrew Cooper <[email protected]>
xen/include/asm-x86/hvm/svm/svm.h void svm_update_guest_cr(struct vcpu *, unsigned int cr, unsigned int flags); · line 58
Quoted 10 lines
xen/include/asm-x86/hvm/svm/svm.h +3
-0@@ -52,10 +52,12 @@ void svm_update_guest_cr(struct vcpu *, unsigned int cr, unsigned int flags);/* * PV context switch helper. Calls with zero ldt_base request a prefetch of * the VMCB area to be loaded from, instead of an actual load of state. +* +* Must only be used for NUL FS/GS, as the segment attributes/limits are not +* read from the GDT/LDT. */
Ah, right - this is the part I was missing when you said you'd redo the patch.
Jan
Quoted 10 lines · Jan Beulich
Quoted 8 lines · Andrew Cooper
OSSTest has shown an assertion failure:
http://logs.test-lab.xenproject.org/osstest/logs/153906/test-xtf-amd64-amd64-1/serial-rimava1.logThis is because we pass a non-NUL selector into
svm_load_segs(), which is something we must not do, as this path does not load the attributes/limit from the GDT/LDT.Drop the {gs,gs}_sel parameters from
svm_load_segs()and use 0 instead. ThisNit: {fs,gs}
Yeah - I noticed and fixed immediately after sending. Also a plural issue in the previous paragraph.
Quoted 4 lines
Quoted 3 lines
is fine even for non-zero NUL segments, as it is how the IRET instruction behaves in all CPUs.
To be honest, I'd not call it "fine", but "acceptable".
Ok.
Quoted 1 line
(And I don't consider IRET's behavior "fine" either.)
Nor me, but I'll happily use it to simplify our logic.
Quoted 6 lines
Quoted 5 lines
Only use the
svm_load_segs()path when FS and GS are NUL, which is the common case when scheduling a 64bit vcpu with 64bit userspace in context.Fixes ad0fd291c5 ("x86/pv: Rewrite segment context switching from scratch")Signed-off-by Andrew Cooper <[email protected]>Reviewed-by Jan Beulich <[email protected]>
Thanks.
~Andrew