From nobody Sat Apr 11 05:39:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C77A3C678D4 for ; Thu, 2 Mar 2023 11:53:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229730AbjCBLx1 (ORCPT ); Thu, 2 Mar 2023 06:53:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229513AbjCBLxZ (ORCPT ); Thu, 2 Mar 2023 06:53:25 -0500 Received: from out-1.mta0.migadu.com (out-1.mta0.migadu.com [IPv6:2001:41d0:1004:224b::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00FC7136EC for ; Thu, 2 Mar 2023 03:53:23 -0800 (PST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1677758002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=R+FdjYwjTIiZWh/4rjUriZ8U6SsI4yJTAnV6fEgVezk=; b=xWjTz3sW5v0NYdpVSQBxyYdOmQV8qT47leCscXVc8psi1ZFPH3GFUS9IQlKLoGSMABxErz QmfV5ggeL8rFkQ+2SHyGbu82mOgYozb5hx3hM4NozlRSd2XOxJ3Uvq0IZ8ncBS0V+5s0nn kx2aPQMpKcdv7+o1KT7XnyhDrh+89DY= From: Cai Huoqing To: cai.huoqing@linux.dev Cc: Zhenyu Wang , Zhi Wang , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915/gvt: Make use of idr_find and idr_for_each_entry in dmabuf Date: Thu, 2 Mar 2023 19:53:18 +0800 Message-Id: <20230302115318.79487-1-cai.huoqing@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch uses the already existing IDR mechanism to simplify and improve the dmabuf code. Using 'vgpu.object_idr' directly instead of 'dmabuf_obj_list_head' or 'dmabuf.list', because the dmabuf_obj can be found by 'idr_find' or 'idr_for_each_entry'. Signed-off-by: Cai Huoqing --- drivers/gpu/drm/i915/gvt/dmabuf.c | 69 +++++++------------------------ drivers/gpu/drm/i915/gvt/dmabuf.h | 1 - drivers/gpu/drm/i915/gvt/gvt.h | 1 - drivers/gpu/drm/i915/gvt/vgpu.c | 1 - 4 files changed, 16 insertions(+), 56 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.c b/drivers/gpu/drm/i915/gvt/d= mabuf.c index 6834f9fe40cf..7933bd843ae8 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.c +++ b/drivers/gpu/drm/i915/gvt/dmabuf.c @@ -133,21 +133,15 @@ static void dmabuf_gem_object_free(struct kref *kref) struct intel_vgpu_dmabuf_obj *obj =3D container_of(kref, struct intel_vgpu_dmabuf_obj, kref); struct intel_vgpu *vgpu =3D obj->vgpu; - struct list_head *pos; struct intel_vgpu_dmabuf_obj *dmabuf_obj; + int id; =20 - if (vgpu && test_bit(INTEL_VGPU_STATUS_ACTIVE, vgpu->status) && - !list_empty(&vgpu->dmabuf_obj_list_head)) { - list_for_each(pos, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj =3D list_entry(pos, struct intel_vgpu_dmabuf_obj, list); - if (dmabuf_obj =3D=3D obj) { - list_del(pos); - idr_remove(&vgpu->object_idr, - dmabuf_obj->dmabuf_id); - kfree(dmabuf_obj->info); - kfree(dmabuf_obj); - break; - } + if (vgpu && test_bit(INTEL_VGPU_STATUS_ACTIVE, vgpu->status)) { + idr_for_each_entry(&vgpu->object_idr, dmabuf_obj, id) { + idr_remove(&vgpu->object_idr, id); + kfree(dmabuf_obj->info); + kfree(dmabuf_obj); + break; } } else { /* Free the orphan dmabuf_objs here */ @@ -340,13 +334,11 @@ static struct intel_vgpu_dmabuf_obj * pick_dmabuf_by_info(struct intel_vgpu *vgpu, struct intel_vgpu_fb_info *latest_info) { - struct list_head *pos; struct intel_vgpu_fb_info *fb_info; struct intel_vgpu_dmabuf_obj *dmabuf_obj =3D NULL; - struct intel_vgpu_dmabuf_obj *ret =3D NULL; + int id; =20 - list_for_each(pos, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj =3D list_entry(pos, struct intel_vgpu_dmabuf_obj, list); + idr_for_each_entry(&vgpu->object_idr, dmabuf_obj, id) { if (!dmabuf_obj->info) continue; =20 @@ -357,31 +349,11 @@ pick_dmabuf_by_info(struct intel_vgpu *vgpu, (fb_info->drm_format_mod =3D=3D latest_info->drm_format_mod) && (fb_info->drm_format =3D=3D latest_info->drm_format) && (fb_info->width =3D=3D latest_info->width) && - (fb_info->height =3D=3D latest_info->height)) { - ret =3D dmabuf_obj; - break; - } - } - - return ret; -} - -static struct intel_vgpu_dmabuf_obj * -pick_dmabuf_by_num(struct intel_vgpu *vgpu, u32 id) -{ - struct list_head *pos; - struct intel_vgpu_dmabuf_obj *dmabuf_obj =3D NULL; - struct intel_vgpu_dmabuf_obj *ret =3D NULL; - - list_for_each(pos, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj =3D list_entry(pos, struct intel_vgpu_dmabuf_obj, list); - if (dmabuf_obj->dmabuf_id =3D=3D id) { - ret =3D dmabuf_obj; - break; - } + (fb_info->height =3D=3D latest_info->height)) + return dmabuf_obj; } =20 - return ret; + return dmabuf_obj; } =20 static void update_fb_info(struct vfio_device_gfx_plane_info *gvt_dmabuf, @@ -477,11 +449,6 @@ int intel_vgpu_query_plane(struct intel_vgpu *vgpu, vo= id *args) =20 update_fb_info(gfx_plane_info, &fb_info); =20 - INIT_LIST_HEAD(&dmabuf_obj->list); - mutex_lock(&vgpu->dmabuf_lock); - list_add_tail(&dmabuf_obj->list, &vgpu->dmabuf_obj_list_head); - mutex_unlock(&vgpu->dmabuf_lock); - gvt_dbg_dpy("vgpu%d: %s new dmabuf_obj ref %d, id %d\n", vgpu->id, __func__, kref_read(&dmabuf_obj->kref), ret); =20 @@ -508,7 +475,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsi= gned int dmabuf_id) =20 mutex_lock(&vgpu->dmabuf_lock); =20 - dmabuf_obj =3D pick_dmabuf_by_num(vgpu, dmabuf_id); + dmabuf_obj =3D idr_find(&vgpu->object_idr, dmabuf_id); if (dmabuf_obj =3D=3D NULL) { gvt_vgpu_err("invalid dmabuf id:%d\n", dmabuf_id); ret =3D -EINVAL; @@ -570,23 +537,19 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, un= signed int dmabuf_id) =20 void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) { - struct list_head *pos, *n; struct intel_vgpu_dmabuf_obj *dmabuf_obj; + int id; =20 mutex_lock(&vgpu->dmabuf_lock); - list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj =3D list_entry(pos, struct intel_vgpu_dmabuf_obj, list); + idr_for_each_entry(&vgpu->object_idr, dmabuf_obj, id) { dmabuf_obj->vgpu =3D NULL; =20 - idr_remove(&vgpu->object_idr, dmabuf_obj->dmabuf_id); - list_del(pos); - + idr_remove(&vgpu->object_idr, id); /* dmabuf_obj might be freed in dmabuf_obj_put */ if (dmabuf_obj->initref) { dmabuf_obj->initref =3D false; dmabuf_obj_put(dmabuf_obj); } - } mutex_unlock(&vgpu->dmabuf_lock); } diff --git a/drivers/gpu/drm/i915/gvt/dmabuf.h b/drivers/gpu/drm/i915/gvt/d= mabuf.h index 3dcdb6570eda..93c0e00bdab9 100644 --- a/drivers/gpu/drm/i915/gvt/dmabuf.h +++ b/drivers/gpu/drm/i915/gvt/dmabuf.h @@ -57,7 +57,6 @@ struct intel_vgpu_dmabuf_obj { __u32 dmabuf_id; struct kref kref; bool initref; - struct list_head list; }; =20 int intel_vgpu_query_plane(struct intel_vgpu *vgpu, void *args); diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h index 2d65800d8e93..1100c789f207 100644 --- a/drivers/gpu/drm/i915/gvt/gvt.h +++ b/drivers/gpu/drm/i915/gvt/gvt.h @@ -211,7 +211,6 @@ struct intel_vgpu { =20 struct dentry *debugfs; =20 - struct list_head dmabuf_obj_list_head; struct mutex dmabuf_lock; struct idr object_idr; struct intel_vgpu_vblank_timer vblank_timer; diff --git a/drivers/gpu/drm/i915/gvt/vgpu.c b/drivers/gpu/drm/i915/gvt/vgp= u.c index 08ad1bd651f1..0a511cfef067 100644 --- a/drivers/gpu/drm/i915/gvt/vgpu.c +++ b/drivers/gpu/drm/i915/gvt/vgpu.c @@ -329,7 +329,6 @@ int intel_gvt_create_vgpu(struct intel_vgpu *vgpu, vgpu->sched_ctl.weight =3D conf->weight; mutex_init(&vgpu->vgpu_lock); mutex_init(&vgpu->dmabuf_lock); - INIT_LIST_HEAD(&vgpu->dmabuf_obj_list_head); INIT_RADIX_TREE(&vgpu->page_track_tree, GFP_KERNEL); idr_init_base(&vgpu->object_idr, 1); intel_vgpu_init_cfg_space(vgpu, 1); --=20 2.34.1