From patchwork Wed Aug 18 05:39:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingwei Zhang X-Patchwork-Id: 499098 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.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, URIBL_BLOCKED,USER_AGENT_GIT,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 EEA52C432BE for ; Wed, 18 Aug 2021 05:39:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9FC96108E for ; Wed, 18 Aug 2021 05:39:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237905AbhHRFkG (ORCPT ); Wed, 18 Aug 2021 01:40:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237936AbhHRFj4 (ORCPT ); Wed, 18 Aug 2021 01:39:56 -0400 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ACD6C0613D9 for ; Tue, 17 Aug 2021 22:39:22 -0700 (PDT) Received: by mail-qv1-xf4a.google.com with SMTP id f10-20020a0ccc8a0000b02903521ac3b9d7so1434163qvl.15 for ; Tue, 17 Aug 2021 22:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=Ly2mUbxWquJWXZ0n6mTgg8xCjEBs0jIcnS3CpYGgC5c=; b=vPynDVXk6ehrhHgxl1+QUtZVgsSVAdooemO288d0Th3g9VuiMFd0vBEfRJ5sZl+oIh Equoj8czaMRmDg30celH+1WeSMqy/eeC228Y4vAoxCR8UHLlcAXc9jiM4Aoncw+Ob3tC GVSAOYRy9Rbz//XzvA+cGNHoJs7eRXfvSU0uln0Q1RM+OAGa1ivo0osSRWhmZkuklxwE DyXXlA3shXC1MV8e0DCrne/rrfc0haRaM8gmRigsLZxgcu5inkI8wiDAaMNBLY0dW6I8 q6NMrCZiOLetroHAZ3WGqOCkFz1RL5iEQNL9jNMWM3Py4MLdcd/SyoKDfGoQhdEFjJ1f Twlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=Ly2mUbxWquJWXZ0n6mTgg8xCjEBs0jIcnS3CpYGgC5c=; b=jLhb+wdYi69D8/iTIHb06yET8/ct2Pevx4YuDNeTISUwnjNsgXyH9IEzE3QXCsxtBR x0wpyMPXyD7ABx4HTV/qEmI6dHPCzbQpDYU/+O7XNELS1OvAp1MYt1lq/gDOaBiCO1L/ hOBQPMPjG/8u5pKVJc7JWUYaFun/4+7GEmnBt23O+DUVS8l7eQUcQ9dN3d7/iaprRGyO iNETB6umy1exQz59OUS9SA0SwuDc/Qym003EXg0b3SgmdL81fnd6FtEo4n3iD9bU7Wo5 KwjiTzBbtkJ4hOtuSTE4QSukMcIv1pyOnVVC0YPFEECOrGho4HsC7sV67OwOV1YDnPxG 2KUA== X-Gm-Message-State: AOAM5338sQl/ujxWBg88lzsgwWG9qGp8/j3FQdYu9c0ZCAWMFzeIbWbR Yf22JJFwq6A+xlVyzV9CMgsNW/iyUoOC X-Google-Smtp-Source: ABdhPJzzp5zo1v7+tkTWIY0BI2yhSNUQ8K2xJDgnqbCm1fHs6P2WetL/0J1YhbNXLy5m2t0dl7vwoLSI1OBG X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a05:6214:f0c:: with SMTP id gw12mr7442298qvb.2.1629265161426; Tue, 17 Aug 2021 22:39:21 -0700 (PDT) Reply-To: Mingwei Zhang Date: Wed, 18 Aug 2021 05:39:08 +0000 In-Reply-To: <20210818053908.1907051-1-mizhang@google.com> Message-Id: <20210818053908.1907051-5-mizhang@google.com> Mime-Version: 1.0 References: <20210818053908.1907051-1-mizhang@google.com> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog Subject: [PATCH v2 4/4] KVM: SVM: move sev_unbind_asid and DF_FLUSH logic into psp From: Mingwei Zhang To: Paolo Bonzini , Brijesh Singh , Tom Lendacky , John Allen Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Alper Gun , Borislav Petkov , David Rienjes , Marc Orr , Peter Gonda , Vipin Sharma , Mingwei Zhang Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org In KVM SEV code, sev_unbind_asid and sev_guest_df_flush needs to be serialized because DEACTIVATE command in PSP may clear the WBINVD indicator and cause DF_FLUSH to fail. This is a PSP level detail that is not necessary to expose to KVM. So put both functions as well as the RWSEM into the sev-dev.c. No functional change intended. Cc: Alper Gun Cc: Borislav Petkov Cc: Brijesh Singh Cc: David Rienjes Cc: Marc Orr Cc: John Allen Cc: Peter Gonda Cc: Sean Christopherson Cc: Tom Lendacky Cc: Vipin Sharma Acked-by: Brijesh Singh Signed-off-by: Mingwei Zhang --- arch/x86/kvm/svm/sev.c | 35 +++------------------------------- drivers/crypto/ccp/sev-dev.c | 37 +++++++++++++++++++++++++++++++++++- include/linux/psp-sev.h | 19 +++++++++++++++++- 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 157962aa4aff..ab5f14adc591 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -57,7 +57,6 @@ module_param_named(sev_es, sev_es_enabled, bool, 0444); #endif /* CONFIG_KVM_AMD_SEV */ static u8 sev_enc_bit; -static DECLARE_RWSEM(sev_deactivate_lock); static DEFINE_MUTEX(sev_bitmap_lock); unsigned int max_sev_asid; static unsigned int min_sev_asid; @@ -84,20 +83,9 @@ static int sev_flush_asids(int min_asid, int max_asid) if (asid > max_asid) return -EBUSY; - /* - * DEACTIVATE will clear the WBINVD indicator causing DF_FLUSH to fail, - * so it must be guarded. - */ - down_write(&sev_deactivate_lock); - - wbinvd_on_all_cpus(); ret = sev_guest_df_flush(&error); - - up_write(&sev_deactivate_lock); - if (ret) pr_err("SEV: DF_FLUSH failed, ret=%d, error=%#x\n", ret, error); - return ret; } @@ -198,23 +186,6 @@ static void sev_asid_free(struct kvm_sev_info *sev) sev->misc_cg = NULL; } -static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) -{ - struct sev_data_deactivate deactivate; - - if (!handle) - return; - - deactivate.handle = handle; - - /* Guard DEACTIVATE against WBINVD/DF_FLUSH used in ASID recycling */ - down_read(&sev_deactivate_lock); - sev_guest_deactivate(&deactivate, NULL); - up_read(&sev_deactivate_lock); - - sev_guest_decommission(handle, NULL); -} - static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) { struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; @@ -329,7 +300,7 @@ static int sev_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp) /* return handle to userspace */ params.handle = start.handle; if (copy_to_user((void __user *)(uintptr_t)argp->data, ¶ms, sizeof(params))) { - sev_unbind_asid(kvm, start.handle); + sev_guest_unbind_asid(start.handle); ret = -EFAULT; goto e_free_session; } @@ -1377,7 +1348,7 @@ static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp) if (copy_to_user((void __user *)(uintptr_t)argp->data, ¶ms, sizeof(struct kvm_sev_receive_start))) { ret = -EFAULT; - sev_unbind_asid(kvm, start.handle); + sev_guest_unbind_asid(start.handle); goto e_free_session; } @@ -1788,7 +1759,7 @@ void sev_vm_destroy(struct kvm *kvm) mutex_unlock(&kvm->lock); - sev_unbind_asid(kvm, sev->handle); + sev_guest_unbind_asid(sev->handle); sev_asid_free(sev); } diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 325e79360d9e..e318a1a222f9 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -33,6 +33,7 @@ #define SEV_FW_NAME_SIZE 64 static DEFINE_MUTEX(sev_cmd_mutex); +static DECLARE_RWSEM(sev_deactivate_lock); static struct sev_misc_dev *misc_dev; static int psp_cmd_timeout = 100; @@ -932,10 +933,44 @@ EXPORT_SYMBOL_GPL(sev_guest_decommission); int sev_guest_df_flush(int *error) { - return sev_do_cmd(SEV_CMD_DF_FLUSH, NULL, error); + int ret; + /* + * DEACTIVATE will clear the WBINVD indicator causing DF_FLUSH to fail, + * so it must be guarded. + */ + down_write(&sev_deactivate_lock); + + wbinvd_on_all_cpus(); + + ret = sev_do_cmd(SEV_CMD_DF_FLUSH, NULL, error); + + up_write(&sev_deactivate_lock); + + return ret; } EXPORT_SYMBOL_GPL(sev_guest_df_flush); +int sev_guest_unbind_asid(unsigned int handle) +{ + struct sev_data_deactivate deactivate; + int ret; + + if (!handle) + return -EINVAL; + + deactivate.handle = handle; + + /* Guard DEACTIVATE against WBINVD/DF_FLUSH used in ASID recycling */ + down_read(&sev_deactivate_lock); + ret = sev_guest_deactivate(&deactivate, NULL); + up_read(&sev_deactivate_lock); + + sev_guest_decommission(handle, NULL); + + return ret; +} +EXPORT_SYMBOL_GPL(sev_guest_unbind_asid); + static void sev_exit(struct kref *ref) { misc_deregister(&misc_dev->misc); diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index be50446ff3f1..09447bce9665 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -580,6 +580,20 @@ int sev_issue_cmd_external_user(struct file *filep, unsigned int id, */ int sev_guest_deactivate(struct sev_data_deactivate *data, int *error); +/** + * sev_guest_unbind_asid - perform SEV DEACTIVATE command with lock held + * + * @handle: handle of the VM to deactivate + * + * Returns: + * 0 if the sev successfully processed the command + * -%ENODEV if the sev device is not available + * -%ENOTSUPP if the sev does not support SEV + * -%ETIMEDOUT if the sev command timed out + * -%EIO if the sev returned a non-zero return code + */ +int sev_guest_unbind_asid(unsigned int handle); + /** * sev_guest_activate - perform SEV ACTIVATE command * @@ -612,7 +626,7 @@ int sev_guest_activate(struct sev_data_activate *data, int *error); int sev_guest_bind_asid(int asid, unsigned int handle, int *error); /** - * sev_guest_df_flush - perform SEV DF_FLUSH command + * sev_guest_df_flush - perform SEV DF_FLUSH command with lock held * * @sev_ret: sev command return code * @@ -656,6 +670,9 @@ sev_guest_deactivate(struct sev_data_deactivate *data, int *error) { return -ENO static inline int sev_guest_decommission(unsigned int handle, int *error) { return -ENODEV; } +static inline int +sev_guest_unbind_asid(unsigned int handle) { return -ENODEV; } + static inline int sev_guest_activate(struct sev_data_activate *data, int *error) { return -ENODEV; }