Skip to contentSkip to conversation

drm/i915/gvt: do not let pin count of shadow mm go negative

PATCH Applied Yan Zhao 2 participants 2 messages Apr 8, 2019 Stable branch

lore
Share & tools
lore

Yan Zhao

author
#0 lore raw

PATCH 1/1 drm/i915/gvt: do not let pin count of shadow mm go negative

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.

v2: add fixes tag and cc stable kernel (zhenyu wang)

Fixes 2707e4446688 ("drm/i915/gvt: vGPU graphics memory virtualization")

---
upstream commit id: 663a50ceac75c2208d2ad95365bc8382fd42f44d

---
 drivers/gpu/drm/i915/gvt/gtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/gtt.c +1 -1
index dadacbe558ab..1a1f7eb46d1e 100644
@@ -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);
 }
 
 /**
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw
Quoted 24 lines · Yan Zhao

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.

v2: add fixes tag and cc stable kernel (zhenyu wang)

Fixes 2707e4446688 ("drm/i915/gvt: vGPU graphics memory virtualization")

---
upstream commit id: 663a50ceac75c2208d2ad95365bc8382fd42f44d
---
drivers/gpu/drm/i915/gvt/gtt.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gvt/gtt.c +0 -0
index dadacbe558ab..1a1f7eb46d1e 100644

drivers/gpu/drm/i915/gvt/gtt.c void intel_vgpu_unpin_mm(struct intel_vgpu_mm *mm) · line 1635

Quoted 8 lines
drivers/gpu/drm/i915/gvt/gtt.c +1 -1
@@ -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);
 }
 
 /**

Queued for 4.14 (which missing s-o-b from upstream), thanks.

--
Thanks,
Sasha