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>
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 v3 1/4] drm: Expand max DRM device number to full MINORBITS
Date:   Tue, 6 Sep 2022 16:01:14 +0200
Message-ID: <20220906140117.409852-2-michal.winiarski@intel.com>
In-Reply-To: <20220906140117.409852-1-michal.winiarski@intel.com>
References: <20220906140117.409852-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?YzFTVDVSbFVqS2tBeGxDeWJsMjJuYTc2L3dQSTZSRFloMDRaYmxpNmNwdTc1?=
 =?utf-8?B?dnVqMUFpSm5VMDhMSTZ1Q2ZWM3d2V29XS0lmVThKNnRRN3MwbUJ3R1VWVlli?=
 =?utf-8?B?MUx2RytyVXNxMy9rWlYrWTZBOUlMTDN4UmQ2SmFEWEJKT0xLd1RDdFl1UEN4?=
 =?utf-8?B?MHRZVEppWnIzbWF3UjdMTTRyN0lSVmk0ZTRoUDEyb2tob0ZOL1BCekJOSFJV?=
 =?utf-8?B?NHhhU29hSzU1THR0RVR5OGNpeGlOZXJYZEl2SEVEVTRIK01RUzRwa0tIc3lI?=
 =?utf-8?B?TE9KaGRNeHpidWc1ZVM2WE9RcGFkdTJlc1hzeXVsZ3lMVi9hditrald5VCth?=
 =?utf-8?B?QzJsWFdzRHc2bzdBbEJ6RVVaZVRIb3ZwNUxTR1lVT3liNUFoQ0Z4YlBBNXFE?=
 =?utf-8?B?eXp2aGwrUUNQb2dXN0ZmU0k5R3pnZnhoTjBFOFRGcGxKT3pzUTNYZ2FVQm1h?=
 =?utf-8?B?OGhRNkkzcys2ZlAwTURYalFTK2E4U2MvYnU1QWhFSDliZ1crZHhwTG9yMkgz?=
 =?utf-8?B?dDZESTFoSTdZWUZiU2RObVQxcnhKdnJLeEpTZjdYeFBvUzU0aXF1U1VXWUNU?=
 =?utf-8?B?c0U5ckRFSXNtMnRaSFFLbTlwUEJVMkd3TUhxbFc1MDA4L0VHN3RzRkgrbmJr?=
 =?utf-8?B?VEQ4WXJURGJzQTVtQUZWbDR1TW93cmozU29MQWJEMXBmZ1FkVkxWNWE3ZzNm?=
 =?utf-8?B?czJ3cWlTY0NEeVdSaWc4WDdTc2dxL0hrWW5wdU9iYjhTQm1ZdnpJMWM4QUtm?=
 =?utf-8?B?d0dxMnN0Q0lGTGxxZytHZGIzc1MzYzcrUjhXbVo2VkprRVJ3ekY1RmZucWh0?=
 =?utf-8?B?aTdqdWU0YnhQQVNYZ2FlL0xRdnhPajhYaWhYbjlUNEFzRHVnblZrVFVYa2VS?=
 =?utf-8?B?M1JDNE1Kai94QVJlV1VQajZBQXNEd3lVVVR6eitaMWRKdW5VSWVNWDZpdnds?=
 =?utf-8?B?OUpCWkVQQ01XK3NlWENESjgzakgyZ3gxU3ZjRlZkN1lNWGs0bDV4TVpIK3Yw?=
 =?utf-8?B?RkVPMFI4QXAzSm1NNHNKWHZCRU91RUdOVFoxQ0YzYnNrRnFZbGkwcjM4NEto?=
 =?utf-8?B?S3ZlU0duRTBCNzVsUEJhR1M3TDl6YkM2U0pDd3htTXNxR3BEQXFRT3I1UkJR?=
 =?utf-8?B?OVNITDhFd3pVa0JmYWJVNnJGVTlQaXRJSGZ2dE9JdTFNMWJoVy80R2hleFAz?=
 =?utf-8?B?TTlGVktGQmNlY1poeDA0N0p2cWEwUzVJL01mWkZKbHBadlBaQlU4SXZVNzhs?=
 =?utf-8?B?cjZZTDVHblZ5UnNQaVBWRkRQNC9USHpVZnRMNlpRZ3J6by9vNkRvODRkb2xD?=
 =?utf-8?B?TUVrMW0zSytXYXN6Wkh4T2xqdGEvM3hzVUR3T3ZxaFE2ajFPeUJoMFJWakVj?=
 =?utf-8?B?VnhjMEZqMnlSeWZqVjZ0ZEVMTmJPUERVUHBQNGRlYjZLOC9OY1JGK0Zla2tT?=
 =?utf-8?B?TFB1RW5UeUh1NVVZai9ic2E0S2VwbUduN0orRWZoOHhsTzFRdzhXREorQjhu?=
 =?utf-8?B?aDlOcGx6b0dGSjFCZnljcFRjamZBYlFSZGh1NlFVT2ZRLzhSdEFtWjJDWTQv?=
 =?utf-8?B?S1lHbUtpRkszSERhWlhMb05hcFJUSTN0Vkk5ajQ2d01kUXplSnY2M0R0Smlh?=
 =?utf-8?B?ZE13bjhVdjB0anBHZ3RrQTVFbVdwcExUMnJNa3g2Sm0wREsxMGF5S1U5SlM5?=
 =?utf-8?B?RDQvMG1qV01ndVgwTFR2a1htbUlZUytvSVBOZFcvaUluTi9Uallob2lKOGZn?=
 =?utf-8?B?UDZSRTJlenQvNFl1Nmo1ZG9GRmtHSndjS21oejJvRjFNc0dhY1E0VEFuMllx?=
 =?utf-8?B?NU1tSUhCbGtSVE4xcXp5ZE5QZ1VHenV5Z1kzNlJiZlJaQldZdHJiSFZxSVQr?=
 =?utf-8?B?Zm9PeUdoMlZQM28rVURxbThZUzRxMU93VDZEMHIzZ1F1eE12Zkh0cVNaUGFN?=
 =?utf-8?B?Y1poS1RDSGZmalE1SkZEeUI4Y3RQK0YyVXY1a0NCZG5WVE16WTE1K0g1Vmov?=
 =?utf-8?B?RXBkeGUrbHUrUUtSZTZReFBKYUVSN1dCWVJDVG5pR3FqYWkvaVd5Sm1vVWZr?=
 =?utf-8?B?dUFCK25oM2IvNGsreWhPd3ZEbVUrQ3lTT0MyRFFENm1aRUVsS2M5cjJVQ1Vs?=
 =?utf-8?B?UnF0cVFaazN3NlIvOXE3eWpYU1grSXlKYlJNTzhKdE43VktLeCtHN3RZSHJB?=
 =?utf-8?B?b2c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 422db91c-3acb-4ce1-f6aa-08da901059be
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5373.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 14:01:52.7002
 (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: Wl6KVK08Ph4uwT352Ob+KiaJs33PlK1GCFeqklP0oV03MWwPcZ6xlk946uPqY3NyYVtSixh7dEk3hKvncyJ/oFZ7gVczuu2VtcF8QuZQgCs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR11MB2804
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
        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 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 8214a0b1ab7f..9432b1619602 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -122,6 +122,12 @@ 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.
+	 */
 	idr_preload(GFP_KERNEL);
 	spin_lock_irqsave(&drm_minor_lock, flags);
 	r = idr_alloc(&drm_minors_idr,
@@ -129,6 +135,8 @@ static int drm_minor_alloc(struct drm_device *dev, unsigned int type)
 		      64 * type,
 		      64 * (type + 1),
 		      GFP_NOWAIT);
+	if (r == -ENOSPC)
+		r = idr_alloc(&drm_minors_idr, NULL, 192, 1 << MINORBITS, GFP_NOWAIT);
 	spin_unlock_irqrestore(&drm_minor_lock, flags);
 	idr_preload_end();
 
-- 
2.37.3