aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/gvt/page_track.c
diff options
context:
space:
mode:
authorXiong Zhang <xiong.y.zhang@intel.com>2018-03-06 06:07:27 +0800
committerZhenyu Wang <zhenyuw@linux.intel.com>2018-03-06 14:49:24 +0800
commit7e60946feb4287111dc61a13ee66ea4295f4f6b4 (patch)
tree495e4e62ea334ef98e3da7d89ef9f272057662c1 /drivers/gpu/drm/i915/gvt/page_track.c
parentdrm/i915/kvmgt: Add kvmgt debugfs entry nr_cache_entries under vgpu (diff)
downloadlinux-dev-7e60946feb4287111dc61a13ee66ea4295f4f6b4.tar.xz
linux-dev-7e60946feb4287111dc61a13ee66ea4295f4f6b4.zip
drm/i915/gvt: Release gvt->lock at the failure of finding page track
page_track_handler take lock at the beginning, the lock should be released at the failure of finding page track. Otherwise deadlock will happen. Fixes: e502a2af4c35 ("drm/i915/gvt: Provide generic page_track infrastructure for write-protected page") Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com> Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/page_track.c')
-rw-r--r--drivers/gpu/drm/i915/gvt/page_track.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/page_track.c b/drivers/gpu/drm/i915/gvt/page_track.c
index 09bd56e39ec6..2d030545356b 100644
--- a/drivers/gpu/drm/i915/gvt/page_track.c
+++ b/drivers/gpu/drm/i915/gvt/page_track.c
@@ -165,7 +165,7 @@ int intel_vgpu_page_track_handler(struct intel_vgpu *vgpu, u64 gpa,
page_track = intel_vgpu_find_page_track(vgpu, gpa >> PAGE_SHIFT);
if (!page_track)
- return 0;
+ goto out;
if (unlikely(vgpu->failsafe)) {
/* Remove write protection to prevent furture traps. */
@@ -176,6 +176,7 @@ int intel_vgpu_page_track_handler(struct intel_vgpu *vgpu, u64 gpa,
gvt_err("guest page write error, gpa %llx\n", gpa);
}
+out:
mutex_unlock(&gvt->lock);
return ret;
}