From patchwork Thu Feb 16 12:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 58028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp278112wrn; Thu, 16 Feb 2023 04:45:07 -0800 (PST) X-Google-Smtp-Source: AK7set9j/OyvdYnBYUMl278LEGBx1H0MOv6N4hYi7vNteKbWLFUufA3zhWoEoadjRI564MrNchlY X-Received: by 2002:a62:1d05:0:b0:5a8:a570:45a0 with SMTP id d5-20020a621d05000000b005a8a57045a0mr4272734pfd.34.1676551507333; Thu, 16 Feb 2023 04:45:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676551507; cv=none; d=google.com; s=arc-20160816; b=ERgkj/dNHWOcB0A/KH3o+AZDAkkTPLGNfXPG0XGU/NSWeEtzEMsVhe2bjKlUidfZAE nt0DOho3/67eRngSzpf5uKF8eOXb2AfD6jACm8hrrJe7gK/4rDxPNQS9GXMYmg8x6SLR 9xcKPBVfI/6LmVC90tpdLbosbw9Rf7XuKo65dZB2dxFBPsmbPIPsTjw9T4n/Zb7DZjzP xbtam5+sIaZVR92v68+RgxzGs+uchmxNxnX0lmSarYf8IpYe/3ZElprfW7xwFP/LiBGU ZEysYjV9XX5N9t5pqobi6dUNt9ZHbmU2FDW0urwe1yKMKxGukO7KAl+BbKFHvgvcgoQ1 /DZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xAFRY6UWQLF1FP7olpHuR0CBZw+9W4Mq3Tn1rtwpBJM=; b=RiivfIf6OuLv72kLFnSwqR1S1Y3q+oo7M4dPq8WxvTZdSUTWOI3Xo9KjuSzw4+HMkF 3/iuGJkxkb8eLc0nPaTqLE24zuZrYjEYc4uaXXixDRE3+wuIewV409Z+Vms2+VA6qrJ+ R9T4hzL2YzglTwAoaC7+In3gjizAdIqtPSfhUBYmIdyZmcGzobLIjdt5Yq3O3CpHAtQG fq3gfLhIQ3Dv7xdCw3HelX738yfgJ/jTo4CYya3d7++w8JesZkJAP9HVVgzJ2LGp+5VT 7nlj6CFOdjqvJKIpRvHibE+vIFGJOdtqoE7DTLXcTqLCPSWgHsWUDmfH8r8aIch50Y5n 0YJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=aqIHPJNl; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 68-20020a621647000000b0059072f087b7si1432895pfw.135.2023.02.16.04.44.53; Thu, 16 Feb 2023 04:45:07 -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=@alien8.de header.s=dkim header.b=aqIHPJNl; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229921AbjBPMlg (ORCPT + 99 others); Thu, 16 Feb 2023 07:41:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229667AbjBPMle (ORCPT ); Thu, 16 Feb 2023 07:41:34 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A0902111 for ; Thu, 16 Feb 2023 04:41:32 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 27B8B1EC0936; Thu, 16 Feb 2023 13:41:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676551291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xAFRY6UWQLF1FP7olpHuR0CBZw+9W4Mq3Tn1rtwpBJM=; b=aqIHPJNl4/e/9kkpLBfxVFts8J7z2/qJHEBnzjD5JBynXihm5D81Rg9MtDyveFFz7zINlJ 7co4z6rO4kSDJaVFnDiwl4cQiNnwVKL8XPVD9Nvnv+h0iaBz5jBE6qM8wD8DaKpj0zcIGH SU3V1zBqPtrTB10+qvyAoK706Ff2pRQ= From: Borislav Petkov To: LKML Cc: stable@kernel.org, Dionna Glaze , Joerg Roedel , Michael Roth , Nikunj A Dadhania , Peter Gonda , Tom Lendacky , linux-coco@lists.linux.dev, x86@kernel.org Subject: [PATCH 01/11] crypto: ccp - Name -1 return value as SEV_RET_NO_FW_CALL Date: Thu, 16 Feb 2023 13:41:10 +0100 Message-Id: <20230216124120.26578-2-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230216124120.26578-1-bp@alien8.de> References: <20230216124120.26578-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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?1757991673147532987?= X-GMAIL-MSGID: =?utf-8?q?1757991673147532987?= From: Peter Gonda The PSP can return a "firmware error" code of -1 in circumstances where the PSP has not actually been called. To make this protocol unambiguous, name the value SEV_RET_NO_FW_CALL. [ bp: Massage a bit. ] Signed-off-by: Peter Gonda Signed-off-by: Dionna Glaze Signed-off-by: Borislav Petkov (AMD) Cc: Link: https://lore.kernel.org/r/20221207010210.2563293-2-dionnaglaze@google.com --- Documentation/virt/coco/sev-guest.rst | 4 ++-- drivers/crypto/ccp/sev-dev.c | 8 +++++--- include/uapi/linux/psp-sev.h | 7 +++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Documentation/virt/coco/sev-guest.rst b/Documentation/virt/coco/sev-guest.rst index bf593e88cfd9..aa3e4c6a1f90 100644 --- a/Documentation/virt/coco/sev-guest.rst +++ b/Documentation/virt/coco/sev-guest.rst @@ -40,8 +40,8 @@ along with a description: The guest ioctl should be issued on a file descriptor of the /dev/sev-guest device. 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. +to execute due to a firmware error, then fw_err code will be set. Otherwise, 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..f60bb73edfda 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -442,10 +442,10 @@ static int __sev_init_ex_locked(int *error) static int __sev_platform_init_locked(int *error) { + int rc = 0, psp_ret = SEV_RET_NO_FW_CALL; struct psp_device *psp = psp_master; - struct sev_device *sev; - int rc = 0, psp_ret = -1; int (*init_function)(int *error); + struct sev_device *sev; if (!psp || !psp->sev_data) return -ENODEV; @@ -473,9 +473,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."); + 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); } + if (error) *error = psp_ret; diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 91b4c63d5cbf..1c9da485318f 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. Its purpose is 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,