From: Brijesh Singh <brijesh.singh@amd.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Cc: brijesh.singh@amd.com, Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Borislav Petkov <bp@suse.de>,
Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [PATCH v2 11/14] KVM: SVM: Move SEV VMCB tracking allocation to sev.c
Date: Thu, 14 Jan 2021 15:37:19 -0600 [thread overview]
Message-ID: <10d43bb0-e19d-6d53-20f7-fa73983adb4a@amd.com> (raw)
In-Reply-To: <20210114003708.3798992-12-seanjc@google.com>
On 1/13/21 6:37 PM, Sean Christopherson wrote:
> Move the allocation of the SEV VMCB array to sev.c to help pave the way
> toward encapsulating SEV enabling wholly within sev.c.
>
> No functional change intended.
>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> arch/x86/kvm/svm/sev.c | 13 +++++++++++++
> arch/x86/kvm/svm/svm.c | 17 ++++++++---------
> arch/x86/kvm/svm/svm.h | 1 +
> 3 files changed, 22 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 1a143340103e..a2c3e2d42a7f 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -1330,6 +1330,19 @@ void sev_hardware_teardown(void)
> sev_flush_asids();
> }
>
> +int sev_cpu_init(struct svm_cpu_data *sd)
> +{
> + if (!svm_sev_enabled())
> + return 0;
> +
> + sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1, sizeof(void *),
> + GFP_KERNEL | __GFP_ZERO);
I saw Tom recommended to use kzalloc.. instead of __GFP_ZERO in previous
patch. With that fixed,
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
> + if (!sd->sev_vmcbs)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> /*
> * Pages used by hardware to hold guest encrypted state must be flushed before
> * returning them to the system.
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index bb7b99743bea..89b95fb87a0c 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -552,23 +552,22 @@ static void svm_cpu_uninit(int cpu)
> static int svm_cpu_init(int cpu)
> {
> struct svm_cpu_data *sd;
> + int ret;
>
> sd = kzalloc(sizeof(struct svm_cpu_data), GFP_KERNEL);
> if (!sd)
> return -ENOMEM;
> sd->cpu = cpu;
> sd->save_area = alloc_page(GFP_KERNEL);
> - if (!sd->save_area)
> + if (!sd->save_area) {
> + ret = -ENOMEM;
> goto free_cpu_data;
> + }
> clear_page(page_address(sd->save_area));
>
> - if (svm_sev_enabled()) {
> - sd->sev_vmcbs = kmalloc_array(max_sev_asid + 1,
> - sizeof(void *),
> - GFP_KERNEL | __GFP_ZERO);
> - if (!sd->sev_vmcbs)
> - goto free_save_area;
> - }
> + ret = sev_cpu_init(sd);
> + if (ret)
> + goto free_save_area;
>
> per_cpu(svm_data, cpu) = sd;
>
> @@ -578,7 +577,7 @@ static int svm_cpu_init(int cpu)
> __free_page(sd->save_area);
> free_cpu_data:
> kfree(sd);
> - return -ENOMEM;
> + return ret;
>
> }
>
> diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
> index 8e169835f52a..4eb4bab0ca3e 100644
> --- a/arch/x86/kvm/svm/svm.h
> +++ b/arch/x86/kvm/svm/svm.h
> @@ -583,6 +583,7 @@ int svm_unregister_enc_region(struct kvm *kvm,
> void pre_sev_run(struct vcpu_svm *svm, int cpu);
> void __init sev_hardware_setup(void);
> void sev_hardware_teardown(void);
> +int sev_cpu_init(struct svm_cpu_data *sd);
> void sev_free_vcpu(struct kvm_vcpu *vcpu);
> int sev_handle_vmgexit(struct vcpu_svm *svm);
> int sev_es_string_io(struct vcpu_svm *svm, int size, unsigned int port, int in);
next prev parent reply other threads:[~2021-01-14 21:38 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 0:36 [PATCH v2 00/14] KVM: SVM: Misc SEV cleanups Sean Christopherson
2021-01-14 0:36 ` [PATCH v2 01/14] KVM: SVM: Zero out the VMCB array used to track SEV ASID association Sean Christopherson
2021-01-14 15:56 ` Tom Lendacky
2021-01-14 17:13 ` Sean Christopherson
2021-01-14 20:57 ` Brijesh Singh
2021-01-14 0:36 ` [PATCH v2 02/14] KVM: SVM: Free sev_asid_bitmap during init if SEV setup fails Sean Christopherson
2021-01-14 15:49 ` Tom Lendacky
2021-01-14 17:12 ` Sean Christopherson
2021-01-14 18:02 ` Tom Lendacky
2021-01-14 19:17 ` Sean Christopherson
2021-01-14 0:36 ` [PATCH v2 03/14] KVM: SVM: Move SEV module params/variables to sev.c Sean Christopherson
2021-01-14 19:07 ` Tom Lendacky
2021-01-14 20:59 ` Brijesh Singh
2021-01-14 0:36 ` [PATCH v2 04/14] x86/cpufeatures: Assign dedicated feature word for AMD mem encryption Sean Christopherson
2021-01-14 11:35 ` Borislav Petkov
2021-01-14 17:09 ` Sean Christopherson
2021-01-14 17:16 ` Borislav Petkov
2021-01-28 15:09 ` Paolo Bonzini
2021-01-14 21:17 ` Brijesh Singh
2021-01-14 0:36 ` [PATCH v2 05/14] KVM: x86: Override reported SME/SEV feature flags with host mask Sean Christopherson
2021-01-14 21:18 ` Brijesh Singh
2021-01-28 15:07 ` Paolo Bonzini
2021-01-28 17:09 ` Sean Christopherson
2021-01-28 17:25 ` Paolo Bonzini
2021-01-14 0:37 ` [PATCH v2 06/14] x86/sev: Drop redundant and potentially misleading 'sev_enabled' Sean Christopherson
2021-01-14 17:54 ` Tom Lendacky
2021-01-14 21:24 ` Brijesh Singh
2021-01-14 0:37 ` [PATCH v2 07/14] KVM: SVM: Append "_enabled" to module-scoped SEV/SEV-ES control variables Sean Christopherson
2021-01-14 21:28 ` Brijesh Singh
2021-01-14 0:37 ` [PATCH v2 08/14] KVM: SVM: Condition sev_enabled and sev_es_enabled on CONFIG_KVM_AMD_SEV=y Sean Christopherson
2021-01-14 20:56 ` Tom Lendacky
2021-01-14 21:28 ` Brijesh Singh
2021-01-14 0:37 ` [PATCH v2 09/14] KVM: SVM: Unconditionally invoke sev_hardware_teardown() Sean Christopherson
2021-01-14 21:26 ` Tom Lendacky
2021-01-14 21:32 ` Brijesh Singh
2021-01-14 0:37 ` [PATCH v2 10/14] KVM: SVM: Explicitly check max SEV ASID during sev_hardware_setup() Sean Christopherson
2021-01-14 21:35 ` Brijesh Singh
2021-01-14 21:49 ` Tom Lendacky
2021-01-14 0:37 ` [PATCH v2 11/14] KVM: SVM: Move SEV VMCB tracking allocation to sev.c Sean Christopherson
2021-01-14 21:37 ` Brijesh Singh [this message]
2021-01-14 21:53 ` Tom Lendacky
2021-01-14 22:15 ` Tom Lendacky
2021-01-14 0:37 ` [PATCH v2 12/14] KVM: SVM: Drop redundant svm_sev_enabled() helper Sean Christopherson
2021-01-14 21:44 ` Brijesh Singh
2021-01-14 22:51 ` Tom Lendacky
2021-01-14 0:37 ` [PATCH v2 13/14] KVM: SVM: Remove an unnecessary prototype declaration of sev_flush_asids() Sean Christopherson
2021-01-14 21:45 ` Brijesh Singh
2021-01-14 22:53 ` Tom Lendacky
2021-01-14 0:37 ` [PATCH v2 14/14] KVM: SVM: Skip SEV cache flush if no ASIDs have been used Sean Christopherson
2021-01-15 15:07 ` Tom Lendacky
2021-01-15 17:19 ` Sean Christopherson
2021-01-28 15:10 ` Paolo Bonzini
2021-01-28 16:29 ` Sean Christopherson
2021-01-28 16:59 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10d43bb0-e19d-6d53-20f7-fa73983adb4a@amd.com \
--to=brijesh.singh@amd.com \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=thomas.lendacky@amd.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).