| From dade58ed5af6365ac50ff4259c2a0bf31219e285 Mon Sep 17 00:00:00 2001 |
| From: Yan Zhao <yan.y.zhao@intel.com> |
| Date: Wed, 27 Mar 2019 00:54:51 -0400 |
| Subject: drm/i915/gvt: do not deliver a workload if its creation fails |
| |
| From: Yan Zhao <yan.y.zhao@intel.com> |
| |
| commit dade58ed5af6365ac50ff4259c2a0bf31219e285 upstream. |
| |
| 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: 6d76303553ba ("drm/i915/gvt: Move common vGPU workload creation into scheduler.c") |
| Cc: stable@vger.kernel.org #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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/i915/gvt/scheduler.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/i915/gvt/scheduler.c |
| +++ b/drivers/gpu/drm/i915/gvt/scheduler.c |
| @@ -1475,8 +1475,9 @@ intel_vgpu_create_workload(struct intel_ |
| intel_runtime_pm_put(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); |
| } |
