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=-26.2 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, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 80742C433EF for ; Tue, 21 Sep 2021 15:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6429A61165 for ; Tue, 21 Sep 2021 15:04:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233897AbhIUPF1 (ORCPT ); Tue, 21 Sep 2021 11:05:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233857AbhIUPFT (ORCPT ); Tue, 21 Sep 2021 11:05:19 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DE7CC061574 for ; Tue, 21 Sep 2021 08:03:51 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id 3-20020a620603000000b0042aea40c2ddso16158249pfg.9 for ; Tue, 21 Sep 2021 08:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=2SspZ9TzwoWbKU4jWqktr8ubMLDHgH+xxzPwNA01OLI=; b=tDkyvj20ClPf+bnCzg37gjA/DXM2bIXkR4h6uG0DpkudkvVM6PDu77/KCNRRUbQJ3M L34Tp2wuWyaTu49ysJqWHklQ9rVPzPoQXnOygBZmY1jWzIYXAjES2+8eLBXtwj4YXZfi 4M3bqJ+VUgKGLd2A7u/62H8nxzAkdgAR5iVCyLbuSfj36dK0H+Ao3vTKYoXCyQnVi3UR oNkmpwzGmww/n3kLehFMtNhRXFGRWetr/95MgcU20eXUMRAXbVW0avu5ggWQmBdF4UpN SQ7Cp3zcZNGuPfGZFfS61LL8RDBGwrCvxP6CYahN8SortG9iviLf44KNyXkzx18NZPNG KPVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=2SspZ9TzwoWbKU4jWqktr8ubMLDHgH+xxzPwNA01OLI=; b=oc/+i/JlWffpaAkxU+L6/tsYVWRfTxw/gbgM+Z9t/Xr2THLZ/tGOW+8ToH8yBkX5r7 +uwTvRwizM3vf6ZSlShHMegcqRY78gchIQKY4WMAOekgVVHcejUpgs3f2FAaq7JWwcrU 0tPGuI9kRxfXOALW1wHvTeVKH/VKNH88T59kDW/mGVgemaiM5ZCGbpIUBsXyx266hYYX YZTtqvsH7nb+z8+VgHv1xdNg1IRUfcGaRrhfy25pWACu2aol6QmCqx2No+03XTZRL98I sqY5G7xe4X0OJVun/pKOLnzKfHuhQaC/QcDXiOOjJXIeakN2Q96aQALaNsYUlJin2LNf mQKQ== X-Gm-Message-State: AOAM532QiG9Pim/ZO8i+yTwR/3SsTT7mIkWR7sE8rrLyr4nB5Jn3euJl VJJP0Qa4DIBz7kJTw8n3gA3T0e53NVE= X-Google-Smtp-Source: ABdhPJx9BrKLBHH0bPtVWwCfvYyiXtPThWjODSxB4mbJWMrVJZNDsfk62pViMpDo3JCjCgAlRlj3rTRMd3k= X-Received: from pgonda1.kir.corp.google.com ([2620:15c:29:204:784b:c8dc:f1c:ecde]) (user=pgonda job=sendgmr) by 2002:a17:902:c643:b0:13c:957d:5604 with SMTP id s3-20020a170902c64300b0013c957d5604mr27961802pls.10.1632236630706; Tue, 21 Sep 2021 08:03:50 -0700 (PDT) Date: Tue, 21 Sep 2021 08:03:44 -0700 In-Reply-To: <20210921150345.2221634-1-pgonda@google.com> Message-Id: <20210921150345.2221634-2-pgonda@google.com> Mime-Version: 1.0 References: <20210921150345.2221634-1-pgonda@google.com> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog Subject: [PATCH 1/2] KVM: SEV: Update svm_vm_copy_asid_from for SEV-ES From: Peter Gonda To: kvm@vger.kernel.org Cc: Peter Gonda , Marc Orr , Nathan Tempelman , Paolo Bonzini , Sean Christopherson , Steve Rutherford , Brijesh Singh , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For mirroring SEV-ES the mirror VM will need more then just the ASID. The FD and the handle are required to all the mirror to call psp commands. The mirror VM will need to call KVM_SEV_LAUNCH_UPDATE_VMSA to setup its vCPUs' VMSAs for SEV-ES. Signed-off-by: Peter Gonda Cc: Marc Orr Cc: Nathan Tempelman Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Steve Rutherford Cc: Brijesh Singh Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/x86/kvm/svm/sev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 75e0b21ad07c..08c53a4e060e 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1715,8 +1715,7 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd) { struct file *source_kvm_file; struct kvm *source_kvm; - struct kvm_sev_info *mirror_sev; - unsigned int asid; + struct kvm_sev_info source_sev, *mirror_sev; int ret; source_kvm_file = fget(source_fd); @@ -1739,7 +1738,8 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd) goto e_source_unlock; } - asid = to_kvm_svm(source_kvm)->sev_info.asid; + memcpy(&source_sev, &to_kvm_svm(source_kvm)->sev_info, + sizeof(source_sev)); /* * The mirror kvm holds an enc_context_owner ref so its asid can't @@ -1759,8 +1759,16 @@ int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd) /* Set enc_context_owner and copy its encryption context over */ mirror_sev = &to_kvm_svm(kvm)->sev_info; mirror_sev->enc_context_owner = source_kvm; - mirror_sev->asid = asid; mirror_sev->active = true; + mirror_sev->asid = source_sev.asid; + mirror_sev->fd = source_sev.fd; + mirror_sev->es_active = source_sev.es_active; + mirror_sev->handle = source_sev.handle; + /* + * Do not copy ap_jump_table. Since the mirror does not share the same + * KVM contexts as the original, and they may have different + * memory-views. + */ mutex_unlock(&kvm->lock); return 0; -- 2.33.0.464.g1972c5931b-goog