Skip to contentSkip to conversation

SWDEV-247673 - stop data_exchange work thread before reset

PATCH In review Bokun Zhang 2 participants 2 messages Sep 16, 2020

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

PATCH 3/3 SWDEV-247673 - stop data_exchange work thread before reset

From: Tiecheng Zhou <[email protected]>

In FLR routine, init_data_exchange is called at reset_sriov while fini_data_exchange is not. This will duplicating work thread.

So call fini_data_exchange before reset for SRIOV

Change-Id I974c6a3c5de86736eebefc386c03fe0e18e1fae3
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -0
index 483ec0136332..e71cf3b34e15 100644
@@ -4080,6 +4080,11 @@ static int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,
 
 	amdgpu_debugfs_wait_dump(adev);
 
+	if (amdgpu_sriov_vf(adev)) {
+		/* stop the data exchange thread */
+		amdgpu_virt_fini_data_exchange(adev);
+	}
+
 	/* block all schedulers and reset given job's ring */
 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
 		struct amdgpu_ring *ring = adev->rings[i];
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw
Quoted 7 lines · Bokun Zhang

From: Tiecheng Zhou <[email protected]>

In FLR routine, init_data_exchange is called at reset_sriov while fini_data_exchange is not. This will duplicating work thread.

Quoted 5 lines

So call fini_data_exchange before reset for SRIOV

Change-Id I974c6a3c5de86736eebefc386c03fe0e18e1fae3

Please drop the SWDEV reference from the subject and prefix the patch with drm/amdgpu:

Alex

Quoted 23 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +5 -1
index 483ec0136332..e71cf3b34e15 100644
@@ -4080,6 +4080,11 @@ static int amdgpu_device_pre_asic_reset(struct amdgpu_device *adev,
 
        amdgpu_debugfs_wait_dump(adev);
 
+       if (amdgpu_sriov_vf(adev)) {
+               /* stop the data exchange thread */
+               amdgpu_virt_fini_data_exchange(adev);
+       }
+
        /* block all schedulers and reset given job's ring */
        for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
                struct amdgpu_ring *ring = adev->rings[i];
--

2.20.1

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx