releases/4.19.35/drm-i915-gvt-do-not-deliver-a-workload-if-its-creation-fails.patch

   1 From dade58ed5af6365ac50ff4259c2a0bf31219e285 Mon Sep 17 00:00:00 2001
   2 From: Yan Zhao <yan.y.zhao@intel.com>
   3 Date: Wed, 27 Mar 2019 00:54:51 -0400
   4 Subject: drm/i915/gvt: do not deliver a workload if its creation fails
   5
   6 From: Yan Zhao <yan.y.zhao@intel.com>
   7
   8 commit dade58ed5af6365ac50ff4259c2a0bf31219e285 upstream.
   9
  10 in workload creation routine, if any failure occurs, do not queue this
  11 workload for delivery. if this failure is fatal, enter into failsafe
  12 mode.
  13
  14 Fixes: 6d76303553ba ("drm/i915/gvt: Move common vGPU workload creation into scheduler.c")
  15 Cc: stable@vger.kernel.org #4.19+
  16 Cc: zhenyuw@linux.intel.com
  17 Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
  18 Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  20
  21 ---
  22  drivers/gpu/drm/i915/gvt/scheduler.c |    5 +++--
  23  1 file changed, 3 insertions(+), 2 deletions(-)
  24
  25 --- a/drivers/gpu/drm/i915/gvt/scheduler.c
  26 +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
  27 @@ -1389,8 +1389,9 @@ intel_vgpu_create_workload(struct intel_
  28                 intel_runtime_pm_put(dev_priv);
  29         }
  30
  31 -       if (ret && (vgpu_is_vm_unhealthy(ret))) {
  32 -               enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);
  33 +       if (ret) {
  34 +               if (vgpu_is_vm_unhealthy(ret))
  35 +                       enter_failsafe_mode(vgpu, GVT_FAILSAFE_GUEST_ERR);
  36                 intel_vgpu_destroy_workload(workload);
  37                 return ERR_PTR(ret);
  38         }