Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ee942d5 authored by Tina Zhang's avatar Tina Zhang Committed by Zhenyu Wang
Browse files

drm/i915/gvt: Refine dmabuf_obj cleanup process 



In the process of dmabuf_obj cleanup, the dmabuf_obj might be freed during
dmabuf_obj_put leaking intel_gvt_hypervisor_put_vfio_device.

Move intel_gvt_hypervisor_put_vfio_device and all the other dmabuf_obj ops
in front of dmabuf_obj_put and let every dmabuf_obj have a chance to call
intel_gvt_hypervisor_put_vfio_device to fix this leaking issue.

Fixes: e3a0d7976c53 ("drm/i915/gvt: Handle orphan dmabuf_objs")
Signed-off-by: default avatarTina Zhang <tina.zhang@intel.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent 072ec93d

drivers/gpu/drm/i915/gvt/dmabuf.c

+7 −8
Original line number Diff line number Diff line
@@ -520,18 +520,17 @@ void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) 
	list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) {

		dmabuf_obj = container_of(pos, struct intel_vgpu_dmabuf_obj,

						list);

		if (dmabuf_obj->initref) {

			dmabuf_obj->initref = false;

			dmabuf_obj_put(dmabuf_obj);

		}

		dmabuf_obj->vgpu = NULL;



		idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id);



		if (dmabuf_obj->vgpu)

		intel_gvt_hypervisor_put_vfio_device(vgpu);



		list_del(pos);

		dmabuf_obj->vgpu = NULL;



		/* dmabuf_obj might be freed in dmabuf_obj_put */

		if (dmabuf_obj->initref) {

			dmabuf_obj->initref = false;

			dmabuf_obj_put(dmabuf_obj);

		}



	}

	mutex_unlock(&vgpu->dmabuf_lock);