[PATCH] drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data

[Liu, Monk]

[AMD Official Use Only - Approved for External Use]

Reviewed-by: Monk Liu<monk.liu at amd.com>

Thanks 

------------------------------------------
Monk Liu | Cloud-GPU Core team
------------------------------------------

-----Original Message-----
From: Chen, JingWen <JingWen.Chen2 at amd.com> 
Sent: Thursday, January 21, 2021 11:13 AM
To: amd-gfx at lists.freedesktop.org; Liu, Monk <Monk.Liu at amd.com>
Cc: Chen, JingWen <JingWen.Chen2 at amd.com>
Subject: RE: [PATCH] drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data

[AMD Official Use Only - Approved for External Use]

Ping

Best Regards,
JingWen Chen

-----Original Message-----
From: Jingwen Chen <Jingwen.Chen2 at amd.com> 
Sent: Tuesday, January 19, 2021 5:07 PM
To: amd-gfx at lists.freedesktop.org
Cc: Chen, JingWen <JingWen.Chen2 at amd.com>; Chen, JingWen <JingWen.Chen2 at amd.com>
Subject: [PATCH] drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data

[Why]
when vram lost happened in guest, try to write vram can lead to kernel stuck.

[How]
When the readback data is invalid, don't do write work, directly reschedule a new work.

Signed-off-by: Jingwen Chen <Jingwen.Chen2 at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index c649944e49da..3dd7eec52344 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -558,10 +558,14 @@ static int amdgpu_virt_write_vf2pf_data(struct amdgpu_device *adev)  static void amdgpu_virt_update_vf2pf_work_item(struct work_struct *work)  {
 	struct amdgpu_device *adev = container_of(work, struct amdgpu_device, virt.vf2pf_work.work);
+	int ret;
 
-	amdgpu_virt_read_pf2vf_data(adev);
+	ret = amdgpu_virt_read_pf2vf_data(adev);
+	if (ret)
+		goto out;
 	amdgpu_virt_write_vf2pf_data(adev);
 
+out:
 	schedule_delayed_work(&(adev->virt.vf2pf_work), adev->virt.vf2pf_update_interval_ms);
 }
 
--
2.25.1