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 v5 2/3] drm: Expand max DRM device number to full MINORBITS
Date:   Sun, 11 Sep 2022 23:14:42 +0200
Message-ID: <20220911211443.581481-3-michal.winiarski@intel.com>
In-Reply-To: <20220911211443.581481-1-michal.winiarski@intel.com>
References: <20220911211443.581481-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?QUpNa0lqTDAwNVQzVnFwZmlxclBoZ1ZiZmhQc2ZqdDhMTDFKWjJtNXBTclNY?=
 =?utf-8?B?K1NtUG1ZQ0tpN1hENWd0WTVVSFE1RXAwSEpLWDhIaE50NEdDUDBseWlkZFJa?=
 =?utf-8?B?aUY2cUZ6RDIzbldFS0EyK0d6dzhIWTROMzhvRG9MemNPWVlLL2RVQXJqcEV3?=
 =?utf-8?B?TUkvSWlnK0F1R2JrUTE2VjVpMlBkbkdtNy9CQlJKcU5QaktHVldqcVN4Q3R0?=
 =?utf-8?B?by9Xb2tyQkx6VDZYZTlUR21BT0wzeUVDR2xad0oxZlRUdmUrWmNjUkhzOFN4?=
 =?utf-8?B?bitCbko2K0hJVG5FRWF0OE8veUxvT3hwcVF1Yzhsd2h2dEhFTklUQ3YzUFRl?=
 =?utf-8?B?NGlEdjAyMysrL0FBQndrQVNxZW5SdVF2MXVIcUxkU3Vwb0JNYWtjUGkybnZa?=
 =?utf-8?B?c0ZjNFczZUpSTWd6YmpQUUdBYU1wakNoUkZjTkplSkh6M2FNaGp3Q1RqUjRt?=
 =?utf-8?B?N2JSQVE3LzFERG50cXJWTmdTd3RCU1M3WVpjQWkxRDNIZG92UmsyZE1XMEJp?=
 =?utf-8?B?VU5KVzhPM01La1Z2NWtGMEhaZXNuenN6UTFsVVFnWmdjc0ZVREY3NjE3K2Fr?=
 =?utf-8?B?MWxqMFZ6UFRZRVVpVVFTczlwZmMyS3M3eGxpYXRjYzM0K2NyZUJHMTlPZ2JH?=
 =?utf-8?B?THlBVXhlUThwMGZxYUVJSG12Mm9VUi9IcVFYN1NtNlo4RGJuQ3lyalVvWDk5?=
 =?utf-8?B?MkRZR2lPK0dyeXdJYnVIVzk5YXFuT0dwS1BLREJVbGNXdmNnZ0FJTjN4NUQ0?=
 =?utf-8?B?bVBuZ2F0V29xVnZqS05BMkxjdGNqdExtVmg5Q0s2Wm90azVWNGFseFNmWU9l?=
 =?utf-8?B?SlM1R0pOQ1JkdWtYOWo0UnhObHZ4SXk2WlZZRWRLYThROXJNSWNza2I0VkF0?=
 =?utf-8?B?UEcxamtqZG1ZZFVSZU5vc0VZYnlWK055QWlBUVlwcG5rNDlXS2E5b2hNOE1Q?=
 =?utf-8?B?N1F6UmROOGpXUGtHTEtRR0liU1FaZG4zZFAxSnRsOWduT2ZpWXpOeUxvb1J0?=
 =?utf-8?B?aEgrTVRRQmVIaDVJUE1td2FLemNVL3I3M1czK01RNzFVak9NRG82MitrWUgx?=
 =?utf-8?B?M3B2UHYvTHNOTG9vWlhwV05Bamc5NGZoV3JBRnMwaEJLYlRDTDRqQTIzQ29u?=
 =?utf-8?B?ZHBwcm5WY0FhREZzTmVZQzRnRmorZDIycG1FcVVzamdRMnpoSGcvdzJWQzYz?=
 =?utf-8?B?UVR0Mm15ZjYzRWlndC9pbU85ZmR0WVZZQmxDN0RENGtpQ0lEakIzdWFrSy9E?=
 =?utf-8?B?YUVIdnFmSFlYMmhWcDZLVnNreFQzbklKaDh4UzNrcVZtYnNBS1pVTVlFMmRz?=
 =?utf-8?B?MDczU2FITGo3RGJaWVp0YWVnRFFqWnBya3RlZi9rbUhNdnJiSWJJTFZSeEtY?=
 =?utf-8?B?OXZCUGJramo0NTVobHQ1cWcxbUxVMXhsTVA2N1hvR2JsRkl3OXBKMEhCNFhL?=
 =?utf-8?B?QVFzSmdTR2ZwQ0FrUnBMZWIvc21VNnNveHVSY3ZUUDVoTWQrMnk2blUvbVNY?=
 =?utf-8?B?TzlNSkxjMDNGalRyTTZ1WVJtditTNVVLSHNnVkcyQUFZWjcrRjhCUnJ2N3Vq?=
 =?utf-8?B?U28zVGlqZ25qL3JVQnJlaElHREt6WmgzUTlZMkcranMrOEVnc1FseGNOQmQ4?=
 =?utf-8?B?aUh6TTAzekRSalk4cXlyamtqRUU5UmNmSlU3ZGZpRmFGajQwcFZTNlNvNXBk?=
 =?utf-8?B?SVp0dE9iVVdyRWlOajhyT1JZV2Qxb04xOU1KMktBdGRrN21xOCtTQ2VxbXVh?=
 =?utf-8?B?MDRVT1F4YlBvUklXUmNmWWU4OHZybTlWWG9mS2FRb25SNFplZm1iQ0xXRy83?=
 =?utf-8?B?SloyVjZKNlBNQ2x5cUY0RWVpQ1NGMExVVm1UWkh4OEFMWUtYdXZJWldEWWF2?=
 =?utf-8?B?UmFUTVRTN0dXbEhCUklIMEFOd0NnaTA4K3Vzbjg5VXBBSlpsb0FSK09reEZ2?=
 =?utf-8?B?eUhLc0tObnRaSFZ1U3o0THRXNW9idHpXc2NjSTB2bzVPTEVUU3BrcEp4VWpR?=
 =?utf-8?B?WGNEck13M29qblBjOXFQbWV3bC8zcndEQ21IaXZ1ZVRKWnN5WWpMTmNCQk9v?=
 =?utf-8?B?R1dhYTRPWFdmWUoxR2NPNndVY0RRRmYxMGpBVHQ4ZGFtZlBnbUc1eVppWjZ2?=
 =?utf-8?B?UGhvcWx4YmE2YTVWYWFqRlFZVHV0Y05BNzN1TW90Wkh2bi9CSThvb0wxVTZh?=
 =?utf-8?B?UGc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9324ec8c-1bae-4626-ea4d-08da943b01e4
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2022 21:17:18.3044
 (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: /p+2gu7tO/gOmcWpzcjrAwBNZfIAcozEUB179dWLw3BQOB66jRj54/pF9AGHXKXFBe41OXc3amiAS9Htu4CP1WGnOX4Bd/Bst1y8/5wcn10=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6065
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

Having a limit of 64 DRM devices is not good enough for modern world
where we have multi-GPU servers, SR-IOV virtual functions and virtual
devices used for testing.
Let's utilize full minor range for DRM devices.
To avoid regressing the existing userspace, we're still maintaining the
numbering scheme where 0-63 is used for primary, 64-127 is reserved
(formerly for control) and 128-191 is used for render.
For minors >= 192, we're allocating minors dynamically on a first-come,
first-served basis.

Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
---
 drivers/gpu/drm/drm_drv.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 61d24cdcd0f8..3718bd6bbef6 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -106,7 +106,8 @@ static void drm_minor_alloc_release(struct drm_device *dev, void *data)
 	xa_erase(&drm_minors_xa, minor->index);
 }
 
-#define DRM_MINOR_LIMIT(t) ({ typeof(t) _t = (t); XA_LIMIT(64 * _t, 64 * _t + 63); })
+#define DRM_LEGACY_MINOR_LIMIT(t) ({ typeof(t) _t = (t); XA_LIMIT(64 * _t, 64 * _t + 63); })
+#define DRM_MINOR_LIMIT XA_LIMIT(192, (1 << MINORBITS) - 1)
 
 static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 {
@@ -120,7 +121,15 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 	minor->type = type;
 	minor->dev = dev;
 
-	r = xa_alloc(&drm_minors_xa, &minor->index, NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL);
+	/*
+	 * DRM used to support 64 devices, for backwards compatibility we need to maintain the
+	 * minor allocation scheme where minors 0-63 are primary nodes, 64-127 are control nodes,
+	 * and 128-191 are render nodes.
+	 * After reaching the limit, we're allocating minors dynamically - first-come, first-serve.
+	 */
+	r = xa_alloc(&drm_minors_xa, &minor->index, NULL, DRM_LEGACY_MINOR_LIMIT(type), GFP_KERNEL);
+	if (r == -EBUSY)
+		r = xa_alloc(&drm_minors_xa, &minor->index, NULL, DRM_MINOR_LIMIT, GFP_KERNEL);
 	if (r < 0)
 		return r;
 
-- 
2.37.3