crypto: ccp: Sanitize sev_platform_init() error messages

PATCH Superseded Jarkko Sakkinen 1 participant 1 message Jan 10, 2023

Subsystems (3)

Crypto API AMD cryptographic coprocessor (CCP) driver AMD cryptographic coprocessor (CCP) driver - SEV support

lore

Share & tools

lore

Jarkko Sakkinen

author

2023-01-10 03:08 UTC #0 lore raw

PATCH v3 1/1 crypto: ccp: Sanitize sev_platform_init() error messages

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 <[email protected]>

---
v3:
* Address Tom Lendacky's feedback:
https://lore.kernel.org/kvm/[email protected]/

v2:
* Address David Rientjes's feedback:
https://lore.kernel.org/all/[email protected]/
* 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, 9 insertions(+), 8 deletions(-)

drivers/crypto/ccp/sev-dev.c +9 -8

index 06fc7156c04f..a231418a5f13 100644
@@ -476,19 +476,21 @@ static int __sev_platform_init_locked(int *error)
 		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;
-
-	if (rc)
+	if (rc) {
+		dev_err(sev->dev, "SEV: %s failed error %#x",
+			sev_init_ex_buffer ? "CMD_INIT_EX" : "CMD_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 (rc) {
+		dev_err(sev->dev, "SEV: CMD_DF_FLUSH failed error %#x", psp_ret);
 		return rc;
+	}
 
 	dev_dbg(sev->dev, "SEV firmware initialized\n");

@@ -1337,8 +1339,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;

Signature · 1 line

2.38.1