drm/i915/gvt: do not deliver a workload if its creation fails

yanzhao56 · zhenyw · commit dade58ed5af6 · 2019-03-29T10:26:53.000+08:00
in workload creation routine, if any failure occurs, do not queue this workload for delivery. if this failure is fatal, enter into failsafe mode. Fixes: 6d76303 ("drm/i915/gvt: Move common vGPU workload creation into scheduler.c") Cc: stable@vger.kernel.org rib#4.19+ Cc: zhenyuw@linux.intel.com Signed-off-by: Yan Zhao <yan.y.zhao@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -1486,8 +1486,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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1486,8 +1486,9 @@ intel_vgpu_create_workload(struct intel_vgpu *vgpu, int ring_id,`
`1486`	`1486`	`intel_runtime_pm_put_unchecked(dev_priv);`
`1487`	`1487`	`}`
`1488`	`1488`
`1489`		`- if (ret && (vgpu_is_vm_unhealthy(ret))) {`
`1490`		`- enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);`
	`1489`	`+ if (ret) {`
	`1490`	`+ if (vgpu_is_vm_unhealthy(ret))`
	`1491`	`+ enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);`
`1491`	`1492`	`intel_vgpu_destroy_workload(workload);`
`1492`	`1493`	`return ERR_PTR(ret);`
`1493`	`1494`	`}`