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;
From:   =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
To:     <dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>,
        <intel-gfx@lists.freedesktop.org>
CC:     David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
        "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Simon Ser <contact@emersion.fr>,
        Matthew Wilcox <willy@infradead.org>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v4 1/3] drm: Use XArray instead of IDR for minors
Date:   Tue, 6 Sep 2022 22:16:27 +0200
Message-ID: <20220906201629.419160-2-michal.winiarski@intel.com>
In-Reply-To: <20220906201629.419160-1-michal.winiarski@intel.com>
References: <20220906201629.419160-1-michal.winiarski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MzZNbXJnVmNyZVJmTDFzYWl6d0syRDVxY0RhVnQwWjM4VkMvSFl4SHRrUmJl?=
 =?utf-8?B?dDR3dUZJekVsWEVnWEYyYVVGcHR1dDdCdVNsbndYRWYwQlV6Rjl3M3BuYjRz?=
 =?utf-8?B?ZUQyMDhWSTRQWENqa1RkVEZwVUdpTW5mejNUeWxGQ1NXTmVPZU1kUjZycjdO?=
 =?utf-8?B?NDZ0dUEwNnB0NnQ4cmtHVWtMNHp2Skl5REVkT1ZHNkdPVUJSS1hGVnNuNTBi?=
 =?utf-8?B?b1VmWjNJaUQ4RzRpb1NtVFltMk8zY09pL0x5OUhrZDVCbjVLaVRFUGVPSENV?=
 =?utf-8?B?WFJSR1cvcEFabDFqbnJWb3NydStkbnVNSzVhN1M0TmlYdnpFVGlqYmFYUlZx?=
 =?utf-8?B?M0hscGo5OFhxRVZIeDU4eUNweWlOMWZEOUh5d2REMndENzJoZXdMVHVZc1dV?=
 =?utf-8?B?bG9WNUVZWFZVTHVWZG1WMDFQRzYrT3h5c0x1N251VjBqVzBDbWhXb240OThu?=
 =?utf-8?B?cE5CSkJRa3Q5SUZ5SHZXWDBpbnNLN3licU1UdC9KWU85NThTeDIwbldOQlND?=
 =?utf-8?B?YnFDSXdkRkpjTHRDVXZXZWJueFdxZEh5TEVsWWNIT3YwbmQ2M0NGc0tXdlFm?=
 =?utf-8?B?VHlkRi9hcG9NSjRxY29EdmY5ZENpNDVVYmYzVDlkRnpuOHJ2OXJRbjhBWjNj?=
 =?utf-8?B?K0ZNam1RV1hqQ0lvWW5VR1Z1bmlQY1lnb2RqQW5PQ1FRdHpTOWh1K2JRd1Nn?=
 =?utf-8?B?NkdxWGI1NjVwWkk3alVObTlQbXdKeTBXc2dZV0p5N1Z3OXBWWmpoLzdzWWM5?=
 =?utf-8?B?bHVPYzZNWUNYS2tUZlJhOTh0cHV5elZuSTFRaTFBemVaRm44OUpuNWZVYlN4?=
 =?utf-8?B?eU9mZkI1K3pYT09JdUIvSGhCcmYrb2hnZm16TVdyTEVGQ21MMXpOdkpvZWpI?=
 =?utf-8?B?SHZNcElOM1JpakpRaE51K2NHUE5kQTNFdkt3Mk5BWmFiUWZ6VjBuN001dXFD?=
 =?utf-8?B?MkJFcWxTd2pjdGJBMXBoanFXNFJPaVl4bEI0WWcvYzZOK3B1bEVzbVB0VG4w?=
 =?utf-8?B?dGRjNkhPUStiZ3B4UUR2MjhpYnRYK0JUZGZLSnVwYnh5QzVWbHVMRWZqL0I4?=
 =?utf-8?B?bTd5T3JQZllPenhsK3hwY2JsWENtdUhPRHorZS9Oc0hRcnVLVlBkSmRWMjhT?=
 =?utf-8?B?Y3dDQSswa1V1dndtRW85aEZOdGRIRE1mQUpGOFJJcjltZkRiSXF0V3Fqb3pS?=
 =?utf-8?B?dlhJanZzeXJZeGxmS1lNdy96NE45OWxmRHFpNXI2d2wrZVltUndIRHp5NVhZ?=
 =?utf-8?B?ZGZNVUZkdDhhdERFYXVuY3k5M3JnY3pHaE0waWluN3NJRHhMRjRpRExselk5?=
 =?utf-8?B?UFYxc3UvcmdsNnh0aDhjbE1sRmlVSi9ybjZiblpDbDMzZzgwaG51VlNJL1JO?=
 =?utf-8?B?RENETmVZbmEzcE9MTEIrdDVCUk5NS1dqN3hXTVRlaEo5WFVBS2ZTQWU2NXh0?=
 =?utf-8?B?ejVGaVBVdEljM3N2UkgrVHRaSHJ0NDRWRmluZVRsWXYwYmtJVEhpT1lBYkhZ?=
 =?utf-8?B?ODIyQjk5eXZSeW5CaHhHOHZKSEtsM0lENDJlY20wZWpoOEFJSm5KaVhxNEJj?=
 =?utf-8?B?VlBEMGNmbnBlc1JuTjFkTFA4cVBoa1NRWXh4aXRoSkMzZ2RQTzRYbEhLRito?=
 =?utf-8?B?b0huNHBnLzlCTlFJcURVSGpYSzdzaFZZeG1WZURFeVExUHJzWkFqS1daQlMy?=
 =?utf-8?B?UCtBYmROcHcwKy9ZcTVyckhGSVZtY2NzYlI1RlA2WS80KzBNVnphVExkWlJn?=
 =?utf-8?B?S0tJTVdNVG40eW9jZVpMQTg1UHQwVUd6eGlsTzlNbGxjRGpkSlVQR2Z0YU1w?=
 =?utf-8?B?OWNiNTNhckhFSXRxZDVjZVowT3A1ejZBSk1aWFAvNHhXZUtUelFjbEZVUkc1?=
 =?utf-8?B?Q2pXQzZqeHdRbitCd2krY1hQMHF3T3pOTVdtTGFWNmVTUGEwUmlUSGV6a2FU?=
 =?utf-8?B?T05jRXYvRTBJK243UGdXaStKdjI1cm5IK05MeVdLKzNVdFlMQk00Rk5zTldV?=
 =?utf-8?B?RXhpQjRndEZRVERwTlFxcndoN0tnYXQ3SnlUSk9YTlJweFVkRVluTVJGajd2?=
 =?utf-8?B?VXFHdytDQzVvZ0JNYkNxYnRzTVNPZm5wK2tXVk9vSktZMkJubnZRdmI4dzZ4?=
 =?utf-8?B?S2lGZEtnUzFjdG14ZzlXUmU2QSs0bnNpbnE4Q05FOTZFN0VHcWxSOVkrMUVN?=
 =?utf-8?B?dVE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 972bfaa2-37df-47e1-f1a7-08da9044c383
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 20:17:04.1069
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: hAUHbuah5dWnGGWtMWAW6MdOQWAoOLnppcnpXoNG7XIr+jTWXZjZtjkzMmZDg0XTWRWbttP4OWLzsY4Fm6ksVMdYpzrNwBVs5RDckeOgwLY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5396
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

IDR is deprecated, and since XArray manages its own state with internal
locking, it simplifies the locking on DRM side.
Additionally, don't use the IRQ-safe variant, since operating on drm
minor is not done in IRQ context.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Suggested-by: Matthew Wilcox <willy@infradead.org>
---
 drivers/gpu/drm/drm_drv.c | 49 ++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 8214a0b1ab7f..41799e4d0432 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -34,6 +34,7 @@
 #include <linux/pseudo_fs.h>
 #include <linux/slab.h>
 #include <linux/srcu.h>
+#include <linux/xarray.h>
 
 #include <drm/drm_cache.h>
 #include <drm/drm_client.h>
@@ -53,8 +54,7 @@ MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl");
 MODULE_DESCRIPTION("DRM shared core routines");
 MODULE_LICENSE("GPL and additional rights");
 
-static DEFINE_SPINLOCK(drm_minor_lock);
-static struct idr drm_minors_idr;
+static DEFINE_XARRAY_ALLOC(drm_minors_xa);
 
 /*
  * If the drm core fails to init for whatever reason,
@@ -98,21 +98,18 @@ static struct drm_minor **drm_minor_get_slot(struct drm_device *dev,
 static void drm_minor_alloc_release(struct drm_device *dev, void *data)
 {
 	struct drm_minor *minor = data;
-	unsigned long flags;
 
 	WARN_ON(dev != minor->dev);
 
 	put_device(minor->kdev);
 
-	spin_lock_irqsave(&drm_minor_lock, flags);
-	idr_remove(&drm_minors_idr, minor->index);
-	spin_unlock_irqrestore(&drm_minor_lock, flags);
+	xa_release(&drm_minors_xa, minor->index);
 }
 
 static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 {
 	struct drm_minor *minor;
-	unsigned long flags;
+	u32 id;
 	int r;
 
 	minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL);
@@ -122,20 +119,12 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 	minor->type = type;
 	minor->dev = dev;
 
-	idr_preload(GFP_KERNEL);
-	spin_lock_irqsave(&drm_minor_lock, flags);
-	r = idr_alloc(&drm_minors_idr,
-		      NULL,
-		      64 * type,
-		      64 * (type + 1),
-		      GFP_NOWAIT);
-	spin_unlock_irqrestore(&drm_minor_lock, flags);
-	idr_preload_end();
-
+	r = xa_alloc(&drm_minors_xa, &id, NULL,
+		     XA_LIMIT(64 * type, 64 * (type + 1) - 1), GFP_KERNEL);
 	if (r < 0)
 		return r;
 
-	minor->index = r;
+	minor->index = id;
 
 	r = drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor);
 	if (r)
@@ -152,7 +141,7 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 static int drm_minor_register(struct drm_device *dev, unsigned int type)
 {
 	struct drm_minor *minor;
-	unsigned long flags;
+	void *entry;
 	int ret;
 
 	DRM_DEBUG("\n");
@@ -172,9 +161,12 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)
 		goto err_debugfs;
 
 	/* replace NULL with @minor so lookups will succeed from now on */
-	spin_lock_irqsave(&drm_minor_lock, flags);
-	idr_replace(&drm_minors_idr, minor, minor->index);
-	spin_unlock_irqrestore(&drm_minor_lock, flags);
+	entry = xa_store(&drm_minors_xa, minor->index, &minor, GFP_KERNEL);
+	if (xa_is_err(entry)) {
+		ret = xa_err(entry);
+		goto err_debugfs;
+	}
+	WARN_ON(entry);
 
 	DRM_DEBUG("new minor registered %d\n", minor->index);
 	return 0;
@@ -187,16 +179,13 @@ static int drm_minor_register(struct drm_device *dev, unsigned int type)
 static void drm_minor_unregister(struct drm_device *dev, unsigned int type)
 {
 	struct drm_minor *minor;
-	unsigned long flags;
 
 	minor = *drm_minor_get_slot(dev, type);
 	if (!minor || !device_is_registered(minor->kdev))
 		return;
 
 	/* replace @minor with NULL so lookups will fail from now on */
-	spin_lock_irqsave(&drm_minor_lock, flags);
-	idr_replace(&drm_minors_idr, NULL, minor->index);
-	spin_unlock_irqrestore(&drm_minor_lock, flags);
+	xa_erase(&drm_minors_xa, minor->index);
 
 	device_del(minor->kdev);
 	dev_set_drvdata(minor->kdev, NULL); /* safety belt */
@@ -215,13 +204,10 @@ static void drm_minor_unregister(struct drm_device *dev, unsigned int type)
 struct drm_minor *drm_minor_acquire(unsigned int minor_id)
 {
 	struct drm_minor *minor;
-	unsigned long flags;
 
-	spin_lock_irqsave(&drm_minor_lock, flags);
-	minor = idr_find(&drm_minors_idr, minor_id);
+	minor = xa_load(&drm_minors_xa, minor_id);
 	if (minor)
 		drm_dev_get(minor->dev);
-	spin_unlock_irqrestore(&drm_minor_lock, flags);
 
 	if (!minor) {
 		return ERR_PTR(-ENODEV);
@@ -1037,7 +1023,7 @@ static void drm_core_exit(void)
 	unregister_chrdev(DRM_MAJOR, "drm");
 	debugfs_remove(drm_debugfs_root);
 	drm_sysfs_destroy();
-	idr_destroy(&drm_minors_idr);
+	xa_destroy(&drm_minors_xa);
 	drm_connector_ida_destroy();
 }
 
@@ -1046,7 +1032,6 @@ static int __init drm_core_init(void)
 	int ret;
 
 	drm_connector_ida_init();
-	idr_init(&drm_minors_idr);
 	drm_memcpy_init_early();
 
 	ret = drm_sysfs_init();
-- 
2.37.3