Commit6ac6a32

Jingwen Chen

authored and

Asher Song

committed

drm/amd/amdgpu: fix flr_work corner case

[Why]In SRIOV multi-vf environment, the flr_work can be enteredeven if the TDR thread has entered the recovery. This canlead to GMC flush tlb with SDMA during full access while SDMAis not initialized.[How]1. flr_work should take write_lock, otherwise there maybe hw accessduring vf flr2. (amdgpu_in_reset(adev) ||!down_write_trylock(&adev->reset_sem))is the correct critera when the flr_work direct returns.Acked-by: Christian König <christian.koenig@amd.com>Signed-off-by: Jingwen Chen <Jingwen.Chen2@amd.com>

1 parenta4669ca commit6ac6a32Copy full SHA for 6ac6a32

File tree

2 files changed

-2

lines changed

drivers/gpu/drm/amd/amdgpu
- mxgpu_ai.c
- mxgpu_nv.c

2 files changed

-2

lines changed

`‎drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work)`
`259`	`259`	`* otherwise the mailbox msg will be ruined/reseted by`
`260`	`260`	`* the VF FLR.`
`261`	`261`	`*/`
`262`		`-if (atomic_cmpxchg(&adev->reset_domain->in_gpu_reset,0,1)!=0)`
	`262`	`+if (amdgpu_in_reset(adev)\|\|`
	`263`	`+atomic_cmpxchg(&adev->reset_domain->in_gpu_reset,0,1)!=0)`
`263`	`264`	`return;`
`264`	`265`
`265`	`266`	`down_write(&adev->reset_domain->sem);`

`‎drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,8 @@ static void xgpu_nv_mailbox_flr_work(struct work_struct *work)`
`292`	`292`	`* otherwise the mailbox msg will be ruined/reseted by`
`293`	`293`	`* the VF FLR.`
`294`	`294`	`*/`
`295`		`-if (atomic_cmpxchg(&adev->reset_domain->in_gpu_reset,0,1)!=0)`
	`295`	`+if (amdgpu_in_reset(adev)\|\|`
	`296`	`+atomic_cmpxchg(&adev->reset_domain->in_gpu_reset,0,1)!=0)`
`296`	`297`	`return;`
`297`	`298`
`298`	`299`	`down_write(&adev->reset_domain->sem);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6ac6a32

File tree

2 files changed

2 files changed

`‎drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c‎`

`‎drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c‎`

0 commit comments