From: Jarkko Sakkinen <jarkko@profian.com>
To: Brijesh Singh <brijesh.singh@amd.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
John Allen <john.allen@amd.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: Jarkko Sakkinen <jarkko@profian.com>,
linux-crypto@vger.kernel.org (open list:AMD CRYPTOGRAPHIC
COPROCESSOR (CCP) DRIVER - SE...),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v5] crypto: ccp: Sanitize sev_platform_init() error messages
Date: Tue, 10 Jan 2023 19:12:00 +0000 [thread overview]
Message-ID: <20230110191201.29666-1-jarkko@profian.com> (raw)
The following functions end up calling sev_platform_init() or
__sev_platform_init_locked():
* sev_guest_init()
* sev_ioctl_do_pek_csr
* sev_ioctl_do_pdh_export()
* sev_ioctl_do_pek_import()
* sev_ioctl_do_pek_pdh_gen()
* sev_pci_init()
However, only sev_pci_init() prints out the failed command error code, and
even there, the error message does not specify which SEV command failed.
Address this by printing out the SEV command errors inside
__sev_platform_init_locked(), and differentiate between DF_FLUSH, INIT and
INIT_EX commands. As a side-effect, @error can be removed from the
parameter list.
This extra information is particularly useful if firmware loading and/or
initialization is going to be made more robust, e.g. by allowing firmware
loading to be postponed.
Signed-off-by: Jarkko Sakkinen <jarkko@profian.com>
---
v5:
* Address Tom's feedback:
https://lore.kernel.org/all/ddbb4b2f-3eb8-64da-bce9-3cfd66d7729a@amd.com/
* "failed error" -> "error"
* "SEV_CMD_" -> ""
v4:
* Sorry, v3 was malformed. Here's a proper patch.
v3:
* Address Tom Lendacky's feedback:
https://lore.kernel.org/kvm/8bf6f179-eee7-fd86-7892-cdcd76e0762a@amd.com/
v2:
* Address David Rientjes's feedback:
https://lore.kernel.org/all/6a16bbe4-4281-fb28-78c4-4ec44c8aa679@google.com/
* Remove @error.
* Remove "SEV_" prefix: it is obvious from context so no need to make klog
line longer.
---
drivers/crypto/ccp/sev-dev.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 06fc7156c04f..3f80cd39cbdf 100644
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -478,17 +478,23 @@ static int __sev_platform_init_locked(int *error)
}
if (error)
*error = psp_ret;
-
- if (rc)
+ if (rc) {
+ dev_err(sev->dev, "SEV: %s error %#x",
+ sev_init_ex_buffer ? "INIT_EX" : "INIT", psp_ret);
return rc;
+ }
sev->state = SEV_STATE_INIT;
/* Prepare for first SEV guest launch after INIT */
wbinvd_on_all_cpus();
- rc = __sev_do_cmd_locked(SEV_CMD_DF_FLUSH, NULL, error);
- if (rc)
+ rc = __sev_do_cmd_locked(SEV_CMD_DF_FLUSH, NULL, &psp_ret);
+ if (error)
+ *error = psp_ret;
+ if (rc) {
+ dev_err(sev->dev, "SEV: DF_FLUSH error %#x", psp_ret);
return rc;
+ }
dev_dbg(sev->dev, "SEV firmware initialized\n");
@@ -1337,8 +1343,7 @@ void sev_pci_init(void)
/* Initialize the platform */
rc = sev_platform_init(&error);
if (rc)
- dev_err(sev->dev, "SEV: failed to INIT error %#x, rc %d\n",
- error, rc);
+ dev_err(sev->dev, "SEV: failed to INIT rc %d\n", rc);
return;
--
2.38.1
next reply other threads:[~2023-01-10 19:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 19:12 Jarkko Sakkinen [this message]
2023-01-12 23:59 ` David Rientjes
2023-01-13 14:50 ` Tom Lendacky
2023-01-20 10:12 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230110191201.29666-1-jarkko@profian.com \
--to=jarkko@profian.com \
--cc=brijesh.singh@amd.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=john.allen@amd.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®