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>,
        Oded Gabbay <ogabbay@kernel.org>,
        =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>,
        James Zhu <James.Zhu@amd.com>,
        Pekka Paalanen <pekka.paalanen@collabora.com>,
        Emil Velikov <emil.l.velikov@gmail.com>,
        =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v6 3/4] drm: Expand max DRM device number to full MINORBITS
Date:   Mon, 24 Jul 2023 23:14:27 +0200
Message-ID: <20230724211428.3831636-4-michal.winiarski@intel.com>
In-Reply-To: <20230724211428.3831636-1-michal.winiarski@intel.com>
References: <20230724211428.3831636-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?clpUejNwdWdFUTYrZWY0TWxqME9JdmozL0s1T3pNM1dxenQxOVF2MlR6dEF4?=
 =?utf-8?B?VHdiRWlsOHZhU1kxU3BXYnhwM0ZFSzVVSmdUMURaK2hCRy9RTk1iWllMRGpU?=
 =?utf-8?B?ZjlFc01EemdwL2poRXoxZWpVZ3dWMVJub3dBQkhIR1Y4OW9iTGtpNDRNZEhw?=
 =?utf-8?B?aDh2SXdObUR1a3BiUTVpVk9hTnFUU3U1TlFGYkJGdS96RFBwVVR4UzRUdnlB?=
 =?utf-8?B?Wm5tbmcxb2puSGNjQUxCdDRZS3hxNFkvQmdTNEk4dkxKWlhlU1VCUWE5TnF3?=
 =?utf-8?B?Wi9TR3hmRXh5ajdxY0RIWDhtVktoOE9obDFtN0liQlZJVjErQjBSbithSzd3?=
 =?utf-8?B?ZGhjTzJlTVdxcWxjT091ejQ2SUpnMWZLZkRBVEU5Qkg4SldUb0UrQndJOG1a?=
 =?utf-8?B?Wkl1eldwaEl1ZkMwV3VvSmtlSEUwV2J0VXdmUnI2RCs2ZjJnVldkVTRCaHRp?=
 =?utf-8?B?TEpoRE84YUZuZDIzbGt0all3TllGSjhDb3hWNkp2RTRGVmw1SUM5dXd6TlMr?=
 =?utf-8?B?dHkwTXRFRXNVbG85Rk9JRTVHRldwbTZxTTIwVDhGQ1B1SVZzcHQ4YlJucU0w?=
 =?utf-8?B?N3ZNWGE1a1luY0JXS0M2cGorRSs3S3BkZkJNOVhKSlN4YzhwZTdDU0huK3dM?=
 =?utf-8?B?RTJXbHhSbDlzY0FOWVBxSFUvaU5jYStuRGhJWjZoOFRMUFZBRVBRN0RseHds?=
 =?utf-8?B?cjFQck8wNjZJZEE3MGxTaDh2MGY4cGZoSExzY3RST1ZhK1RCcjlWQS9CczUw?=
 =?utf-8?B?NWNQQ2NONkVDSU4yNW5ua0FVcHNHUTBuOVUybkxPNUkwaFNFWkpwM3QrSWY2?=
 =?utf-8?B?d29ralJrbWg5ZzlkRnFpMUVUcExXY2tZY0lpRTRLeHAzL0ZkdzVwUUJ5WW9a?=
 =?utf-8?B?Mk9IUU5ib252amxzNDVKU2toNi9SQ0ZJaW9nV1JqT3J0MVBTekdrQXBwQ05j?=
 =?utf-8?B?TWlheFhTb2F3a1QyWW9tdnk1VExGRUF5OVNrbW5HazZ6MVFsU055NTVoSXd4?=
 =?utf-8?B?emp0RlltRG1hb2xseDl2NGRmVFhHRnFLRWt0N2M3NmhFNEI0MmlDQUxFWktQ?=
 =?utf-8?B?YUU5SFhkMGM0TUg0NlZ3SEh2ZVNTclJURDZoU2kxWXo1YzFqdWxCNGpId3Jx?=
 =?utf-8?B?Zm5tNGdWN3owZTdDNHd2S3crOGRHWXM1YmsyNm42UEZLU2c1Z0VVRGg2TG5R?=
 =?utf-8?B?bVlkK0lnSnBuVGx5S09RN1M5OEFMa3hlb1VaWXNUdTNOUWN4MGJ3cFloR092?=
 =?utf-8?B?eHY0ZmVIQjdmM3J4VS95RWNUQ2RTUG1ZVHdRNjJkcjZIbVIvZXAwaU00eWgz?=
 =?utf-8?B?MXZSQlBGZm5aVjhPcmN6QUFmVEhWbzBKS0ZqVCs1WExRRithRi84TWVlWldW?=
 =?utf-8?B?T05WOWpZK1E3OEZ4QUIxNXFMRk4ydFNXQXRqVGtMSXJiUk04dDVnRUN1V2Jp?=
 =?utf-8?B?aUtsRisrMFdVV0c3aDdCTDNXMWtOYm93ZUpiOWNFbElyNm40WTFaYTlJaHRu?=
 =?utf-8?B?SzVkZEtKNzhqT3BVK0dMcmUzQm1PbTBaQU5sYXNpK2NGa0FkZ0NQdnh0UkZx?=
 =?utf-8?B?S2ZCZ1ZRNnhjRWZlL1NyKzk4aFg0UnVWRm5GT3MwQjVabWZYRjZ4UmErdG9u?=
 =?utf-8?B?dzhSSjIvYXhkd0dtZWJhRHJqN29XQlRXSGFScGE3M3lpOU52RXhSUWliNUxm?=
 =?utf-8?B?VWJFdWhESlduLzNWZG16UHo3bklhU1UrWHRiNU1ERFZibXF3Wm94eDB3ZG14?=
 =?utf-8?B?UHVSQ1VPVVVueTNBTUIvZk1aMmFoTWVFZXYrVW9odFhURW8rWm9xNGNwbHho?=
 =?utf-8?B?Y2NTb1JydHBnb0tKSU44V0F5OUh0ZEFjaGZFcGZjVS8wNEFvUjlNVGZqY0Np?=
 =?utf-8?B?OXF0THdybDV0QTcxaVZNeTIzNTVISnhaekZ3OWFvM3F2UjdUVk8wMGFEaEty?=
 =?utf-8?B?dXZxR2NaR0RDVEI1eXJLVnhnQjU4S2tMcTVFZXh0VEhHSmkwdnFFVHVrTi9Y?=
 =?utf-8?B?SjFHTjh4WWt2clBOTTVaR2pJZGNmNytjODJJVHZYQTNIU1hHQUJCbnYydm85?=
 =?utf-8?B?Vm5xRnM5OGNRaFhWbFd2dDVDaUxQdW1vbURURmw1QjRrRnB1RlN5RDFFdzZD?=
 =?utf-8?B?L3d4NUdTZmFoM3h1dlFPZUNxWTdlbXpRbEJodEpXVENuYldtczM5OXczUnFQ?=
 =?utf-8?B?RWc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: f78ade33-7299-44fe-f1c3-08db8c8b18ca
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2023 21:15:24.8348
 (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: vCui1SnYORZj/kKIzR6zWfUC9rQJc9o+2IS1269RfITFmxYuoFcmqISGkwlpCui5JWdbNTzhEotWVVyUECTqYkXrF3PLWPLMv0/LKSyBT9I=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR11MB5809
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 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 34b60196c443..c2c6e80e6b31 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -121,10 +121,19 @@ static void drm_minor_alloc_release(struct drm_device *dev, void *data)
 	xa_erase(drm_minor_get_xa(minor->type), minor->index);
 }
 
+/*
+ * 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.
+ * Accel nodes are using a distinct major, so the minors are allocated in continuous 0-MAX
+ * range.
+ */
 #define DRM_MINOR_LIMIT(t) ({ \
 	typeof(t) _t = (t); \
 	_t == DRM_MINOR_ACCEL ? XA_LIMIT(0, ACCEL_MAX_MINORS) : XA_LIMIT(64 * _t, 64 * _t + 63); \
 })
+#define DRM_EXTENDED_MINOR_LIMIT XA_LIMIT(192, (1 << MINORBITS) - 1)
 
 static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type)
 {
@@ -140,6 +149,9 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type)
 
 	r = xa_alloc(drm_minor_get_xa(type), &minor->index,
 		     NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL);
+	if (r == -EBUSY && (type == DRM_MINOR_PRIMARY || type == DRM_MINOR_RENDER))
+		r = xa_alloc(&drm_minors_xa, &minor->index,
+			     NULL, DRM_EXTENDED_MINOR_LIMIT, GFP_KERNEL);
 	if (r < 0)
 		return r;
 
-- 
2.41.0