Skip to contentSkip to conversation

drm/amdgpu: handle denied inject error into critical regions

PATCH In review Stanley.Yang 3 participants 3 messages Jan 12, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: handle denied inject error into critical regions

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 +++++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c |  2 +-
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +9 -1
index c742d1aacf5a..8e0ea582b9c7 100644
@@ -1309,6 +1309,12 @@ static void psp_ras_ta_check_status(struct psp_context *psp)
 		break;
 	case TA_RAS_STATUS__SUCCESS:
 		break;
+	case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED:
+		if (ras_cmd->cmd_id == TA_RAS_COMMAND__TRIGGER_ERROR) {
+			dev_info(psp->adev->dev,
+					"RAS INFO: Inject error to critical region is not allowed\n");
+		}
+		break;
 	default:
 		dev_warn(psp->adev->dev,
 				"RAS WARNING: ras status = 0x%X\n", ras_cmd->ras_status);
@@ -1521,7 +1527,9 @@ int psp_ras_trigger_error(struct psp_context *psp,
 	if (amdgpu_ras_intr_triggered())
 		return 0;
 
-	if (ras_cmd->ras_status)
+	if (ras_cmd->ras_status == TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)
+		return -EACCES;
+	else if (ras_cmd->ras_status)
 		return -EINVAL;
 
 	return 0;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
index e674dbed3615..8bdc2e85cb20 100644
@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f,
 	}
 
 	if (ret)
-		return -EINVAL;
+		return ret;
 
 	return size;
 }
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2 -1
index 5093826a43d1..509d8a1945eb 100644
@@ -64,7 +64,8 @@ enum ta_ras_status {
 	TA_RAS_STATUS__ERROR_PCS_STATE_ERROR            = 0xA016,
 	TA_RAS_STATUS__ERROR_PCS_STATE_HANG             = 0xA017,
 	TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN          = 0xA018,
-	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019
+	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019,
+	TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED          = 0xA01A
 };
 
 enum ta_ras_block {
Signature · 1 line
2.17.1
#1 lore raw

[AMD Official Use Only]

Quoted 23 lines

-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Wednesday, January 12, 2022 9:43 AM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Zhou1, Tao <[email protected]>; Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 +++++++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c |  2 +-
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
index c742d1aacf5a..8e0ea582b9c7 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static void psp_ras_ta_check_status(struct · line 1316

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3 -0
@@ -1309,6 +1309,12 @@ static void psp_ras_ta_check_status(struct
 psp_context *psp)
 		break;
 	case TA_RAS_STATUS__SUCCESS:
 		break;
+	case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED:
+		if (ras_cmd->cmd_id == TA_RAS_COMMAND__TRIGGER_ERROR)
 {
+			dev_info(psp->adev->dev,

[Tao] Is dev_warn better? But either way is OK for me.

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static void psp_ras_ta_check_status(struct · line 1319

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -0
+					"RAS INFO: Inject error to critical
 region is not allowed\n");
+		}

[Tao] The {} can be removed.

Quoted 49 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -0
+		break;
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
 	default:
 		dev_warn(psp->adev->dev,
 				"RAS WARNING: ras status = 0x%X\n",

ras_cmd->ras_status); @@ -1521,7 +1527,9 @@ int
psp_ras_trigger_error(struct psp_context *psp,

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 -1
 	if (amdgpu_ras_intr_triggered())
 		return 0;
 
-	if (ras_cmd->ras_status)
+	if (ras_cmd->ras_status ==

TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -0
+		return -EACCES;
+	else if (ras_cmd->ras_status)
 		return -EINVAL;
 
 	return 0;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
index e674dbed3615..8bdc2e85cb20 100644
@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file
 *f,
 	}
 
 	if (ret)
-		return -EINVAL;
+		return ret;
 
 	return size;

}

drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2 -2
index 5093826a43d1..509d8a1945eb 100644
@@ -64,7 +64,8 @@ enum ta_ras_status {
 	TA_RAS_STATUS__ERROR_PCS_STATE_ERROR            = 0xA016,
 	TA_RAS_STATUS__ERROR_PCS_STATE_HANG             = 0xA017,
 	TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN          = 0xA018,
-	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019
+	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019,
+	TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED          = 0xA01A
 };
 
 enum ta_ras_block {
--

2.17.1

#2 lore raw
In reply to Stanley.Yang
Quoted 12 lines · Stanley.Yang
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 10 +++++++++-
  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c |  2 +-
  drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  |  3 ++-
  3 files changed, 12 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
index c742d1aacf5a..8e0ea582b9c7 100644

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static void psp_ras_ta_check_status(struct psp_context *psp) · line 1316

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5 -0
@@ -1309,6 +1309,12 @@ static void psp_ras_ta_check_status(struct psp_context *psp)
  		break;
  	case TA_RAS_STATUS__SUCCESS:
  		break;
+	case TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED:
+		if (ras_cmd->cmd_id == TA_RAS_COMMAND__TRIGGER_ERROR) {
+			dev_info(psp->adev->dev,
+					"RAS INFO: Inject error to critical region is not allowed\n");
+		}

Instead of doing this, why not print this in psp_ras_trigger_error(). i.e. caller interprets the error code and prints the appropriate message. I guess that is the single entry point to send TRIGGER_ERROR command.

Thanks,
Lijo

Quoted 43 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -1
+		break;
  	default:
  		dev_warn(psp->adev->dev,
  				"RAS WARNING: ras status = 0x%X\n", ras_cmd->ras_status);
@@ -1521,7 +1527,9 @@ int psp_ras_trigger_error(struct psp_context *psp,
  	if (amdgpu_ras_intr_triggered())
  		return 0;
 
-	if (ras_cmd->ras_status)
+	if (ras_cmd->ras_status == TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED)
+		return -EACCES;
+	else if (ras_cmd->ras_status)
  		return -EINVAL;
 
  	return 0;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
index e674dbed3615..8bdc2e85cb20 100644
@@ -449,7 +449,7 @@ static ssize_t amdgpu_ras_debugfs_ctrl_write(struct file *f,
  	}
 
  	if (ret)
-		return -EINVAL;
+		return ret;
 
  	return size;
  }
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h +2 -1
index 5093826a43d1..509d8a1945eb 100644
@@ -64,7 +64,8 @@ enum ta_ras_status {
  	TA_RAS_STATUS__ERROR_PCS_STATE_ERROR            = 0xA016,
  	TA_RAS_STATUS__ERROR_PCS_STATE_HANG             = 0xA017,
  	TA_RAS_STATUS__ERROR_PCS_STATE_UNKNOWN          = 0xA018,
-	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019
+	TA_RAS_STATUS__ERROR_UNSUPPORTED_ERROR_INJ      = 0xA019,
+	TA_RAS_STATUS__TEE_ERROR_ACCESS_DENIED          = 0xA01A
  };
 
  enum ta_ras_block {