drm/amdgpu: Show deferred error count for UMC
Subsystems (2)
PATCH 1/1 drm/amdgpu: Show deferred error count for UMC
Show deferred error count for UMC syfs node
Signed-off-by Stanley.Yang <[email protected]>
Reviewed-by Tao Zhou <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +6 -2
@@ -632,8 +632,12 @@ static ssize_t amdgpu_ras_sysfs_read(struct device *dev,dev_warn (obj->adev->dev,"Failed to reset error counter and error status" ); } -return sysfs_emit (buf,"%s: %lu\n%s: %lu\n" ,"ue" , info.ue_count, -"ce" , info.ce_count); +if (info.head.block ==AMDGPU_RAS_BLOCK__UMC ) +return sysfs_emit (buf,"%s: %lu\n%s: %lu\n%s: %lu\n" ,"ue" , info.ue_count, +"ce" , info.ce_count,"de" , info.de_count); +else +return sysfs_emit (buf,"%s: %lu\n%s: %lu\n" ,"ue" , info.ue_count, +"ce" , info.ce_count); }/* obj begin */
Signature · 1 line
2.25.1
PATCH 1/1 drm/amdgpu: Skip do PCI error slot reset during RAS recovery
Why:
The PCI error slot reset maybe triggered after inject ue to UMC multi times, this
caused system hang.
[ 557.371857] amdgpu 0000:af:00.0: amdgpu: GPU reset succeeded, trying to resume
[ 557.373718] [drm] PCIE GART of 512M enabled.
[ 557.373722] [drm] PTB located at 0x0000031FED700000
[ 557.373788] [drm] VRAM is lost due to GPU reset!
[ 557.373789] [drm] PSP is resuming...
[ 557.547012] mlx5_core 0000:55:00.0: mlx5_pci_err_detected Device state = 1 pci_status: 0. Exit, result = 3, need reset
[ 557.547067] [drm] PCI error: detected callback, state(1)!!
[ 557.547069] [drm] No support for XGMI hive yet...
[ 557.548125] mlx5_core 0000:55:00.0: mlx5_pci_slot_reset Device state = 1 pci_status: 0. Enter
[ 557.607763] mlx5_core 0000:55:00.0: wait vital counter value 0x16b5b after 1 iterations
[ 557.607777] mlx5_core 0000:55:00.0: mlx5_pci_slot_reset Device state = 1 pci_status: 1. Exit, err = 0, result = 5, recovered
[ 557.610492] [drm] PCI error: slot reset callback!!
...
[ 560.689382] amdgpu 0000:3f:00.0: amdgpu: GPU reset(2) succeeded!
[ 560.689546] amdgpu 0000:5a:00.0: amdgpu: GPU reset(2) succeeded!
[ 560.689562] general protection fault, probably for non-canonical address 0x5f080b54534f611f: 0000 [#1] SMP NOPTI
[ 560.701008] CPU: 16 PID: 2361 Comm: kworker/u448:9 Tainted: G OE 5.15.0-91-generic #101-Ubuntu
[ 560.712057] Hardware name: Microsoft C278A/C278A, BIOS C2789.5.BS.1C11.AG.1 11/08/2023
[ 560.720959] Workqueue: amdgpu-reset-hive amdgpu_ras_do_recovery [amdgpu]
[ 560.728887] RIP: 0010:amdgpu_device_gpu_recover.cold+0xbf1/0xcf5 [amdgpu]
[ 560.736891] Code: ff 41 89 c6 e9 1b ff ff ff 44 0f b6 45 b0 e9 4f ff ff ff be 01 00 00 00 4c 89 e7 e8 76 c9 8b ff 44 0f b6 45 b0 e9 3c fd ff ff <48> 83 ba 18 02 00 00 00 0f 84 6a f8 ff ff 48 8d 7a 78 be 01 00 00
[ 560.757967] RSP: 0018:ffa0000032e53d80 EFLAGS: 00010202
[ 560.763848] RAX: ffa00000001dfd10 RBX: ffa0000000197090 RCX: ffa0000032e53db0
[ 560.771856] RDX: 5f080b54534f5f07 RSI: 0000000000000000 RDI: ff11000128100010
[ 560.779867] RBP: ffa0000032e53df0 R08: 0000000000000000 R09: ffffffffffe77f08
[ 560.787879] R10: 0000000000ffff0a R11: 0000000000000001 R12: 0000000000000000
[ 560.795889] R13: ffa0000032e53e00 R14: 0000000000000000 R15: 0000000000000000
[ 560.803889] FS: 0000000000000000(0000) GS:ff11007e7e800000(0000) knlGS:0000000000000000
[ 560.812973] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 560.819422] CR2: 000055a04c118e68 CR3: 0000000007410005 CR4: 0000000000771ee0
[ 560.827433] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 560.835433] DR3: 0000000000000000 DR6: 00000000fffe07f0 DR7: 0000000000000400
[ 560.843444] PKRU: 55555554
[ 560.846480] Call Trace:
[ 560.849225] <TASK>
[ 560.851580] ? show_trace_log_lvl+0x1d6/0x2ea
[ 560.856488] ? show_trace_log_lvl+0x1d6/0x2ea
[ 560.861379] ? amdgpu_ras_do_recovery+0x1b2/0x210 [amdgpu]
[ 560.867778] ? show_regs.part.0+0x23/0x29
[ 560.872293] ? __die_body.cold+0x8/0xd
[ 560.876502] ? die_addr+0x3e/0x60
[ 560.880238] ? exc_general_protection+0x1c5/0x410
[ 560.885532] ? asm_exc_general_protection+0x27/0x30
[ 560.891025] ? amdgpu_device_gpu_recover.cold+0xbf1/0xcf5 [amdgpu]
[ 560.898323] amdgpu_ras_do_recovery+0x1b2/0x210 [amdgpu]
[ 560.904520] process_one_work+0x228/0x3d0How:
In RAS recovery, mode-1 reset is issued from RAS fatal error handling and expected all the nodes in a hive to be reset. no need to issue another mode-1 during this procedure.
Signed-off-by Stanley.Yang <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +14 -0
@@ -6175,6 +6175,20 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev)struct amdgpu_reset_context reset_context;u32 memsize;struct list_head device_list; +struct amdgpu_hive_info *hive; +int hive_ras_recovery =0 ; +struct amdgpu_ras *ras; + +/* PCI error slot reset should be skipped During RAS recovery */ + hive =amdgpu_get_xgmi_hive (adev); +if (hive) { + hive_ras_recovery =atomic_read (&hive->ras_recovery); +amdgpu_put_xgmi_hive (hive); + } + ras =amdgpu_ras_get_context (adev); +if ((amdgpu_ip_version (adev,GC_HWIP ,0 ) ==IP_VERSION (9 ,4 ,3 )) && + ras && (atomic_read (&ras->in_recovery) || hive_ras_recovery)) +return PCI_ERS_RESULT_RECOVERED ;DRM_INFO ("PCI error: slot reset callback!!\n" );
Signature · 1 line
2.25.1
PATCH 1/1 drm/amdgpu: Fix ras features value calltrace
In reply to Stanley.YangThe high three bits of ras features mask indicate socket id, it should skip to check high three bits of ras features mask before disable all ras features.
Signed-off-by Stanley.Yang <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +6 -5
@@ -2987,7 +2987,8 @@ int amdgpu_ras_init(struct amdgpu_device *adev)/* Packed socket_id to ras feature mask bits[31:29] */ if (adev->smuio.funcs && adev->smuio.funcs->get_socket_id) - con->features |= ((adev->smuio.funcs->get_socket_id (adev)) <<29 ); + con->features |= ((adev->smuio.funcs->get_socket_id (adev)) << +AMDGPU_RAS_FEATURES_SOCKETID_SHIFT );/* Get RAS schema for particular SOC */ con->schema =amdgpu_get_ras_schema (adev);
@@ -3193,7 +3194,7 @@ void amdgpu_ras_suspend(struct amdgpu_device *adev)amdgpu_ras_disable_all_features (adev,0 );/* Make sure all ras objects are disabled. */ -if (con->features) +if (AMDGPU_RAS_GET_FEATURES (con->features))amdgpu_ras_disable_all_features (adev,1 ); }
@@ -3240,7 +3241,7 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev)/* Need disable ras on all IPs here before ip [hw/sw]fini */ -if (con->features) +if (AMDGPU_RAS_GET_FEATURES (con->features))amdgpu_ras_disable_all_features (adev,0 );amdgpu_ras_recovery_fini (adev);return 0 ;
@@ -3273,9 +3274,9 @@ int amdgpu_ras_fini(struct amdgpu_device *adev)amdgpu_ras_fs_fini (adev);amdgpu_ras_interrupt_remove_all (adev); -WARN (con->features,"Feature mask is not cleared" ); +WARN (AMDGPU_RAS_GET_FEATURES (con->features),"Feature mask is not cleared" ); -if (con->features) +if (AMDGPU_RAS_GET_FEATURES (con->features))amdgpu_ras_disable_all_features (adev,1 );cancel_delayed_work_sync (&con->ras_counte_delay_work);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +6 -0
@@ -52,6 +52,12 @@ struct amdgpu_iv_entry;#define AMDGPU_RAS_INST_MASK 0xfffff000#define AMDGPU_RAS_INST_SHIFT 0xc +#define AMDGPU_RAS_FEATURES_SOCKETID_SHIFT 29 +#define AMDGPU_RAS_FEATURES_SOCKETID_MASK 0xe0000000 + +/* The high three bits indicates socketid */ +#define AMDGPU_RAS_GET_FEATURES (val) (val) & ~AMDGPU_RAS_FEATURES_SOCKETID_MASK +enum amdgpu_ras_block {AMDGPU_RAS_BLOCK__UMC =0 ,AMDGPU_RAS_BLOCK__SDMA ,
Signature · 1 line
2.25.1