Skip to contentSkip to conversation

drm/amdgpu: handle denied inject error into critical regions v2

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

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

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

Changed from v1:
remove unused brace

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +8 -1
index c742d1aacf5a..144176779f9e 100644
@@ -1309,6 +1309,11 @@ 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_warn(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 +1526,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
Reviewed-by on v1 1/1
#1 lore raw

[AMD Official Use Only]

Since you use dev_warn, "RAS WARNING" is better than "RAS INFO" in the print message, with this fixed the patch is:

Quoted 84 lines

-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, January 13, 2022 9:28 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 v2

Changed from v1:
remove unused brace

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5 -0
index c742d1aacf5a..144176779f9e 100644
@@ -1309,6 +1309,11 @@ 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_warn(psp->adev->dev,
+					"RAS INFO: Inject error to critical
 region is not allowed\n");
+		break;
 	default:
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
 		dev_warn(psp->adev->dev,
 				"RAS WARNING: ras status = 0x%X\n",

ras_cmd->ras_status); @@ -1521,7 +1526,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

[AMD Official Use Only]

Thanks, will update before submit.

Regards,
Stanley

Quoted 103 lines

-----邮件原件-----
发件人: Zhou1, Tao <[email protected]>
发送时间: Thursday, January 13, 2022 11:29 AM
收件人: Yang, Stanley <[email protected]>; amd- [email protected]
抄送: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Yang, Stanley <[email protected]> 主题: RE: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2

[AMD Official Use Only]

Since you use dev_warn, "RAS WARNING" is better than "RAS INFO" in the print message, with this fixed the patch is:

Quoted 6 lines

-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, January 13, 2022 9:28 AM
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>; Zhou1, Tao <[email protected]>; Yang,

Stanley

Quoted 20 lines

<[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2

Changed from v1:
remove unused brace

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-
drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
index c742d1aacf5a..144176779f9e 100644

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

Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2 -0
@@ -1309,6 +1309,11 @@ 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)

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3 -0
+			dev_warn(psp->adev->dev,
+					"RAS INFO: Inject error to critical
 region is not allowed\n");
+		break;
 	default:
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0 -0
 		dev_warn(psp->adev->dev,
 				"RAS WARNING: ras status = 0x%X\n",

ras_cmd->ras_status); @@

Quoted 44 lines

-1521,7 +1526,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

#3 lore raw
In reply to Stanley.Yang

[Public]

I guess you still need to add a commit description in v2.

Regards,
Guchun

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Stanley.Yang
Sent: Thursday, January 13, 2022 9:28 AM
To: [email protected]
Cc: Yang, Stanley <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Zhang, Hawking <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: handle denied inject error into critical regions v2

Changed from v1:
remove unused brace

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 ++++++++-  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +-  drivers/gpu/drm/amd/amdgpu/ta_ras_if.h  | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5 -0
index c742d1aacf5a..144176779f9e 100644
@@ -1309,6 +1309,11 @@ 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_warn(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 +1526,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 {

--
2.17.1