From patchwork Wed Dec 7 01:02:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dionna Amalie Glaze X-Patchwork-Id: 30564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3140704wrr; Tue, 6 Dec 2022 17:04:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf5tqxgWDtf9Tr+jYfUG0NPrIEFYCDlUChhUDU0z50L+Tgm1IHVqP6wKs6Dvhj+s2h7SdKRT X-Received: by 2002:a63:ff0b:0:b0:477:362d:85d3 with SMTP id k11-20020a63ff0b000000b00477362d85d3mr63196130pgi.395.1670375082321; Tue, 06 Dec 2022 17:04:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670375082; cv=none; d=google.com; s=arc-20160816; b=L9A1ZNfn6KslH5tAO52MtfHBzsHE7g39B5YNvbhWK0DncJ4shfwFMl730RKhyLHMv5 SCZ2creShHyMIiRYKGJnMWrNMpg/ufsj7cNxMaWnMkQDNwe0errnU9gwiJBAKC2xeUDD LBMCmIyFzVWRp706djkenIXUjbbA8K/U4RTTtBGb7Z84OmM36xw8BNG0LnR3FzG85Ahy EDuJZb+CoW17fkv8dbTKeUjNMlkUDM2y1SK8XKnFxIri/dIlYEuDzaMnm9hsQ0uKRd3l jPVvL0yaRxQdxWeD8bMO/qTP/OCg0hQSLiPTkHdYZgmbsG09eIk8/pabrNr+8bEhuINW 01qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=Kq4nsNsu12aUA8GuDAR6Rk/S1sw8FFUkbgn/FDY4oJQ=; b=nfhi0VASuj9fHbbqMPWcKFx9XAobSKzPp1+ApwWQCKMIgpeLs7/Kn0ZzeEOU0QNYUF NoqaqsxmT3gsxBzt3vjwYzlM3bZCJUxEut2m7g0aHUVpVhxvO/wzoU0BU48ehD6cR92k 3tpVU2GwQorrOXhjE4wK1ptJBGlUlEzTFnk+8X/iP5ABJ8j2ae/ucjcmYPR6UWyiEwFA MSsbskRTXE5a73yW/TKaekf/yaB3TOd/7PhxayRccPAcTqO2EwbZVhFP83fYCcu90066 LKgdyoKlvG9SypYKOv9lGbgI7XBJRsUAk0pVQQ8jwQmBL9RjPvOjNV04qjdKsq0/YyKN /+Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="jHhlxV/U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f10-20020a636a0a000000b004611cfaca6asi18638249pgc.381.2022.12.06.17.04.29; Tue, 06 Dec 2022 17:04:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="jHhlxV/U"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229722AbiLGBCb (ORCPT + 99 others); Tue, 6 Dec 2022 20:02:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbiLGBC2 (ORCPT ); Tue, 6 Dec 2022 20:02:28 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 574A44F18E for ; Tue, 6 Dec 2022 17:02:27 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id d3-20020a056a0010c300b005728633819aso14053316pfu.8 for ; Tue, 06 Dec 2022 17:02:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Kq4nsNsu12aUA8GuDAR6Rk/S1sw8FFUkbgn/FDY4oJQ=; b=jHhlxV/UdgCOLo3JvbhKjdSCPKfo+9YiKMvILOwzfOeo+1FL0arji+cdZXGjyGCoxB M36Mkfxno3gFNpEf4awKk+CQ6qVw/+bPB9N3JN7odi6kusKJ8pMqmLoTFH9hxcnRsdl6 lBG+/2HEsd9cwAnxSD2pSZT/LKUNUXn/GcXYbDPLpFZ8z8bk1r8bxD3gx9bszDl+gPst xRs8ai9nkPxFjAFwtWY2MqlhWQsLn7BG8YMcnELOd5ziGzib4Kj6KqCSf2NJOmwP2TOM 7PLlqgNyqF3z7iuoect4es25mOXHQeCRutMjntilg60uY0KsLhwrUTGi9uV+m0oaynkI UMkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kq4nsNsu12aUA8GuDAR6Rk/S1sw8FFUkbgn/FDY4oJQ=; b=l1oQkxw+lxtNXr+IRJHRULuLLCTFSSmmHVnrl1bGpjs+koHn9EqF6/uUzKzZCV0pxU 9/5Gy/TSjFM3W7Do8MKOtZFUDj9LbszNo3TSj1PzpVpy6Q0lVrDfDb+hXzg2MdY5Xh0N 2ksCcfDYywFULZ1SYPp6x1JlbvdxHE4HXf9v7dWcZ0mceBtQjUYH2LgjIFCuP1P5zeLU 1pqaJIiQ9Jh7BVq/KwvGzfdqY1/9hUA3Pqgu56J8d+f4GYY4ao25lpkzw2eu89wGGCJN 6mufmyHsgKXkJruhkUnQZyTJHWPWnJDx6ktF1Jf9QcsNWEk0Qj7ti9KGjpoXR1bfUcTY Lf3w== X-Gm-Message-State: ANoB5pl8sYUBV8jv7r5G2pHuPuhK+rVVFZ4UtwAI33azhnOlXCAebJ5H 6BN1w7EnCSnn/skFTC6t014qfmyed+Tu3kRPTdSFsgNaJ77M4KsIH5KKfEZubvKtuoPPgjVj3NH No9gnHEQXqt7NTpHW0P6PgrMNqyNMiSXGkZW+H4dTulg/3iK1EXNvi5e3GYPo4ooU/Pw+eH5uxj JpssOroQE= X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a05:6a00:1f0f:b0:56e:7424:bc0f with SMTP id be15-20020a056a001f0f00b0056e7424bc0fmr81486148pfb.11.1670374946793; Tue, 06 Dec 2022 17:02:26 -0800 (PST) Date: Wed, 7 Dec 2022 01:02:07 +0000 In-Reply-To: <20221207010210.2563293-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20221207010210.2563293-1-dionnaglaze@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221207010210.2563293-2-dionnaglaze@google.com> Subject: [PATCH v9 1/4] crypto: ccp - Name -1 return value as SEV_RET_NO_FW_CALL From: Dionna Glaze To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Peter Gonda , Thomas Lendacky , Paolo Bonzini , Joerg Roedel , Ingo Molnar , Andy Lutomirsky , John Allen , Herbert Xu , "David S. Miller" , Borislav Petkov , Dionna Glaze X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751515222118704023?= X-GMAIL-MSGID: =?utf-8?q?1751515222118704023?= From: Peter Gonda The PSP can return a "firmware error" code of -1 in circumstances where the PSP is not actually called. To make this protocol unambiguous, the value is named SEV_RET_NO_FW_CALL. Cc: Thomas Lendacky Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Ingo Molnar Cc: Andy Lutomirsky Cc: John Allen Cc: Herbert Xu Cc: "David S. Miller" Cc: Borislav Petkov Signed-off-by: Peter Gonda Signed-off-by: Dionna Glaze Signed-off-by: Peter Gonda Signed-off-by: Dionna Glaze Signed-off-by: Borislav Petkov (AMD) Acked-by: Tom Lendacky --- Documentation/virt/coco/sev-guest.rst | 2 +- drivers/crypto/ccp/sev-dev.c | 22 ++++++++++++++-------- include/uapi/linux/psp-sev.h | 7 +++++++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Documentation/virt/coco/sev-guest.rst b/Documentation/virt/coco/sev-guest.rst index bf593e88cfd9..e76393e389eb 100644 --- a/Documentation/virt/coco/sev-guest.rst +++ b/Documentation/virt/coco/sev-guest.rst @@ -41,7 +41,7 @@ The guest ioctl should be issued on a file descriptor of the /dev/sev-guest devi The ioctl accepts struct snp_user_guest_request. The input and output structure is specified through the req_data and resp_data field respectively. If the ioctl fails to execute due to a firmware error, then fw_err code will be set otherwise the -fw_err will be set to 0x00000000000000ff. +fw_err will be set to 0x00000000ffffffff, i.e., the lower 32-bits are -1. The firmware checks that the message sequence counter is one greater than the guests message sequence counter. If guest driver fails to increment message diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 06fc7156c04f..ac205f78a595 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -440,12 +440,19 @@ static int __sev_init_ex_locked(int *error) return __sev_do_cmd_locked(SEV_CMD_INIT_EX, &data, error); } +static inline int __sev_do_init_locked(int *psp_ret) +{ + if (sev_init_ex_buffer) + return __sev_init_ex_locked(psp_ret); + else + return __sev_init_locked(psp_ret); +} + static int __sev_platform_init_locked(int *error) { struct psp_device *psp = psp_master; struct sev_device *sev; - int rc = 0, psp_ret = -1; - int (*init_function)(int *error); + int rc = 0, psp_ret = SEV_RET_NO_FW_CALL; if (!psp || !psp->sev_data) return -ENODEV; @@ -456,15 +463,12 @@ static int __sev_platform_init_locked(int *error) return 0; if (sev_init_ex_buffer) { - init_function = __sev_init_ex_locked; rc = sev_read_init_ex_file(); if (rc) return rc; - } else { - init_function = __sev_init_locked; } - rc = init_function(&psp_ret); + rc = __sev_do_init_locked(&psp_ret); if (rc && psp_ret == SEV_RET_SECURE_DATA_INVALID) { /* * Initialization command returned an integrity check failure @@ -473,9 +477,11 @@ static int __sev_platform_init_locked(int *error) * initialization function should succeed by replacing the state * with a reset state. */ - dev_err(sev->dev, "SEV: retrying INIT command because of SECURE_DATA_INVALID error. Retrying once to reset PSP SEV state."); - rc = init_function(&psp_ret); + dev_err(sev->dev, +"SEV: retrying INIT command because of SECURE_DATA_INVALID error. Retrying once to reset PSP SEV state."); + rc = __sev_do_init_locked(&psp_ret); } + if (error) *error = psp_ret; diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 91b4c63d5cbf..e8cfb8bde0d7 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -36,6 +36,13 @@ enum { * SEV Firmware status code */ typedef enum { + /* + * This error code is not in the SEV spec but is added to convey that + * there was an error that prevented the SEV Firmware from being called. + * The SEV API error codes are 16 bits, so the -1 value will not overlap + * with possible values from the specification. + */ + SEV_RET_NO_FW_CALL = -1, SEV_RET_SUCCESS = 0, SEV_RET_INVALID_PLATFORM_STATE, SEV_RET_INVALID_GUEST_STATE,