Skip to contentSkip to conversation

crypto: ccp - Retry SEV INIT command in case of integrity check failure.

PATCH In review Kalra, Ashish 4 participants 8 messages Oct 17, 2019 – Oct 25, 2019

Subsystems (4)
lore
Share & tools
lore

Kalra, Ashish

author maintainer
#0 lore raw

PATCH 1/1 crypto: ccp - Retry SEV INIT command in case of integrity check failure.

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
 drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
 include/uapi/linux/psp-sev.h |  3 +++
 2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +12 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
 	/* Initialize the platform */
 	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
+
 	if (rc) {
 		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
 		return;
include/uapi/linux/psp-sev.h +3 -0
index 8654b2442f6a..a8537f4e5e08 100644
@@ -58,6 +58,9 @@ typedef enum {
 	SEV_RET_HWSEV_RET_PLATFORM,
 	SEV_RET_HWSEV_RET_UNSAFE,
 	SEV_RET_UNSUPPORTED,
+	SEV_RET_INVALID_PARAM,
+	SEV_RET_RESOURCE_LIMIT,
+	SEV_RET_SECURE_DATA_INVALID,
 	SEV_RET_MAX,
 } sev_ret_code;
 
Signature · 1 line
2.17.1
#1 lore raw
Quoted 33 lines · Ashish

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
 drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
 include/uapi/linux/psp-sev.h |  3 +++
 2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +5 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
 	/* Initialize the platform */
 	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has

drivers/crypto/ccp/psp-dev.c void psp_pci_init(void) · line 1081

Quoted 10 lines
drivers/crypto/ccp/psp-dev.c +7 -0
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
+
 	if (rc) {
 		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
 		return;

Curious why this isn't done in __sev_platform_init_locked() since sev_platform_init() can be called when loading the kvm module and the same init failure can happen that way.

Quoted 14 lines
include/uapi/linux/psp-sev.h +3 -0
index 8654b2442f6a..a8537f4e5e08 100644
@@ -58,6 +58,9 @@ typedef enum {
 	SEV_RET_HWSEV_RET_PLATFORM,
 	SEV_RET_HWSEV_RET_UNSAFE,
 	SEV_RET_UNSUPPORTED,
+	SEV_RET_INVALID_PARAM,
+	SEV_RET_RESOURCE_LIMIT,
+	SEV_RET_SECURE_DATA_INVALID,
 	SEV_RET_MAX,
 } sev_ret_code;
 
#2 lore raw
Quoted 41 lines · David Rientjes
Quoted 39 lines · Ashish

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
  drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
  include/uapi/linux/psp-sev.h |  3 +++
  2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +11 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
  	/* Initialize the platform */
  	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
Quoted 9 lines

drivers/crypto/ccp/psp-dev.c void psp_pci_init(void) · line 1081

Quoted 4 lines
drivers/crypto/ccp/psp-dev.c +1 -0
+
  	if (rc) {
  		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
  		return;

Curious why this isn't done in __sev_platform_init_locked() since sev_platform_init() can be called when loading the kvm module and the same init failure can happen that way.

The FW initialization (aka PLATFORM_INIT) is called in the following code paths:

1. During system boot up

and

2. After the platform reset command is issued

The patch takes care of #1. Based on the spec, platform reset command should erase the persistent data and the PLATFORM_INIT should *not* fail with SEV_RET_SECURE_DATA_INVALID error code. So, I am not able to see any strong reason to move the retry code in __sev_platform_init_locked().

thanks

#3 lore raw
Quoted 56 lines · Brijesh
Quoted 39 lines
Quoted 39 lines

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
  drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
  include/uapi/linux/psp-sev.h |  3 +++
  2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +11 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
  	/* Initialize the platform */
  	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
Quoted 9 lines

drivers/crypto/ccp/psp-dev.c void psp_pci_init(void) · line 1081

Quoted 4 lines
drivers/crypto/ccp/psp-dev.c +1 -0
+
  	if (rc) {
  		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
  		return;

Curious why this isn't done in __sev_platform_init_locked() since sev_platform_init() can be called when loading the kvm module and the same init failure can happen that way.

The FW initialization (aka PLATFORM_INIT) is called in the following code paths:

1. During system boot up

and

Quoted 8 lines

2. After the platform reset command is issued

The patch takes care of #1. Based on the spec, platform reset command should erase the persistent data and the PLATFORM_INIT should *not* fail with SEV_RET_SECURE_DATA_INVALID error code. So, I am not able to see any strong reason to move the retry code in __sev_platform_init_locked().

Hmm, is the sev_platform_init() call in sev_guest_init() intended to do SEV_CMD_INIT only after platform reset? I was under the impression it was done in case any previous init failed.

#4 lore raw
Quoted 67 lines · David Rientjes
Quoted 56 lines · Brijesh
Quoted 39 lines
Quoted 39 lines

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
   drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
   include/uapi/linux/psp-sev.h |  3 +++
   2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +11 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
   	/* Initialize the platform */
   	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
Quoted 9 lines

drivers/crypto/ccp/psp-dev.c void psp_pci_init(void) · line 1081

Quoted 4 lines
drivers/crypto/ccp/psp-dev.c +1 -0
+
   	if (rc) {
   		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
   		return;

Curious why this isn't done in __sev_platform_init_locked() since sev_platform_init() can be called when loading the kvm module and the same init failure can happen that way.

The FW initialization (aka PLATFORM_INIT) is called in the following code paths:

1. During system boot up

and

Quoted 8 lines

2. After the platform reset command is issued

The patch takes care of #1. Based on the spec, platform reset command should erase the persistent data and the PLATFORM_INIT should *not* fail with SEV_RET_SECURE_DATA_INVALID error code. So, I am not able to see any strong reason to move the retry code in __sev_platform_init_locked().

Quoted 4 lines

Hmm, is the sev_platform_init() call in sev_guest_init() intended to do SEV_CMD_INIT only after platform reset? I was under the impression it was done in case any previous init failed.

The PLATFORM_INIT command is allowed only when FW is in UINIT state. On boot, the FW will be in UNINIT state and similarly after the platform reset command the FW goes back to UNINIT state.

The __sev_platform_init_locked() checks the FW state before issuing the command, if FW is already in INIT state then it returns immediately.

thanks

#5 lore raw
Quoted 71 lines · Brijesh
Quoted 65 lines
Quoted 56 lines
Quoted 39 lines
Quoted 39 lines

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
   drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
   include/uapi/linux/psp-sev.h |  3 +++
   2 files changed, 15 insertions(+)
drivers/crypto/ccp/psp-dev.c +11 -0
index 6b17d179ef8a..f9318d4482f2 100644
@@ -1064,6 +1064,18 @@ void psp_pci_init(void)
 
   	/* Initialize the platform */
   	rc = sev_platform_init(&error);
+	if (rc && (error == SEV_RET_SECURE_DATA_INVALID)) {
+		/*
+		 * INIT command returned an integrity check failure
+		 * status code, meaning that firmware load and
+		 * validation of SEV related persistent data has
+		 * failed and persistent state has been erased.
+		 * Retrying INIT command here should succeed.
+		 */
+		dev_dbg(sp->dev, "SEV: retrying INIT command");
+		rc = sev_platform_init(&error);
+	}
Quoted 9 lines

drivers/crypto/ccp/psp-dev.c void psp_pci_init(void) · line 1081

Quoted 4 lines
drivers/crypto/ccp/psp-dev.c +1 -0
+
   	if (rc) {
   		dev_err(sp->dev, "SEV: failed to INIT error %#x\n", error);
   		return;

Curious why this isn't done in __sev_platform_init_locked() since sev_platform_init() can be called when loading the kvm module and the same init failure can happen that way.

The FW initialization (aka PLATFORM_INIT) is called in the following code paths:

1. During system boot up

and

Quoted 8 lines

2. After the platform reset command is issued

The patch takes care of #1. Based on the spec, platform reset command should erase the persistent data and the PLATFORM_INIT should *not* fail with SEV_RET_SECURE_DATA_INVALID error code. So, I am not able to see any strong reason to move the retry code in __sev_platform_init_locked().

Quoted 4 lines

Hmm, is the sev_platform_init() call in sev_guest_init() intended to do SEV_CMD_INIT only after platform reset? I was under the impression it was done in case any previous init failed.

Quoted 7 lines

The PLATFORM_INIT command is allowed only when FW is in UINIT state. On boot, the FW will be in UNINIT state and similarly after the platform reset command the FW goes back to UNINIT state.

The __sev_platform_init_locked() checks the FW state before issuing the command, if FW is already in INIT state then it returns immediately.

Ah, got it, thanks.

Reviewed-by on v1 1/1
#6 lore raw
In reply to Kalra, Ashish
Quoted 7 lines · Ashish

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

Quoted 8 lines

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

thanks

maintainer
#7 lore raw
In reply to Kalra, Ashish
Quoted 11 lines · Ashish

From: Ashish Kalra <[email protected]>

SEV INIT command loads the SEV related persistent data from NVS and initializes the platform context. The firmware validates the persistent state. If validation fails, the firmware will reset the persisent state and return an integrity check failure status.

At this point, a subsequent INIT command should succeed, so retry the command. The INIT command retry is only done during driver initialization.

Quoted 8 lines

Additional enums along with SEV_RET_SECURE_DATA_INVALID are added to sev_ret_code to maintain continuity and relevance of enum values.

---
 drivers/crypto/ccp/psp-dev.c | 12 ++++++++++++
 include/uapi/linux/psp-sev.h |  3 +++
 2 files changed, 15 insertions(+)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt