On Tue, Mar 08, 2011 at 09:13:11AM -0500, Avi Kivity wrote: > With CONFIG_CC_STACKPROTECTOR, we need a valid %gs at all times, so disable > lazy reload and do an eager reload immediately after the vmexit. > Reported-by: IVAN ANGELOV <ivangotoy@xxxxxxxxx> > Signed-off-by: Avi Kivity <avi@xxxxxxxxxx> Acked-By: Joerg Roedel <joerg.roedel@xxxxxxx> > --- > arch/x86/kvm/svm.c | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 8d61df4..6bb15d5 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -1155,8 +1155,10 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) > wrmsrl(MSR_KERNEL_GS_BASE, current->thread.gs); > load_gs_index(svm->host.gs); > #else > +#ifdef CONFIG_X86_32_LAZY_GS > loadsegment(gs, svm->host.gs); > #endif > +#endif > for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++) > wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]); > } > @@ -3649,6 +3651,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) > wrmsrl(MSR_GS_BASE, svm->host.gs_base); > #else > loadsegment(fs, svm->host.fs); > +#ifndef CONFIG_X86_32_LAZY_GS > + loadsegment(gs, svm->host.gs); > +#endif > #endif > > reload_tss(vcpu); > -- > 1.7.1 > -- AMD Operating System Research Center Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
