]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/gvt: do not let pin count of shadow mm go negative
authorYan Zhao <yan.y.zhao@intel.com>
Mon, 8 Apr 2019 05:12:47 +0000 (01:12 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Apr 2019 06:37:43 +0000 (08:37 +0200)
[ Upstream commit 663a50ceac75c2208d2ad95365bc8382fd42f44d ]

shadow mm's pin count got increased in workload preparation phase, which
is after workload scanning.
it will get decreased in complete_current_workload() anyway after
workload completion.
Sometimes, if a workload meets a scanning error, its shadow mm pin count
will not get increased but will get decreased in the end.
This patch lets shadow mm's pin count not go below 0.

Fixes: 2707e4446688 ("drm/i915/gvt: vGPU graphics memory virtualization")
Cc: zhenyuw@linux.intel.com
Cc: stable@vger.kernel.org #4.14+
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/i915/gvt/gtt.c

index dadacbe558abedc75fa5d847e3a451841c02ec19..1a1f7eb46d1eaa287ae8b699259438f9f914bdf2 100644 (file)
@@ -1629,7 +1629,7 @@ void intel_vgpu_unpin_mm(struct intel_vgpu_mm *mm)
        if (WARN_ON(mm->type != INTEL_GVT_MM_PPGTT))
                return;
 
-       atomic_dec(&mm->pincount);
+       atomic_dec_if_positive(&mm->pincount);
 }
 
 /**