From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34684C07E99 for ; Mon, 5 Jul 2021 12:08:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1098B610CC for ; Mon, 5 Jul 2021 12:08:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231310AbhGEMLR (ORCPT ); Mon, 5 Jul 2021 08:11:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47095 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230435AbhGEMLQ (ORCPT ); Mon, 5 Jul 2021 08:11:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625486919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H6IUe1pqjsnl6h6pzE1hlYlvrWwd2ZiBLis3OO/uItM=; b=hAx+Mo6IvFXL0zsoWEp0fSNiIh/1dMRunXkt5CYddc0E/DEXsRlqm1rUKuI3LD5ytFRfGW 6BbyZyBnXFruEdWz5sfZ3ncaHKPOvFPX/iby7aJyK2s2tKC0drTSlaJ4rBcG5j1ZpiubPo in1gn4BUfqyFM9mWZabZlid21uLJK+U= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-h7bF-jGIPoWfP6tvCkg4ZQ-1; Mon, 05 Jul 2021 08:08:38 -0400 X-MC-Unique: h7bF-jGIPoWfP6tvCkg4ZQ-1 Received: by mail-wm1-f70.google.com with SMTP id k5-20020a7bc3050000b02901e081f69d80so3039995wmj.8 for ; Mon, 05 Jul 2021 05:08:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=H6IUe1pqjsnl6h6pzE1hlYlvrWwd2ZiBLis3OO/uItM=; b=Q2h8cd1CPQ0UYp9g4t8Cm9FkK5V2glDIB9k5zRkBBWp5miw2PE5Bj3cJRM/WXtqCsU z5QXfHPNjIYv4ovpRFI2uIxAOeyTOk9EXATuPVATLt0nfGyL6MYfwBpKT0J3JyRbMwcd 9zzScbs+VzGvRtpIXMCKIf5huwhLRCsar9QsLHdsBgRZHSxBvnmkpkSXqfCFaVDP0nke +wdUENF2TnVEyTsfRXTCdgPdzV/LbK5rO7ilnH9G0q9nwv5K0WMIUhx8V1wjg0iaFoA9 5ZP4pp5Z5Q/gNeMBJeg0DzZmBdFWXDpfYDLHrYNgi4a/jTiRxuQqOLS7MFjzk5grhhhH ocMg== X-Gm-Message-State: AOAM532wz6lzsM8Tx+DDu7qYOnKlvoWWOB/XHqO3KW9Yi7SgycmTAfmz COxa9qOy8SXnCbtJ+zpVy1G9KVZowy4OXWaBybMHv33jIQ+B/2gTK8ySeX3YQa4p5P8W0oOwnsy zlBblHmHmskty X-Received: by 2002:adf:d1e8:: with SMTP id g8mr15628178wrd.14.1625486917189; Mon, 05 Jul 2021 05:08:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ9cZcFUKu+q/7/iHKb/ireWDtyt33kd7bofG6sYH2Jz7uCZA484Rro3+x4iN55SX+tAhAow== X-Received: by 2002:adf:d1e8:: with SMTP id g8mr15628159wrd.14.1625486917033; Mon, 05 Jul 2021 05:08:37 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:63a7:c72e:ea0e:6045? ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id j4sm13069372wra.1.2021.07.05.05.08.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Jul 2021 05:08:36 -0700 (PDT) Subject: Re: [PATCH 3/6] KVM: nSVM: Introduce svm_copy_nonvmloadsave_state() To: Vitaly Kuznetsov , kvm@vger.kernel.org Cc: Sean Christopherson , Wanpeng Li , Jim Mattson , Maxim Levitsky , Cathy Avery , Emanuele Giuseppe Esposito , Tom Lendacky , Michael Roth , linux-kernel@vger.kernel.org References: <20210628104425.391276-1-vkuznets@redhat.com> <20210628104425.391276-4-vkuznets@redhat.com> From: Paolo Bonzini Message-ID: <2c79e83c-376f-0e60-f089-84eae7e91f49@redhat.com> Date: Mon, 5 Jul 2021 14:08:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210628104425.391276-4-vkuznets@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 28/06/21 12:44, Vitaly Kuznetsov wrote: > Separate the code setting non-VMLOAD-VMSAVE state from > svm_set_nested_state() into its own function. This is going to be > re-used from svm_enter_smm()/svm_leave_smm(). > > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/kvm/svm/nested.c | 36 +++++++++++++++++++++--------------- > arch/x86/kvm/svm/svm.h | 2 ++ > 2 files changed, 23 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index 1c6b0698b52e..a1dec2c40181 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -697,6 +697,26 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) > return ret; > } > > +void svm_copy_nonvmloadsave_state(struct vmcb_save_area *from_save, > + struct vmcb_save_area *to_save) Probably best to name this svm_copy_vmrun_state and perhaps (as a cleanup) change nested_svm_vmloadsave to svm_copy_vmloadsave_state. Paolo > +{ > + to_save->es = from_save->es; > + to_save->cs = from_save->cs; > + to_save->ss = from_save->ss; > + to_save->ds = from_save->ds; > + to_save->gdtr = from_save->gdtr; > + to_save->idtr = from_save->idtr; > + to_save->rflags = from_save->rflags | X86_EFLAGS_FIXED; > + to_save->efer = from_save->efer; > + to_save->cr0 = from_save->cr0; > + to_save->cr3 = from_save->cr3; > + to_save->cr4 = from_save->cr4; > + to_save->rax = from_save->rax; > + to_save->rsp = from_save->rsp; > + to_save->rip = from_save->rip; > + to_save->cpl = 0; > +} > + > void nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb) > { > to_vmcb->save.fs = from_vmcb->save.fs; > @@ -1360,21 +1380,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, > > svm->nested.vmcb12_gpa = kvm_state->hdr.svm.vmcb_pa; > > - svm->vmcb01.ptr->save.es = save->es; > - svm->vmcb01.ptr->save.cs = save->cs; > - svm->vmcb01.ptr->save.ss = save->ss; > - svm->vmcb01.ptr->save.ds = save->ds; > - svm->vmcb01.ptr->save.gdtr = save->gdtr; > - svm->vmcb01.ptr->save.idtr = save->idtr; > - svm->vmcb01.ptr->save.rflags = save->rflags | X86_EFLAGS_FIXED; > - svm->vmcb01.ptr->save.efer = save->efer; > - svm->vmcb01.ptr->save.cr0 = save->cr0; > - svm->vmcb01.ptr->save.cr3 = save->cr3; > - svm->vmcb01.ptr->save.cr4 = save->cr4; > - svm->vmcb01.ptr->save.rax = save->rax; > - svm->vmcb01.ptr->save.rsp = save->rsp; > - svm->vmcb01.ptr->save.rip = save->rip; > - svm->vmcb01.ptr->save.cpl = 0; > + svm_copy_nonvmloadsave_state(save, &svm->vmcb01.ptr->save); > > nested_load_control_from_vmcb12(svm, ctl); > > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index f89b623bb591..ff2dac2b23b6 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -463,6 +463,8 @@ void svm_leave_nested(struct vcpu_svm *svm); > void svm_free_nested(struct vcpu_svm *svm); > int svm_allocate_nested(struct vcpu_svm *svm); > int nested_svm_vmrun(struct kvm_vcpu *vcpu); > +void svm_copy_nonvmloadsave_state(struct vmcb_save_area *from_save, > + struct vmcb_save_area *to_save); > void nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb); > int nested_svm_vmexit(struct vcpu_svm *svm); > >