From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 7/9] Add VMLOAD and VMSAVE handlers Date: Mon, 01 Sep 2008 16:27:38 +0300 Message-ID: <48BBEDCA.4030006@qumranet.com> References: <1220270281-15720-1-git-send-email-agraf@suse.de> <1220270281-15720-2-git-send-email-agraf@suse.de> <1220270281-15720-3-git-send-email-agraf@suse.de> <1220270281-15720-4-git-send-email-agraf@suse.de> <1220270281-15720-5-git-send-email-agraf@suse.de> <1220270281-15720-6-git-send-email-agraf@suse.de> <1220270281-15720-7-git-send-email-agraf@suse.de> <1220270281-15720-8-git-send-email-agraf@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, joro@8bytes.org, anthony@codemonkey.ws To: Alexander Graf Return-path: Received: from il.qumranet.com ([212.179.150.194]:20532 "EHLO il.qumranet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754158AbYIAN1k (ORCPT ); Mon, 1 Sep 2008 09:27:40 -0400 In-Reply-To: <1220270281-15720-8-git-send-email-agraf@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: Alexander Graf wrote: > This implements the VMLOAD and VMSAVE instructions, that usually surround > the VMRUN instructions. Both instructions load / restore the same elements, > so we only need to implement them once. > > > +static int nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb) > +{ > + memcpy(&to_vmcb->save.fs, &from_vmcb->save.fs, sizeof(struct vmcb_seg)); > + memcpy(&to_vmcb->save.gs, &from_vmcb->save.gs, sizeof(struct vmcb_seg)); > + memcpy(&to_vmcb->save.tr, &from_vmcb->save.tr, sizeof(struct vmcb_seg)); > + memcpy(&to_vmcb->save.ldtr, &from_vmcb->save.ldtr, > + sizeof(struct vmcb_seg)); > You can use simple assignment here. > +static int vmload_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) > +{ > + svm->next_rip = kvm_rip_read(&svm->vcpu) + 3; > + skip_emulated_instruction(&svm->vcpu); > + > + if (svm->vmcb->save.cpl) { > + printk(KERN_ERR "%s: invalid cpl 0x%x at ip 0x%lx\n", > + __func__, svm->vmcb->save.cpl, > + kvm_rip_read(&svm->vcpu)); > + kvm_queue_exception(&svm->vcpu, GP_VECTOR); > + return 1; > + } > Check before skip. Don't we need to check that svm is enabled in the guest as well (and inject #UD if not)? > + > +static int vmsave_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) > +{ > + svm->next_rip = kvm_rip_read(&svm->vcpu) + 3; > + skip_emulated_instruction(&svm->vcpu); > + > + if (svm->vmcb->save.cpl) { > + printk(KERN_ERR "%s: invalid cpl 0x%x at ip 0x%lx\n", > + __func__, svm->vmcb->save.cpl, kvm_rip_read(&svm->vcpu)); > + kvm_queue_exception(&svm->vcpu, GP_VECTOR); > + return 1; > + } > + > + nested_svm_do(svm, svm->vmcb->save.rax, 0, NULL, nested_svm_vmsave); > + > Ditto. > + return 1; > +} > Blank line. -- error compiling committee.c: too many arguments to function