Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 73C4CC8303C for ; Tue, 8 Jul 2025 19:38:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4147A10E1C3; Tue, 8 Jul 2025 19:38:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="UGgMjdpI"; dkim-atps=neutral Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2050.outbound.protection.outlook.com [40.107.220.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAB8D10E1C3 for ; Tue, 8 Jul 2025 19:38:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q2O19KgH6PJyXOk9obhSOHhZ61ef6FTxk1fqEDLcaJnJjgYGcDXwyp9KVOpdbi1unRqkyhCStRFF/TU1b0eg4svlVeoljAoQbTLkvpFxcOupsZGre4rXmSze/bJiMtgOKoahkxLema5+jbgBlqMz7+6Uh0f5fhEKBrGjcJc4t3KIlMfdvo8vQSP2OJK89x6Td63t+NwAoTaHlOwMjCMo6wkKTY9mld8mnLg69edqa7nmlDKPJwNHZZon4Of9FBY9cuLRmIBy9vfZzb1oam8o3dmD+f1p+AbL3D2y8tXRlIvF9ZCMSlKKCUB2HJYN7FvwZe4wwyPKjFwKbgzK00bYWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=K32S9FzQH6ObzL2nsxidaTk5NGN9O08gpvzzM1Dyrds=; b=U8SG7QjM+yzS4TtyH+gSB5+NMv+S9havbvo6nwqDwUleVTfoFDgljPgNk01b2rJTQ4Kfje5LV2K3cgUnhrmCSTsINKDHwoyAHsiaCKSbb3FDudfGfGBncIqSwpa4llqriADfU7Ad90ALulLyKP3we0edsF1PsDJF0eA1ERShvCb7XN71G3rYs9nIbKWp6WG+R9E3h2NLEKZVOKhyefh5gRGvKmIrzWqx/7ydvNtKX2Oya9psPXJgr7n7aYP+2gnSUswTEWeFNwgQlYDY+eWHxJv//8ri2WmiPVTX+AW/peyy9zpwqCWveKVUKFoE1avo5sVGH34+79x43mW/fZMS3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.freedesktop.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K32S9FzQH6ObzL2nsxidaTk5NGN9O08gpvzzM1Dyrds=; b=UGgMjdpIHCu3G/DUD7XDH8NBGL5XKSyiNJZ6tv+l/fbLzVgT21vgf1dVhr0W4ECy1kNCuuPZxkctNco4RE68rVkNfUyHvWGwN1iTaZJApQ/vm07Rd34a+t7xHeIy6e03Zfs97slc3Zq4vwXZ6QZ3ZOQz7KPLM7HASwKX7vL4qo8= Received: from SN7P222CA0001.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::28) by CY3PR12MB9554.namprd12.prod.outlook.com (2603:10b6:930:109::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Tue, 8 Jul 2025 19:38:35 +0000 Received: from SN1PEPF00036F43.namprd05.prod.outlook.com (2603:10b6:806:124:cafe::a1) by SN7P222CA0001.outlook.office365.com (2603:10b6:806:124::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Tue, 8 Jul 2025 19:38:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SN1PEPF00036F43.mail.protection.outlook.com (10.167.248.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Tue, 8 Jul 2025 19:38:34 +0000 Received: from fdavid-dev.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 8 Jul 2025 14:38:33 -0500 From: David Francis To: CC: , , , , , , , , , , David Francis Subject: [PATCH] drm: Add DRM prime interface to reassign GEM handle Date: Tue, 8 Jul 2025 15:38:09 -0400 Message-ID: <20250708193809.403141-2-David.Francis@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250708193809.403141-1-David.Francis@amd.com> References: <20250708193809.403141-1-David.Francis@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00036F43:EE_|CY3PR12MB9554:EE_ X-MS-Office365-Filtering-Correlation-Id: 3abebd71-e3de-475c-2cff-08ddbe570737 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Co/le4Qa41gx5siybTC37ZpztoPbey/mNWfCay/90HKGTGqw6Ntbqdd4sUg0?= =?us-ascii?Q?V3z6irUToae9yWg37y1bqN2R3jcsagvylaUNiIwYf3ozYRTBNO9+PwsMWINJ?= =?us-ascii?Q?1txJvzyvuLjEqidVdBDbFMz9YBOXGL/JrbA36KYVaJd6xoa6aHhiydrRXxCG?= =?us-ascii?Q?cwuxe2gYeT+1ZwNamZHcxneuhQthcvDrd1jh9sBcn3lNTjDjntT3UCb43zxd?= =?us-ascii?Q?BU7CqJy+zfC2bEFXnziJmqQPKjpQ/aDplKmd9xWa3OL1qK8cL3V/3XG114lH?= =?us-ascii?Q?MEqKYHycWtWUl/+6EeisrA05o5hqfFsboy8hY20XdZT1YjbVmcc7x11uu4f1?= =?us-ascii?Q?WjoT0oaEVHzX+giw+JKQQrn8VHOwlwcSFoFrZCsyPRxxeEGHISshQdovJavm?= =?us-ascii?Q?k5bwM77rU7Ap71Y5Mlryi42e9zpvC1xcbYntIaGVGX9k2JECVJmGIPnW724y?= =?us-ascii?Q?LOP1fhOE11mTG110U2IKNA4kMfdrLLvgXQebi2vWmXSssi+D8+4JBrCj6tCc?= =?us-ascii?Q?WgcdBEt+dG6TtAHeVE4c6jvycXz441mMThBpNZiwNPr0myKynZQocj3RC5GM?= =?us-ascii?Q?j2KFulXCYELbqcFOKERYHzxd0PzmX9kNf/H/HZT24I+6Mly2MrmRinfDAEHk?= =?us-ascii?Q?6z1kEkpq+C4psZnCe2zqlngPiieShsZAWriaX+i8Fdq2Oc3X92c1E7UO/Nae?= =?us-ascii?Q?KKW5o4apf06bRhJHQ6qZkUTpwbzOLUcWbskO/sI5EcXLGfLp2QiHDpC/Yml2?= =?us-ascii?Q?M+Cx3KSnSCDoeoAfXzYs+SCg2ihGl1KwXIxnz8ur19So/GtgB3I9OcgPZuaE?= =?us-ascii?Q?+1l3lwD34kvXw/oP4LeTOD/cyBJe5/KoUsI8oCw5NTH20jeKK0dyawis5quL?= =?us-ascii?Q?3NvbQH2diJffrabc7jN958eQ1s4gyiRaxjPadDEsWfMzgueHwwfx3oAByQTs?= =?us-ascii?Q?fGqJ3m767nyAFqeBHlua8qkTlcxL6NIJKrSf7r0G6o/3Nj3ug76UvmsiMPyB?= =?us-ascii?Q?OkbDQdH1PEP2Ih5utjiAhXuRVFAwBxQDTYQ/cdCszlbvNdB0YcG/zFdZWXVY?= =?us-ascii?Q?KmzXQUnS6U1o7L4fSvdUWNJol7xE44eyODiCRnzukErFG1sf3WXcea/qSumi?= =?us-ascii?Q?NFAuClvAC8DD+3O8CUcxqBDz2nRcp8/UfVplFr+HOKTxH4hBE5CY8Mw9rEPS?= =?us-ascii?Q?yzwqbSIAyH6p7dKsj5kRP44W3ihiGeTtuTjD+s6rRLy36xNiPRJbn1H3sG3J?= =?us-ascii?Q?7HpA4kS8IEap/jZrs6hhtMQAvBKSDJG48KVuy/J9+oeJocjTQ9U7WhitiCko?= =?us-ascii?Q?Nz4lpjggYqnmmk43JgA8Uet4eLIG6qUXDVv0i/wNqr5pIYqMc/+Iwc9BKDY4?= =?us-ascii?Q?5we6Wwd6uzyLf8FE6yB5whZmo2whPYM7jdHEatVRKs1rEjYrd2DSJ7YZznjt?= =?us-ascii?Q?I4LrQvKHNaAVX6TTg6BURnwruHILBfO7G29KnqlG0dNeCxnv6ruZ+ABpaoLT?= =?us-ascii?Q?IzNcb9ewAhod4QiunRIA3lQIsIHZNfcbWFnv?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2025 19:38:34.8317 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3abebd71-e3de-475c-2cff-08ddbe570737 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00036F43.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY3PR12MB9554 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" CRIU restore of drm buffer objects requires the ability to create or import a buffer object with a specific gem handle. Add new drm ioctl DRM_IOCTL_GEM_CHANGE_HANDLE, which takes the gem handle of an object and moves that object to a specified new gem handle. This ioctl needs to call drm_prime_remove_buf_handle, but that function acquires the prime lock, which the ioctl needs to hold for other purposes. Make drm_prime_remove_buf_handle not acquire the prime lock, and change its other caller to reflect this. Signed-off-by: David Francis --- drivers/gpu/drm/drm_gem.c | 61 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_internal.h | 4 +++ drivers/gpu/drm/drm_ioctl.c | 1 + drivers/gpu/drm/drm_prime.c | 6 +--- include/uapi/drm/drm.h | 17 ++++++++++ 5 files changed, 84 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index c6240bab3fa5..693ef636fb3e 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -282,7 +282,12 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) if (obj->funcs->close) obj->funcs->close(obj, file_priv); + mutex_lock(&file_priv->prime.lock); + drm_prime_remove_buf_handle(&file_priv->prime, id); + + mutex_unlock(&file_priv->prime.lock); + drm_vma_node_revoke(&obj->vma_node, file_priv); drm_gem_object_handle_put_unlocked(obj); @@ -888,6 +893,62 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data, return ret; } +/** + * drm_gem_change_handle_ioctl - implementation of the GEM_CHANGE_HANDLE ioctl + * @dev: drm_device + * @data: ioctl data + * @file_priv: drm file-private structure + * + * Change the handle of a GEM object to the specified one. + * The new handle must be unused. On success the old handle is closed + * and all further IOCTL should refer to the new handle only. + * Calls to DRM_IOCTL_PRIME_FD_TO_HANDLE will return the new handle. + */ +int drm_gem_change_handle_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_gem_change_handle *args = data; + struct drm_gem_object *obj; + int ret; + + obj = drm_gem_object_lookup(file_priv, args->handle); + if (!obj) + return -ENOENT; + + if (args->handle == args->new_handle) + return 0; + + mutex_lock(&file_priv->prime.lock); + + spin_lock(&file_priv->table_lock); + ret = idr_alloc(&file_priv->object_idr, obj, args->new_handle, args->new_handle + 1, GFP_NOWAIT); + spin_unlock(&file_priv->table_lock); + + if (ret < 0) + goto out_unlock; + + if (obj->dma_buf) { + ret = drm_prime_add_buf_handle(&file_priv->prime, obj->dma_buf, args->new_handle); + if (ret < 0) { + spin_lock(&file_priv->table_lock); + idr_remove(&file_priv->object_idr, args->new_handle); + spin_unlock(&file_priv->table_lock); + goto out_unlock; + } + + drm_prime_remove_buf_handle(&file_priv->prime, args->handle); + } + + spin_lock(&file_priv->table_lock); + idr_remove(&file_priv->object_idr, args->handle); + spin_unlock(&file_priv->table_lock); + +out_unlock: + mutex_unlock(&file_priv->prime.lock); + + return ret; +} + /** * drm_gem_open_ioctl - implementation of the GEM_OPEN ioctl * @dev: drm_device diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index b2b6a8e49dda..e9d5cdf7e033 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -85,6 +85,8 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv); void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); +int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv, + struct dma_buf *dma_buf, uint32_t handle); void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, uint32_t handle); @@ -168,6 +170,8 @@ int drm_gem_close_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); int drm_gem_flink_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); +int drm_gem_change_handle_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv); int drm_gem_open_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); void drm_gem_open(struct drm_device *dev, struct drm_file *file_private); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index f593dc569d31..d8a24875a7ba 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -653,6 +653,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH), DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH), + DRM_IOCTL_DEF(DRM_IOCTL_GEM_CHANGE_HANDLE, drm_gem_change_handle_ioctl, DRM_RENDER_ALLOW), DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, 0), diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index bdb51c8f262e..1f2e858e5000 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -93,7 +93,7 @@ struct drm_prime_member { struct rb_node handle_rb; }; -static int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv, +int drm_prime_add_buf_handle(struct drm_prime_file_private *prime_fpriv, struct dma_buf *dma_buf, uint32_t handle) { struct drm_prime_member *member; @@ -190,8 +190,6 @@ void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, { struct rb_node *rb; - mutex_lock(&prime_fpriv->lock); - rb = prime_fpriv->handles.rb_node; while (rb) { struct drm_prime_member *member; @@ -210,8 +208,6 @@ void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, rb = rb->rb_left; } } - - mutex_unlock(&prime_fpriv->lock); } void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 7fba37b94401..84c819c171d2 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -625,6 +625,15 @@ struct drm_gem_open { __u64 size; }; +/* DRM_IOCTL_GEM_CHANGE_HANDLE ioctl argument type */ +struct drm_gem_change_handle { + /** Current handle of object */ + __u32 handle; + + /** Handle to change that object to */ + __u32 new_handle; +}; + /** * DRM_CAP_DUMB_BUFFER * @@ -1305,6 +1314,14 @@ extern "C" { */ #define DRM_IOCTL_SET_CLIENT_NAME DRM_IOWR(0xD1, struct drm_set_client_name) +/** + * DRM_IOCTL_GEM_CHANGE_HANDLE - Move an object to a different handle + * + * Some applications (notably CRIU) need objects to have specific gem handles. + * This ioctl changes the object at one gem handle to use a new gem handle. + */ +#define DRM_IOCTL_GEM_CHANGE_HANDLE DRM_IOWR(0xD2, struct drm_gem_change_handle) + /* * Device specific ioctls should only be in their respective headers * The device specific ioctl range is from 0x40 to 0x9f. -- 2.34.1