From patchwork Thu Mar 2 11:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cai Huoqing X-Patchwork-Id: 63377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4192285wrd; Thu, 2 Mar 2023 03:58:38 -0800 (PST) X-Google-Smtp-Source: AK7set8dMkA3Tt4sDB5uNc6jCn0Wfoe050/SDKG5QzHLAoGiNcVOAW5dyaxCjkvwSQdSqMj/fg8o X-Received: by 2002:a17:90b:4ad1:b0:230:af67:b847 with SMTP id mh17-20020a17090b4ad100b00230af67b847mr11366210pjb.31.1677758317815; Thu, 02 Mar 2023 03:58:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677758317; cv=none; d=google.com; s=arc-20160816; b=Qf1YjcM2Z4pr6Oaupb3bCgUA5dGQ82x5rjTDj9m+CyKJ0sl9757+xaQryayzZsDczs NCNO9qur+RIPK40lh7/PunJkH0q+hn2zTqPcO3oBeuOzIHCPRvj/0+2YaY9W5GAy5wXM UNJ27VfM+KvgsHqENmdsCPUwk4Nth15r/wnuUAqF/2rJ0xFpo7BTVTIhdJwpGcliJAoX 5ew6C6AOziofuphIAvDcpmErwbxTPwUWFF+lOaOHm0+9QhgLXKGReWSM62Y3lQGt7ro7 ufl8lqHr7DsH/xcrfek/UNb2Nqm6dgkbbGpBDw3dtiVAT47CwArIyF4ojBInfuknagiO fVkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=R+FdjYwjTIiZWh/4rjUriZ8U6SsI4yJTAnV6fEgVezk=; b=cPdEH7q3TQjXq96RoskMU1Mbunbb+2sKkiL94IMqiAvdd+O69EqU8KsAdlbAla0fsa Gju5+Z6gRazkk2ezLwsFk/PXc6sRDQZzdB3Jp6rKob+M4JNrN2RPtdEhqxQhtwbPoCNi faVZfSvxdniiInn7iCznQIvrGU2Y5RoUNL7nPWRVEd07LJtYWx9hi+HfMlobq2RWLrWP xDpk+34sQ+nGzsa8c2VKKLBc6gJgi9HopJAQBmsdeHBH4cJH42wBFfB0uJabXb+rG3IG yYeqXn1h8c0d9ouoSFjiaeuQYPSSTZ423vdUqWBncZIr9rmf3xPZ8u57QEdA7Zw1I7tO cSDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=xWjTz3sW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gi21-20020a17090b111500b00232f57260c1si2253288pjb.1.2023.03.02.03.58.24; Thu, 02 Mar 2023 03:58:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=xWjTz3sW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229716AbjCBLx1 (ORCPT + 99 others); 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 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, TO_EQ_FM_DIRECT_MX autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759257106080091248?= X-GMAIL-MSGID: =?utf-8?q?1759257106080091248?= 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/dmabuf.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 = container_of(kref, struct intel_vgpu_dmabuf_obj, kref); struct intel_vgpu *vgpu = obj->vgpu; - struct list_head *pos; struct intel_vgpu_dmabuf_obj *dmabuf_obj; + int id; - 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 = list_entry(pos, struct intel_vgpu_dmabuf_obj, list); - if (dmabuf_obj == 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 = NULL; - struct intel_vgpu_dmabuf_obj *ret = NULL; + int id; - list_for_each(pos, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list); + idr_for_each_entry(&vgpu->object_idr, dmabuf_obj, id) { if (!dmabuf_obj->info) continue; @@ -357,31 +349,11 @@ pick_dmabuf_by_info(struct intel_vgpu *vgpu, (fb_info->drm_format_mod == latest_info->drm_format_mod) && (fb_info->drm_format == latest_info->drm_format) && (fb_info->width == latest_info->width) && - (fb_info->height == latest_info->height)) { - ret = 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 = NULL; - struct intel_vgpu_dmabuf_obj *ret = NULL; - - list_for_each(pos, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list); - if (dmabuf_obj->dmabuf_id == id) { - ret = dmabuf_obj; - break; - } + (fb_info->height == latest_info->height)) + return dmabuf_obj; } - return ret; + return dmabuf_obj; } 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, void *args) update_fb_info(gfx_plane_info, &fb_info); - 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); @@ -508,7 +475,7 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) mutex_lock(&vgpu->dmabuf_lock); - dmabuf_obj = pick_dmabuf_by_num(vgpu, dmabuf_id); + dmabuf_obj = idr_find(&vgpu->object_idr, dmabuf_id); if (dmabuf_obj == NULL) { gvt_vgpu_err("invalid dmabuf id:%d\n", dmabuf_id); ret = -EINVAL; @@ -570,23 +537,19 @@ int intel_vgpu_get_dmabuf(struct intel_vgpu *vgpu, unsigned int dmabuf_id) void intel_vgpu_dmabuf_cleanup(struct intel_vgpu *vgpu) { - struct list_head *pos, *n; struct intel_vgpu_dmabuf_obj *dmabuf_obj; + int id; mutex_lock(&vgpu->dmabuf_lock); - list_for_each_safe(pos, n, &vgpu->dmabuf_obj_list_head) { - dmabuf_obj = list_entry(pos, struct intel_vgpu_dmabuf_obj, list); + idr_for_each_entry(&vgpu->object_idr, dmabuf_obj, id) { dmabuf_obj->vgpu = NULL; - 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 = 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/dmabuf.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; }; 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 { struct dentry *debugfs; - 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/vgpu.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 = 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);