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=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL 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 88AC3C432BE for ; Tue, 31 Aug 2021 13:37:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 667F560FE6 for ; Tue, 31 Aug 2021 13:37:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237198AbhHaNiA (ORCPT ); Tue, 31 Aug 2021 09:38:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232909AbhHaNh7 (ORCPT ); Tue, 31 Aug 2021 09:37:59 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFD9DC061760 for ; Tue, 31 Aug 2021 06:37:03 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id x10-20020a056830408a00b004f26cead745so22761145ott.10 for ; Tue, 31 Aug 2021 06:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=S0ivpO+/wBB1QVyedUdLAO/h8IikuLBE6+1HWRVEtJg=; b=hTbafWMaGRLRJ9tKhAqzBgzS/YZt6LXaz0EPdsC7KAJwvEuG024HTopG2ksSIKkBK7 OBrxyHGlj0TIdRYtsHhbjtHmrEPK1ABDBs39Bf2ECzzrBCqmg0RVBubDr8UkH9EAjHQ+ rr06jzMABpceWSErqfzPoZEdJ2C9hhGmREPOVYL01usmJojIemPT+rjpxXZRbP6Y7ojJ 92ehojO4YQf9dsfB4Y5xDPf7+OQdQJs8yCazJC1CIhxqEbMpmP/DpdsI7acoaa6JfDSe vb+henU4Ifd6KaCGrOz31NFAuIEmdeD67upgLFeEOEDncQR6ztoIi/YydBxFaoeziEWN 0Rqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=S0ivpO+/wBB1QVyedUdLAO/h8IikuLBE6+1HWRVEtJg=; b=J0ec3t3gqFfmeyJU/gS0YYP4rrrT7p4Mu/yLZmOVsC2cVcfyfvXqj6Ly8JBXwc3k6z yUvwm56JVXm+i1NqoNT5+YUCRx6QXU6mKYiqJNFWQIiRy72iD2I5YPeB4bV/RaMnFk2r vajAvN4+2F38WB6hL334j1xdQPU5S29VOG/h0fX1/JViqJr+vVCouo5Os7BNtJNErWLi OQy9kMnvfZChbgsP8uQywPVnjrwa9ok8rMgadBKEcyYBRVRaAzVfOd0oXgRJy6IF1Jfy 7jH57WurdAuy4QP78IRlxM8p3wXkeXf15btxfsQNU+l/pHn2Ktr7G2axg0X/BCdOFrQC HHJw== X-Gm-Message-State: AOAM531YuA47pZOsbPFQi3GelKBqheDKBZT18oWgrPU6I3KwAif91DFF +4EmxVXNxTbm9c+k8niljF7ZTTDdi59R3TUpDoTEgqe1gxw= X-Google-Smtp-Source: ABdhPJzVFM5xVxXl6RHQsEzsIQNEfzCFs/8mFrBGneTSOyHXnj3FE3qiwldQHAmRi6/mm+eQ3PZiKx1Tp9zqvJ7SQKE= X-Received: by 2002:a05:6830:2b2c:: with SMTP id l44mr23760369otv.238.1630417022988; Tue, 31 Aug 2021 06:37:02 -0700 (PDT) MIME-Version: 1.0 References: <20210830205717.3530483-1-pgonda@google.com> <20210830205717.3530483-3-pgonda@google.com> In-Reply-To: <20210830205717.3530483-3-pgonda@google.com> From: Marc Orr Date: Tue, 31 Aug 2021 06:36:51 -0700 Message-ID: Subject: Re: [PATCH 2/3 V6] KVM, SEV: Add support for SEV-ES intra host migration To: Peter Gonda Cc: kvm list , Paolo Bonzini , Sean Christopherson , David Rientjes , "Dr . David Alan Gilbert" , Brijesh Singh , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Aug 30, 2021 at 1:57 PM Peter Gonda wrote: > > For SEV-ES to work with intra host migration the VMSAs, GHCB metadata, > and other SEV-ES info needs to be preserved along with the guest's > memory. > > Signed-off-by: Peter Gonda > Cc: Marc Orr > Cc: Paolo Bonzini > Cc: Sean Christopherson > Cc: David Rientjes > Cc: Dr. David Alan Gilbert > Cc: Brijesh Singh > Cc: Vitaly Kuznetsov > Cc: Wanpeng Li > Cc: Jim Mattson > Cc: Joerg Roedel > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: "H. Peter Anvin" > Cc: kvm@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > arch/x86/kvm/svm/sev.c | 62 ++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 60 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index 063cf26528bc..3324eed1a39e 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -1545,6 +1545,59 @@ static void migrate_info_from(struct kvm_sev_info *dst, > list_replace_init(&src->regions_list, &dst->regions_list); > } > > +static int migrate_vmsa_from(struct kvm *dst, struct kvm *src) > +{ > + int i, num_vcpus; > + struct kvm_vcpu *dst_vcpu, *src_vcpu; > + struct vcpu_svm *dst_svm, *src_svm; > + > + num_vcpus = atomic_read(&dst->online_vcpus); > + if (num_vcpus != atomic_read(&src->online_vcpus)) { > + pr_warn_ratelimited( > + "Source and target VMs must have same number of vCPUs.\n"); > + return -EINVAL; > + } > + > + for (i = 0; i < num_vcpus; ++i) { > + src_vcpu = src->vcpus[i]; > + if (!src_vcpu->arch.guest_state_protected) { > + pr_warn_ratelimited( > + "Source ES VM vCPUs must have protected state.\n"); > + return -EINVAL; > + } > + } > + > + for (i = 0; i < num_vcpus; ++i) { > + src_vcpu = src->vcpus[i]; > + src_svm = to_svm(src_vcpu); > + dst_vcpu = dst->vcpus[i]; > + dst_svm = to_svm(dst_vcpu); > + > + /* > + * Copy VMSA and GHCB fields from the source to the destination. > + * Clear them on the source to prevent the VM running and > + * changing the state of the VMSA/GHCB unexpectedly. > + */ > + dst_vcpu->vcpu_id = src_vcpu->vcpu_id; > + dst_svm->vmsa = src_svm->vmsa; > + src_svm->vmsa = NULL; > + dst_svm->ghcb = src_svm->ghcb; > + src_svm->ghcb = NULL; > + dst_svm->vmcb->control.ghcb_gpa = > + src_svm->vmcb->control.ghcb_gpa; > + src_svm->vmcb->control.ghcb_gpa = 0; > + dst_svm->ghcb_sa = src_svm->ghcb_sa; > + src_svm->ghcb_sa = NULL; > + dst_svm->ghcb_sa_len = src_svm->ghcb_sa_len; > + src_svm->ghcb_sa_len = 0; > + dst_svm->ghcb_sa_sync = src_svm->ghcb_sa_sync; > + src_svm->ghcb_sa_sync = false; > + dst_svm->ghcb_sa_free = src_svm->ghcb_sa_free; > + src_svm->ghcb_sa_free = false; > + } > + return 0; > +} > + > int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd) > { > struct kvm_sev_info *dst_sev = &to_kvm_svm(kvm)->sev_info; > @@ -1556,7 +1609,7 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd) > if (ret) > return ret; > > - if (!sev_guest(kvm) || sev_es_guest(kvm)) { > + if (!sev_guest(kvm)) { > ret = -EINVAL; > pr_warn_ratelimited("VM must be SEV enabled to migrate to.\n"); > goto out_unlock; > @@ -1580,13 +1633,18 @@ int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd) > if (ret) > goto out_fput; > > - if (!sev_guest(source_kvm) || sev_es_guest(source_kvm)) { > + if (!sev_guest(source_kvm)) { > ret = -EINVAL; > pr_warn_ratelimited( > "Source VM must be SEV enabled to migrate from.\n"); > goto out_source; > } > > + if (sev_es_guest(kvm)) { > + ret = migrate_vmsa_from(kvm, source_kvm); > + if (ret) > + goto out_source; > + } > migrate_info_from(dst_sev, &to_kvm_svm(source_kvm)->sev_info); > ret = 0; > > -- > 2.33.0.259.gc128427fd7-goog > Reviewed-by: Marc Orr