All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marcelo Tosatti <mtosatti@redhat.com>
To: Gleb Natapov <gleb@redhat.com>
Cc: kvm@vger.kernel.org, avi@redhat.com
Subject: Re: [PATCH] KVM: unbreak userspace that does not sets tss address
Date: Fri, 11 Mar 2011 14:30:32 -0300	[thread overview]
Message-ID: <20110311173032.GA11111@amt.cnet> (raw)
In-Reply-To: <20110307151936.GA10151@redhat.com>

On Mon, Mar 07, 2011 at 05:19:36PM +0200, Gleb Natapov wrote:
> Commit 6440e5967bc broke old userspaces that do not set tss address
> before entering vcpu. Unbreak it by setting tss address to a safe
> value on the first vcpu entry. New userspaces should set tss address,
> so print warning in case it doesn't.
> 
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index e2b8c6b..280b6ea 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -180,6 +180,7 @@ static u64 construct_eptp(unsigned long root_hpa);
>  static void kvm_cpu_vmxon(u64 addr);
>  static void kvm_cpu_vmxoff(void);
>  static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3);
> +static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr);
>  
>  static DEFINE_PER_CPU(struct vmcs *, vmxarea);
>  static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
> @@ -1762,6 +1763,16 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
>  	vmx->emulation_required = 1;
>  	vmx->rmode.vm86_active = 1;
>  
> +	/*
> +	 * Very old userspace does not call KVM_SET_TSS_ADDR before entering
> +	 * vcpu. Call it here with phys address pointing 16M below 4G.
> +	 */
> +	if (!vcpu->kvm->arch.tss_addr) {
> +		printk_once(KERN_WARNING "kvm: KVM_SET_TSS_ADDR need to be "
> +			     "called before entering vcpu\n");
> +		vmx_set_tss_addr(vcpu->kvm, 0xfeffd000);
> +	}
> +
>  	vmx->rmode.tr.selector = vmcs_read16(GUEST_TR_SELECTOR);
>  	vmx->rmode.tr.base = vmcs_readl(GUEST_TR_BASE);
>  	vmcs_writel(GUEST_TR_BASE, rmode_tss_base(vcpu->kvm));

Should leave/enter srcu section before/after set_memory_region. 

Actually, for older userspace, isnt the base_gfn + slot[0].npages - 3
address (rmode_tss_base) used? That is, initializing the TSS page at 
that address at vcpu_reset time should be enough?


  parent reply	other threads:[~2011-03-11 17:58 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-07 15:19 [PATCH] KVM: unbreak userspace that does not sets tss address Gleb Natapov
2011-03-07 15:49 ` Jan Kiszka
2011-03-07 16:20   ` Gleb Natapov
2011-03-07 16:23     ` Jan Kiszka
2011-03-07 16:26       ` Gleb Natapov
2011-03-11 17:30 ` Marcelo Tosatti [this message]
2011-03-11 18:22   ` Gleb Natapov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110311173032.GA11111@amt.cnet \
    --to=mtosatti@redhat.com \
    --cc=avi@redhat.com \
    --cc=gleb@redhat.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.