From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BCDBF327AD for ; Tue, 21 Apr 2026 07:10:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6875B10EB85; Tue, 21 Apr 2026 07:10:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="kJPjJKTz"; dkim-atps=neutral Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by gabe.freedesktop.org (Postfix) with ESMTPS id 772DD10E46C for ; Mon, 20 Apr 2026 08:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=7V XphQzWw9fm0xAH4dtM4bcJQCkPDqSqm5OAkEsknTk=; b=kJPjJKTzW8Q6NToDaU akZn+oQk2RvI/Mx4N6SYBPbiu7f+hyzfEJxLp63P31govBpctnLWucF9QpNvJ1eT iWV3oIirxAQJ6Bdi2aGgMZp10OsOTqAnUzeDZin75rw7rIzskqt7eoYOSRXuG+Ol v86H3d4EHWeklx0UF/jnj/Jbc= Received: from neo-TianYi510Pro-15ICK.. (unknown []) by gzsmtp4 (Coremail) with SMTP id PygvCgDXvCqi5eVptcv2Ag--.50920S2; Mon, 20 Apr 2026 16:36:55 +0800 (CST) From: liuqiangneo@163.com To: airlied@redhat.com, kraxel@redhat.com Cc: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, virtualization@lists.linux.dev, spice-devel@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Liu Subject: [PATCH] drm/qxl: Convert qxl release idr to xarray Date: Mon, 20 Apr 2026 16:36:45 +0800 Message-ID: <20260420083646.179545-1-liuqiangneo@163.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: PygvCgDXvCqi5eVptcv2Ag--.50920S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxuw47ZFy3Gr4kCF17tr43ZFb_yoW7tryfpF WrJFW5ArWUJr4DKrnrAanrXF1Sv3WYqayfGFW7ta43Zw15Jry5Xr15JF4qvrZ5AFZ5AF47 Xa1UKryUCF1UWaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jnb18UUUUU= X-Originating-IP: [116.128.244.169] X-CM-SenderInfo: 5olx1xxdqj0vrr6rljoofrz/xtbC+wd212nl5acUswAA30 X-Mailman-Approved-At: Tue, 21 Apr 2026 07:09:47 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Qiang Liu Replace the release_idr + release_idr_lock to an XArray. IDR internally uses xarray so we can use it directly which simplifies our code by removing the need to do external locking. Signed-off-by: Qiang Liu --- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 4 +-- drivers/gpu/drm/qxl/qxl_release.c | 45 ++++++++++++++----------------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index cc02b5f10ad9..cf9decf39022 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -208,11 +209,10 @@ struct qxl_device { struct qxl_memslot surfaces_slot; spinlock_t release_lock; - struct idr release_idr; - uint32_t release_seqno; + struct xarray release_xa; + atomic_t release_seqno; atomic_t release_count; wait_queue_head_t release_event; - spinlock_t release_idr_lock; struct mutex async_io_mutex; unsigned int last_sent_io_cmd; diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index 461b7ab9ad5c..0cebaf88f407 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -227,8 +227,8 @@ int qxl_device_init(struct qxl_device *qdev, goto cursor_ring_free; } - idr_init_base(&qdev->release_idr, 1); - spin_lock_init(&qdev->release_idr_lock); + xa_init_flags(&qdev->release_xa, XA_FLAGS_ALLOC1); + atomic_set(&qdev->release_seqno, 0); spin_lock_init(&qdev->release_lock); idr_init_base(&qdev->surf_id_idr, 1); diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c index 06979d0e8a9f..f24089dd69cc 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -90,6 +90,7 @@ qxl_release_alloc(struct qxl_device *qdev, int type, struct qxl_release *release; int handle; size_t size = sizeof(*release); + int r; release = kmalloc(size, GFP_KERNEL); if (!release) { @@ -102,16 +103,12 @@ qxl_release_alloc(struct qxl_device *qdev, int type, release->surface_release_id = 0; INIT_LIST_HEAD(&release->bos); - idr_preload(GFP_KERNEL); - spin_lock(&qdev->release_idr_lock); - handle = idr_alloc(&qdev->release_idr, release, 1, 0, GFP_NOWAIT); - release->base.seqno = ++qdev->release_seqno; - spin_unlock(&qdev->release_idr_lock); - idr_preload_end(); - if (handle < 0) { + r = xa_alloc(&qdev->release_xa, &handle, release, xa_limit_32b, GFP_NOWAIT); + release->base.seqno = atomic_inc_return(&qdev->release_seqno); + if (r < 0) { kfree(release); *ret = NULL; - return handle; + return r; } *ret = release; DRM_DEBUG_DRIVER("allocated release %d\n", handle); @@ -143,9 +140,7 @@ qxl_release_free(struct qxl_device *qdev, if (release->surface_release_id) qxl_surface_id_dealloc(qdev, release->surface_release_id); - spin_lock(&qdev->release_idr_lock); - idr_remove(&qdev->release_idr, release->id); - spin_unlock(&qdev->release_idr_lock); + xa_erase(&qdev->release_xa, release->id); if (dma_fence_was_initialized(&release->base)) { WARN_ON(list_empty(&release->bos)); @@ -261,14 +256,14 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, struct qxl_release **release) { if (surface_cmd_type == QXL_SURFACE_CMD_DESTROY && create_rel) { - int idr_ret; + int xa_ret; struct qxl_bo *bo; union qxl_release_info *info; /* stash the release after the create command */ - idr_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release); - if (idr_ret < 0) - return idr_ret; + xa_ret = qxl_release_alloc(qdev, QXL_RELEASE_SURFACE_CMD, release); + if (xa_ret < 0) + return xa_ret; bo = create_rel->release_bo; (*release)->release_bo = bo; @@ -277,7 +272,7 @@ int qxl_alloc_surface_release_reserved(struct qxl_device *qdev, qxl_release_list_add(*release, bo); info = qxl_release_map(qdev, *release); - info->id = idr_ret; + info->id = xa_ret; qxl_release_unmap(qdev, *release, info); return 0; } @@ -291,7 +286,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size, struct qxl_bo **rbo) { struct qxl_bo *bo, *free_bo = NULL; - int idr_ret; + int xa_ret; int ret = 0; union qxl_release_info *info; int cur_idx; @@ -312,11 +307,11 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size, return -EINVAL; } - idr_ret = qxl_release_alloc(qdev, type, release); - if (idr_ret < 0) { + xa_ret = qxl_release_alloc(qdev, type, release); + if (xa_ret < 0) { if (rbo) *rbo = NULL; - return idr_ret; + return xa_ret; } atomic_inc(&qdev->release_count); @@ -362,7 +357,7 @@ int qxl_alloc_release_reserved(struct qxl_device *qdev, unsigned long size, } info = qxl_release_map(qdev, *release); - info->id = idr_ret; + info->id = xa_ret; qxl_release_unmap(qdev, *release, info); return ret; @@ -373,11 +368,11 @@ struct qxl_release *qxl_release_from_id_locked(struct qxl_device *qdev, { struct qxl_release *release; - spin_lock(&qdev->release_idr_lock); - release = idr_find(&qdev->release_idr, id); - spin_unlock(&qdev->release_idr_lock); + xa_lock(&qdev->release_xa); + release = xa_load(&qdev->release_xa, id); + xa_unlock(&qdev->release_xa); if (!release) { - DRM_ERROR("failed to find id in release_idr\n"); + DRM_ERROR("failed to find id in release_xa\n"); return NULL; } -- 2.43.0