From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wanpeng Li <wanpeng.li@linux.intel.com>
Subject: Re: [PATCH] KVM: nVMX: Disable preemption while reading from shadow
 VMCS
Date: Thu, 9 Oct 2014 08:00:01 +0800
Message-ID: <20141009000001.GB17971@kernel>
References: <543560D3.2030205@siemens.com>
Reply-To: Wanpeng Li <wanpeng.li@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Cc: Paolo Bonzini <pbonzini@redhat.com>, kvm <kvm@vger.kernel.org>,
	Bandan Das <bsd@redhat.com>,
	Jailhouse <jailhouse-dev@googlegroups.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Return-path: <jailhouse-dev+bncBAABBWNJ26QQKGQE3FNP7UI@googlegroups.com>
In-Reply-To: <543560D3.2030205@siemens.com>
List-Post: <http://groups.google.com/group/jailhouse-dev/post>, <mailto:jailhouse-dev@googlegroups.com>
List-Help: <http://groups.google.com/support/>, <mailto:jailhouse-dev+help@googlegroups.com>
List-Archive: <http://groups.google.com/group/jailhouse-dev
Sender: jailhouse-dev@googlegroups.com
List-Subscribe: <http://groups.google.com/group/jailhouse-dev/subscribe>, <mailto:jailhouse-dev+subscribe@googlegroups.com>
List-Unsubscribe: <mailto:googlegroups-manage+175645748590+unsubscribe@googlegroups.com>,
 <http://groups.google.com/group/jailhouse-dev/subscribe>
Content-Disposition: inline
List-Id: kvm.vger.kernel.org

On Wed, Oct 08, 2014 at 06:05:39PM +0200, Jan Kiszka wrote:
>In order to access the shadow VMCS, we need to load it. At this point,
>vmx->loaded_vmcs->vmcs and the actually loaded one start to differ. If
>we now get preempted by Linux, vmx_vcpu_put and, on return, the
>vmx_vcpu_load will work against the wrong vmcs. That can cause
>copy_shadow_to_vmcs12 to corrupt the vmcs12 state.
>
>Fix the issue by disabling preemption during the copy operation.
>
>copy_vmcs12_to_shadow is safe from this issue as it is executed by
>vmx_vcpu_run when preemption is already disabled before vmentry.
>
>Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>---

Reviewed-by: Wanpeng Li <wanpeng.li@linux.intel.com>

Regards,
Wanpeng Li 

>
>This fixes specifically Jailhouse in KVM on CPUs with shadow VMCS
>support.
>
> arch/x86/kvm/vmx.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
>index 04fa1b8..f3de106 100644
>--- a/arch/x86/kvm/vmx.c
>+++ b/arch/x86/kvm/vmx.c
>@@ -6417,6 +6417,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
> 	const unsigned long *fields = shadow_read_write_fields;
> 	const int num_fields = max_shadow_read_write_fields;
> 
>+	preempt_disable();
>+
> 	vmcs_load(shadow_vmcs);
> 
> 	for (i = 0; i < num_fields; i++) {
>@@ -6440,6 +6442,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
> 
> 	vmcs_clear(shadow_vmcs);
> 	vmcs_load(vmx->loaded_vmcs->vmcs);
>+
>+	preempt_enable();
> }
> 
> static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
>-- 
>1.8.4.5

-- 
You received this message because you are subscribed to the Google Groups "Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jailhouse-dev+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.