From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 9/24] Implement VMCLEAR Date: Tue, 15 Jun 2010 16:50:35 +0300 Message-ID: <4C17852B.5080703@redhat.com> References: <1276431753-nyh@il.ibm.com> <201006131227.o5DCRAB0012968@rice.haifa.ibm.com> <20100615134753.GX21797@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "Nadav Har'El" , kvm@vger.kernel.org To: Gleb Natapov Return-path: Received: from mx1.redhat.com ([209.132.183.28]:56638 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757637Ab0FONui (ORCPT ); Tue, 15 Jun 2010 09:50:38 -0400 In-Reply-To: <20100615134753.GX21797@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 06/15/2010 04:47 PM, Gleb Natapov wrote: > On Sun, Jun 13, 2010 at 03:27:10PM +0300, Nadav Har'El wrote: > >> This patch implements the VMCLEAR instruction. >> >> Signed-off-by: Nadav Har'El >> --- >> --- .before/arch/x86/kvm/vmx.c 2010-06-13 15:01:29.000000000 +0300 >> +++ .after/arch/x86/kvm/vmx.c 2010-06-13 15:01:29.000000000 +0300 >> @@ -138,6 +138,8 @@ struct __attribute__ ((__packed__)) vmcs >> */ >> u32 revision_id; >> u32 abort; >> + >> + bool launch_state; /* set to 0 by VMCLEAR, to 1 by VMLAUNCH */ >> }; >> >> struct vmcs_list { >> @@ -3827,6 +3829,46 @@ static int read_guest_vmcs_gpa(struct kv >> return 0; >> } >> >> +static void clear_rflags_cf_zf(struct kvm_vcpu *vcpu) >> +{ >> + unsigned long rflags; >> + rflags = vmx_get_rflags(vcpu); >> + rflags&= ~(X86_EFLAGS_CF | X86_EFLAGS_ZF); >> + vmx_set_rflags(vcpu, rflags); >> +} >> + >> +/* Emulate the VMCLEAR instruction */ >> +static int handle_vmclear(struct kvm_vcpu *vcpu) >> +{ >> + struct vcpu_vmx *vmx = to_vmx(vcpu); >> + gpa_t guest_vmcs_addr, save_current_vmptr; >> + >> + if (!nested_vmx_check_permission(vcpu)) >> + return 1; >> + >> + if (read_guest_vmcs_gpa(vcpu,&guest_vmcs_addr)) >> + return 1; >> + >> + save_current_vmptr = vmx->nested.current_vmptr; >> + >> + vmx->nested.current_vmptr = guest_vmcs_addr; >> + if (!nested_map_current(vcpu)) >> + return 1; >> + vmx->nested.current_l2_page->launch_state = 0; >> + nested_unmap_current(vcpu); >> + >> + nested_free_current_vmcs(vcpu); >> + >> + if (save_current_vmptr == guest_vmcs_addr) >> + vmx->nested.current_vmptr = -1ull; >> + else >> + vmx->nested.current_vmptr = save_current_vmptr; >> + >> + skip_emulated_instruction(vcpu); >> + clear_rflags_cf_zf(vcpu); >> + return 1; >> +} >> + >> > Shouldn't error cases update flags too? > Architectural errors (bad alignment) should update flags. Internal errors (ENOMEM, vpmtr pointing outside of RAM) should not. -- error compiling committee.c: too many arguments to function