in workload creation routine, if any failure occurs, do not queue this
workload for delivery. if this failure is fatal, enter into failsafe
mode.
v2: add fixes tag and cc stable kernel (zhenyu wang)
Fixes: 6d76303553ba ("drm/i915/gvt: Move common vGPU workload creation into
scheduler.c")
Cc: stable@xxxxxxxxxxxxxxx #4.19+
Cc: zhenyuw@xxxxxxxxxxxxxxx
Signed-off-by: Yan Zhao <yan.y.zhao@xxxxxxxxx>
---
drivers/gpu/drm/i915/gvt/scheduler.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
index c2e3d7bcac82..8aff97de2c01 100644
--- a/drivers/gpu/drm/i915/gvt/scheduler.c
+++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -1503,8 +1503,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id,
intel_runtime_pm_put_unchecked(dev_priv);
}
- if (ret && (vgpu_is_vm_unhealthy(ret))) {
- enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);
+ if (ret) {
+ if (vgpu_is_vm_unhealthy(ret))
+ enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);
intel_vgpu_destroy_workload(workload);
return ERR_PTR(ret);
}
--
2.17.1
