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=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,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 EFCD2C433E1 for ; Thu, 20 Aug 2020 12:16:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C532120738 for ; Thu, 20 Aug 2020 12:16:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XoKg5CBA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730127AbgHTMQ4 (ORCPT ); Thu, 20 Aug 2020 08:16:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:26100 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730118AbgHTJ4j (ORCPT ); Thu, 20 Aug 2020 05:56:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597917398; 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=BBZ9tzVG8IQYeA14qViPmIhF5BRH6qjqiVI94E69QaM=; b=XoKg5CBA/5EFLEu4kejb+QGdLV3NCx0wM1sGmH32SZAeI5jUmrJOy9yIRMzBdyCU0PRu4K Caqa9xevJAW9YN9uqi525v0rBnWgzL3WjDyT7zXK+XZUfXUa2Y3qqXT6dW6YDuejpRnGQ6 69GGHPAd0izl5a13FQ5gRtqAprlossY= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-c-Rll06OM5CvCK15_NcAGw-1; Thu, 20 Aug 2020 05:56:36 -0400 X-MC-Unique: c-Rll06OM5CvCK15_NcAGw-1 Received: by mail-wr1-f72.google.com with SMTP id f14so463498wrm.22 for ; Thu, 20 Aug 2020 02:56:36 -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=BBZ9tzVG8IQYeA14qViPmIhF5BRH6qjqiVI94E69QaM=; b=k/8EJBN5MHjdJprZlMGP98/rqIajDp3uh8/21GBZTvSI6rwFFc3DGUIPzpZW3ngMxQ Ix0orvoD1TubgdjtRWIYIfW4m8qPEoxcE2htbf9idOLqzW1ju3HN1tP9dDNVMBntE+Ck fzgz4KJYFdpwtONWDwo7YuZpEGe9j66qGl6/Hu7fB/sItYNKD3n1Zkbmv3njSeAsdwNj meSaXw35uMMMJ9xGcs6Z+eCChkn6HHA5JjBt9X3IiwRAZurUNBjYTUOBz3/Xxf7oWOk1 vXV+A8mACQKjV6YhwjBo5pH9ZdW3rLNGtPvI8cWHvFQouTKHaBontV2gxPIONB37oK2m LGgg== X-Gm-Message-State: AOAM532mj+uJpSEygPcClHnDzdlAs5EFP91TemGZ30X8CIfSgV0an4Vb otRF9zCTy9cFibSjdGqdb7SgOFiBHSVYuJAN3mOyKFN1BqmRIAlE2WuZC1iXzd2PJItU33xEo9X 7sToYkQPIosoAZc1yqlzFDYty X-Received: by 2002:adf:b18d:: with SMTP id q13mr2390360wra.256.1597917395684; Thu, 20 Aug 2020 02:56:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrfr+Qru5BiCr9hmj1YTIj41N0i8y3XjstZXt12asbQQWLh4g4cNP2GQ/YcdxlhzPJglbGfw== X-Received: by 2002:adf:b18d:: with SMTP id q13mr2390326wra.256.1597917395332; Thu, 20 Aug 2020 02:56:35 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:1cc0:4e4e:f1a9:1745? ([2001:b07:6468:f312:1cc0:4e4e:f1a9:1745]) by smtp.gmail.com with ESMTPSA id l11sm3087714wme.11.2020.08.20.02.56.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Aug 2020 02:56:34 -0700 (PDT) Subject: Re: [PATCH 2/8] KVM: nSVM: rename nested 'vmcb' to vmcb_gpa in few places To: Maxim Levitsky , kvm@vger.kernel.org Cc: Jim Mattson , Joerg Roedel , Borislav Petkov , Thomas Gleixner , "H. Peter Anvin" , Vitaly Kuznetsov , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , Ingo Molnar , Wanpeng Li , Sean Christopherson References: <20200820091327.197807-1-mlevitsk@redhat.com> <20200820091327.197807-3-mlevitsk@redhat.com> From: Paolo Bonzini Message-ID: Date: Thu, 20 Aug 2020 11:56:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200820091327.197807-3-mlevitsk@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/08/20 11:13, Maxim Levitsky wrote: > No functional changes. > > Signed-off-by: Maxim Levitsky > --- > arch/x86/kvm/svm/nested.c | 10 +++++----- > arch/x86/kvm/svm/svm.c | 13 +++++++------ > arch/x86/kvm/svm/svm.h | 2 +- > 3 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index fb68467e6049..d9755eab2199 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -431,7 +431,7 @@ int enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa, > { > int ret; > > - svm->nested.vmcb = vmcb_gpa; > + svm->nested.vmcb_gpa = vmcb_gpa; > load_nested_vmcb_control(svm, &nested_vmcb->control); > nested_prepare_vmcb_save(svm, nested_vmcb); > nested_prepare_vmcb_control(svm); > @@ -568,7 +568,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) > struct vmcb *vmcb = svm->vmcb; > struct kvm_host_map map; > > - rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb), &map); > + rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb_gpa), &map); > if (rc) { > if (rc == -EINVAL) > kvm_inject_gp(&svm->vcpu, 0); > @@ -579,7 +579,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) > > /* Exit Guest-Mode */ > leave_guest_mode(&svm->vcpu); > - svm->nested.vmcb = 0; > + svm->nested.vmcb_gpa = 0; > WARN_ON_ONCE(svm->nested.nested_run_pending); > > /* in case we halted in L2 */ > @@ -1018,7 +1018,7 @@ static int svm_get_nested_state(struct kvm_vcpu *vcpu, > > /* First fill in the header and copy it out. */ > if (is_guest_mode(vcpu)) { > - kvm_state.hdr.svm.vmcb_pa = svm->nested.vmcb; > + kvm_state.hdr.svm.vmcb_pa = svm->nested.vmcb_gpa; > kvm_state.size += KVM_STATE_NESTED_SVM_VMCB_SIZE; > kvm_state.flags |= KVM_STATE_NESTED_GUEST_MODE; > > @@ -1128,7 +1128,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, > copy_vmcb_control_area(&hsave->control, &svm->vmcb->control); > hsave->save = save; > > - svm->nested.vmcb = kvm_state->hdr.svm.vmcb_pa; > + svm->nested.vmcb_gpa = kvm_state->hdr.svm.vmcb_pa; > load_nested_vmcb_control(svm, &ctl); > nested_prepare_vmcb_control(svm); > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 562a79e3e63a..4338d2a2596e 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -1102,7 +1102,7 @@ static void init_vmcb(struct vcpu_svm *svm) > } > svm->asid_generation = 0; > > - svm->nested.vmcb = 0; > + svm->nested.vmcb_gpa = 0; > svm->vcpu.arch.hflags = 0; > > if (!kvm_pause_in_guest(svm->vcpu.kvm)) { > @@ -3884,7 +3884,7 @@ static int svm_pre_enter_smm(struct kvm_vcpu *vcpu, char *smstate) > /* FED8h - SVM Guest */ > put_smstate(u64, smstate, 0x7ed8, 1); > /* FEE0h - SVM Guest VMCB Physical Address */ > - put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb); > + put_smstate(u64, smstate, 0x7ee0, svm->nested.vmcb_gpa); > > svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX]; > svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP]; > @@ -3903,17 +3903,18 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) > struct vmcb *nested_vmcb; > struct kvm_host_map map; > u64 guest; > - u64 vmcb; > + u64 vmcb_gpa; > int ret = 0; > > guest = GET_SMSTATE(u64, smstate, 0x7ed8); > - vmcb = GET_SMSTATE(u64, smstate, 0x7ee0); > + vmcb_gpa = GET_SMSTATE(u64, smstate, 0x7ee0); > > if (guest) { > - if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb), &map) == -EINVAL) > + if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map) == -EINVAL) > return 1; > + > nested_vmcb = map.hva; > - ret = enter_svm_guest_mode(svm, vmcb, nested_vmcb); > + ret = enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb); > kvm_vcpu_unmap(&svm->vcpu, &map, true); > } > > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index a798e1731709..03f2f082ef10 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -85,7 +85,7 @@ struct svm_nested_state { > struct vmcb *hsave; > u64 hsave_msr; > u64 vm_cr_msr; > - u64 vmcb; > + u64 vmcb_gpa; > u32 host_intercept_exceptions; > > /* These are the merged vectors */ > Please use vmcb12_gpa, and svm->nested.vmcb12 for the VMCB in patch 6. (You probably also what to have local variables named vmcb12 in patch 6 to avoid too-long lines). Paolo