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 2/3] drm: Expand max DRM device number to full MINORBITS
Date:   Tue, 6 Sep 2022 22:16:28 +0200
Message-ID: <20220906201629.419160-3-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?MGFJVDZnS0FmV2VHc0hLQTZuOGVxa2ovWWJ6UzVvNmNIcHlOdFpxWHhBQzZ3?=
 =?utf-8?B?bWZGQTVQc1pHTmxCcnBrcDdab2pvK2J5Zkd4WVVnbjIxaGp4WUVVbEp6RWxy?=
 =?utf-8?B?cmU1TzNRbk9JazZQSnVPVG1yUDc4dXJkdytWTnE1UWFrdTFOM0xNVzRrLzFM?=
 =?utf-8?B?MytwamxqRFJDMFBZM2t5dDluanNldDRzbGhVdXdXN05FSHl2L2cyR29rRWlo?=
 =?utf-8?B?ZTF4VEs2WlJjdnhtcmFLd0NDRm9NY1lUU0JGNzdpdmR0RDhYb2hzOGE0TXpG?=
 =?utf-8?B?eWhKQTMwSmg4cGVIYzJlVkJvV09GNEx6VlhBUm5EaWZrdnM2aTl2SjBDQXJn?=
 =?utf-8?B?WkdaRzFPd1hRZjdKU002aXFiSDFaUW5DZS9GS21vb1d2VXpGOSt3dFhTVkt3?=
 =?utf-8?B?bUJlbTJ6S0t0ZjhVVnF5WXNxaU5TRFJNUVpkTitROUVJb0pLL2llYnZiczNi?=
 =?utf-8?B?S2YzMm1NSlFZTmozdy9pNTdybU1FdFRDZCtqWFpQbnpJYnZ0TmxFNWtRcGdv?=
 =?utf-8?B?UDRYUEtiSkZiZDlhSWMweGpzdVlkaS9BRmtxMW9aSHVISW9oNU56N3pzVkZO?=
 =?utf-8?B?RSt4M3VSMFdPK2NnUllzYUE0VW4wVkRQeStzQ0NHVG9kbHJvMHIraCtKS2Jj?=
 =?utf-8?B?czFqU2I5S3hxR1JWWC8zOVRqaXg0TkxqbzcwcUVvMWNLeDNubk1TeEVuSmp3?=
 =?utf-8?B?WW1xa3l3OEFNbEg1bGJkdUlDc3hZUUNQNU9VWTJVWnRVVytSMzd0RkMwdzVN?=
 =?utf-8?B?c3dXT2JDL25rdkdDSWRNbk4wbVBTQVMwVHJNNEYwM2IwbW5SeXQxcHUrekZs?=
 =?utf-8?B?QjJwVmVvRi84QU91WkFQZDJjakI2dy83bnVUcEdmTWZWQjlHMmRrT3o1K0cz?=
 =?utf-8?B?VS9YRWxsREhqS1VGTnpCWW10ZVhzaEFNd3ZneXppdVdtSlhyMG5NbXlLV1Rv?=
 =?utf-8?B?Z3Ryby9yaFE1Z3hObW1ISVJ4d3dKSU1lSDJpdTBKdXVBVEIwUHgwVlhFNFRn?=
 =?utf-8?B?NEl2bDdXbDNidDE4dVB3RmZ6NzZxV0cxRVMwTXhQYmRNOEFvRWxjU2VyZ0pt?=
 =?utf-8?B?WXJ5OFp4b2JHOWxSakhJZ0p6N1lUVEJjMWNSK0VSeWdxS3ZKVWRsazFPcXpi?=
 =?utf-8?B?TWRmR2cxS0FmOWRZQVBVOWhFSzU0OEI2dVRtd05XNDZHRjZrRE1aV090cUVL?=
 =?utf-8?B?RnJCVXZSYUNXcGxiUG9SamRrS0RUNTZxSzZQSlhQN1kxdE1OaDNoMkJzSFlL?=
 =?utf-8?B?emU3U3ppRGlVQWd5bTgxNUxaUGl4NkVXYjlzUEFkMVNRR1RndGFqN3JoYkNs?=
 =?utf-8?B?c3pKelNDRlJOekp5aGJIelhtTytwaDUrcExHZU5nTmg5dXZBbzJEeUZvUjlM?=
 =?utf-8?B?dEdCbzZEckNyYWtMNnNpK0FtRFJEU0h2S3pHa2w3WXJkWmJSV3d5aVhHSDls?=
 =?utf-8?B?QzdWZy9NWFJhQkxzRVEwSitac2o0dUJNanFONFhiVFR1a2QvV3BGMXp1WFhP?=
 =?utf-8?B?WkpBOENKdG1LdDlVbWkxUjRyTlM0aDBrL29OZ0taR0ZNSXVNY2FzdDNjeWNu?=
 =?utf-8?B?dWRhK25oZGlzN2NWU00vSmlzTS81SURxMjlKZjdDamtBOWZTaDhnSWtEbkQ2?=
 =?utf-8?B?REhMUmZ5YklzQXQxT3paT1B0Y08zN0cxb0sxM0pSUnppV3pEWkNwVnVQeW85?=
 =?utf-8?B?WWFPblNTZGVFdk40YVh0Rk9lUkdkVGw0YnhKTm8xWlFETEFjZmVEdER5VllM?=
 =?utf-8?B?ViticzVsRlhsWGU0OFpQaWZYMVBFU0VKenpLbUJPdGdSV3Z3NGcxTSszUmF3?=
 =?utf-8?B?bTRUeWZXWExBUGw3NUJhbWorY3JOaDlsMnBSZnRVYVBFdjB5Y0lOTlhORXN0?=
 =?utf-8?B?YkNIc1M4TUN5Tk5FQ3J6dmNKejNFcmRReVVPU2NsZno1UnBON2tZeTZzNkpk?=
 =?utf-8?B?QXVyTmpuVklZZDAxV3RDMW1SUEtZZnhyYTFMMllaaVJHaC90djVlU256cVh2?=
 =?utf-8?B?N1hHcFhBN3BDay9CRmNEY2dlTkUrTm0rcUZ3MHZxN3lvbENNWmpkeENyRjNZ?=
 =?utf-8?B?Wk1lWVR4RGE2Vk1sK1ZIVUhUTlNQZ0gxdjRRSHMxVHhVSVNzS3pkWENmMmpQ?=
 =?utf-8?B?c0RnMGc0NHNNUDFtZG9Pdks5QUJDcWgrT2ZWdTVRclQrNVNuVmxqVjdKRFli?=
 =?utf-8?B?Rmc9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: b7766d86-eaa8-4c91-e8d8-08da9044c664
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:08.8274
 (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: CdEI5dOPnaXmGTrjwQEVdOH7gZHr58tqC7wdmp+9uRVzmb5dZe1ZMuckcl+nb2H5z8pMJO73TlD6ZDdqvXqK4UwcjIUvAymhs7kO/gaQK0M=
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

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 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 41799e4d0432..2c6e0b8d3b7a 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -119,8 +119,17 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 	minor->type = type;
 	minor->dev = dev;
 
+	/*
+	 * 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, &id, NULL,
 		     XA_LIMIT(64 * type, 64 * (type + 1) - 1), GFP_KERNEL);
+	if (r == -EBUSY)
+		r = xa_alloc(&drm_minors_xa, &id, NULL,
+			     XA_LIMIT(192, (1 << MINORBITS) - 1), GFP_KERNEL);
 	if (r < 0)
 		return r;
 
-- 
2.37.3