From mboxrd@z Thu Jan 1 00:00:00 1970 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 6CCBCC25B77 for ; Wed, 22 May 2024 05:52:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01C0F10E378; Wed, 22 May 2024 05:52:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="OaEcyBmY"; dkim-atps=neutral Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2082.outbound.protection.outlook.com [40.107.93.82]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7065410E378; Wed, 22 May 2024 05:52:28 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KEE7GvnsBt+ZDwo05C80y7PH/YHkxe9TDzcnhxaDv6c8ddPxQHLtMmVsjk8utaxgODO6wkkiIfJ+Yw/9Q0DwV37w+fyCBGecUzpm4r/PFD45uRiNZdYCJsmCoEbcKBR0NOO7wtvxRJn6Lm/IIv0ItlFC35yJvYsXtuNv8DuSDu1+PummKynFGhqJuANhhXVB9i3IGvJ7JgmPmsal5916Vy14t4SSu6MzA0ufI6u9nbvDISmRllTREAQtlMTikZgmfwvCK1T/ES/BX7EsVSATU2ZF0fOzt0pApIHEI2YyzRhH4PvbOkxmqIJAM8aGMC6JEl5Xk+zLsJee2Zuc12sV6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JM8G1meSpNT+ZkQp89a5KiLnBlYgtOzkVoiG4yKXWQ4=; b=TN/SexlDo0eMKVyJJvhQegwBQY1+Ln242TWpIIfLcDCaRztfW95I57fNgTkW3Gyx6kRfXopVgAz+3LqzdumrUznLvpMl3P3zs+SdyVoEjN/W/YxP0fj409rSoS9PdQ6JAcEcdf/RWrs0OslV7AZ+f28bopyQ9iyN7f2ej15N/HeRug5P9cFVrycTL/bdZZ+CXkd777cL0dgtGb+Q7QRLTOmoJfafsngjEXLgFhs/R5AXQEp4oqwLsHArs49P/n2Pcw9VVWVd8cXYAxI48CG2NpDZ6AeXQZBKtl2c8DmuiRKrGEuWkcr4zx/aWNTEupypmYl/FKtRXfYn6aVQUae++Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none 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=JM8G1meSpNT+ZkQp89a5KiLnBlYgtOzkVoiG4yKXWQ4=; b=OaEcyBmYo9zDugzY1ECQJ8JjWQvLWM8ry7Hc2mIgntOC7oy2ur33XXh2eelC5mCkpRyo90Roe8o+VgQf8YIyg+6bda6pFLkTU5DxAO8dAOpLh0Tj/sAkRSCCbXA7YSv+ZpXzxrT8RW2dV4R8wnKnTTTY8CnR/ZiqGp4ecrv1L3E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from SJ0PR12MB5673.namprd12.prod.outlook.com (2603:10b6:a03:42b::13) by DS0PR12MB7583.namprd12.prod.outlook.com (2603:10b6:8:13f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.19; Wed, 22 May 2024 05:52:22 +0000 Received: from SJ0PR12MB5673.namprd12.prod.outlook.com ([fe80::f7eb:b717:d637:dcf7]) by SJ0PR12MB5673.namprd12.prod.outlook.com ([fe80::f7eb:b717:d637:dcf7%6]) with mapi id 15.20.7587.035; Wed, 22 May 2024 05:52:22 +0000 Message-ID: Date: Wed, 22 May 2024 07:52:16 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH v3 13/21] drm/exec: Rework contended locking To: =?UTF-8?Q?Thomas_Hellstr=C3=B6m?= , intel-xe@lists.freedesktop.org Cc: Somalapuram Amaranath , Matthew Brost , dri-devel@lists.freedesktop.org References: <20240521071639.77614-1-thomas.hellstrom@linux.intel.com> <20240521071639.77614-14-thomas.hellstrom@linux.intel.com> Content-Language: en-US From: =?UTF-8?Q?Christian_K=C3=B6nig?= In-Reply-To: <20240521071639.77614-14-thomas.hellstrom@linux.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR0P281CA0090.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::15) To PH7PR12MB5685.namprd12.prod.outlook.com (2603:10b6:510:13c::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR12MB5673:EE_|DS0PR12MB7583:EE_ X-MS-Office365-Filtering-Correlation-Id: 82ec8481-27ea-4cb5-eb3f-08dc7a2358db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|366007|1800799015|376005; X-Microsoft-Antispam-Message-Info: =?utf-8?B?U01FQ0VCYlJ3M3htc05INngreFE4THBzTnpqb2kxT1p3S3dOQWpTTE4xYkdz?= =?utf-8?B?M0RIdVgwZ0RwNG10TTc4ZG9iNTFUMkFnSGZBdlNyOTBodnByUFRla2padVhx?= =?utf-8?B?N2hYclBGOUlCOWFSUng3UUVJQ0YxZW8yTU1aeVlSdlo5VktPWnFWMW52dlZL?= =?utf-8?B?cVVieDJrbWRtZDhMWkgrcWQ3WFl5ampZbWV6VFdBMFNoUHExcXBvekpNR3ZU?= =?utf-8?B?Q1BZemo2bFNYandHMzFiRDEyQ1hYaXlmQ3JjQjVudzlHZGw5MVpVVEVHdDNC?= =?utf-8?B?VnYyR1M4cGRIdnRVckZsUEMra1NGYlJrWVh2T0tsek10ZnFHVDliV0ZlVU45?= =?utf-8?B?V2VtSEc1Y213YTFERFV5QW1qdklRMnBWbWJYYWkvSzI2M2tIcEEreWs4RUVq?= =?utf-8?B?bGZ0ekxGM0JEQ2NhR3c0akZWY0dKRU4vdXExQTZWcnlXcWw0aHVDNUpzZDVv?= =?utf-8?B?WkVSWnIrQWN6TlNvZG9sdE5uYU45aUlsc2ljdm1CUXBNSk1IOHB0b3NXQmtw?= =?utf-8?B?dlNMY1NPemJFNkw3R2VSTDY2NDJaVVdlUGdLQ2pJcVdRUHp0VjA3RlZoSmZ2?= =?utf-8?B?NXIyVExUSU9YaFFNMXFLdkJGR1ZpajVxaGhmZndQN0ZYSjlIYmlaSTRzeTEr?= =?utf-8?B?T2dwcWN5M2JPSTl3UzdRMS96Q2M5V056T05uK3Z2Z2o0WlZacXJVT0pTT09a?= =?utf-8?B?OVhaU29qV2ZyVGZtL0o4dElJVm9jc3VoOHVWMXVPQ0ZTbzh4TU1aYUNpNXAr?= =?utf-8?B?ZEpoZ1g2QkZ6SlFvWmZxcjlnVnpUWVVBZzNUbTNqR0NiNXhoNzZtc21pK1Mz?= =?utf-8?B?MkZBUUwvT0x6RndncWZQbDhTOFRHK1JoUWVKd2xkVjFpTitRREoraFhJU1VR?= =?utf-8?B?N3N6eGxHc3p2UHAzak1zV0ZoQUsrY1RUN0JIWGJ3ZStZaXBqZmswMFlQR3pv?= =?utf-8?B?YmpoWkk4OHJHcWEzMjQzUlBBK21qU0pLeGlnNFNTajNTMzFQdHFuNHRWZExw?= =?utf-8?B?TUt5cXdza1h6aXZrdmwxMVhkUHdNbGZpNDgwZVNiYVYyS2xlcUdYZml4SFk5?= =?utf-8?B?eTBKSUc1alBybVArMXdaaE5DQ0NNNzNKelk5cFZQNHhBYVNOTTVTOG8zMlR5?= =?utf-8?B?Q1pVdk02L2pXSnJ3Q3FWMzhJWWR5eGlLUGJOaFNIUkUzWGppQm1FYS9yZVh3?= =?utf-8?B?b3NIWFdxbnYrYnRMNzFseTRhUXF3V3EySGNTcGsrS0E4dVNlTVV4QlpjNUlp?= =?utf-8?B?YllQdi9ZSEpPdnF3dk5QZTRFMVd4TWlWRXo0TjFHRFE5UXZFUTRxZ0NWa0hn?= =?utf-8?B?ZVRubXo1NkZ0VHZLcHpBNk91VE9oNnJGc1ZXT1BvSHRYOUlJYk9zM1hQVVR6?= =?utf-8?B?b2NlRnd1OEEwTXFudUF3aG5WSmZjbTNmU2o3aDQ5dXdWYUlOclpXRTVkaVdu?= =?utf-8?B?Q015cnlTcWIxTmJSTDF3a0p4aXA2NTZad3ZTdEtWM2FwbVZXblQvRTlCVzZh?= =?utf-8?B?Vkg5N2t2Y2pqMXZCc0w4Q3pkRUt2OEtudGVMS2VzdWJsclAzUFdtWWZhamxL?= =?utf-8?B?a0V2WW5sZWVPTFlDbFRpcTQ2L1JSTFZET1dodHlyeFpCdHNidjR0WkxJK0lp?= =?utf-8?B?WUxaOXRLSDFrNkN6eVc4ZkVrMWJqdElLZjdHRzNsK0M0RUY4R1NXMVlyN3NR?= =?utf-8?B?V2twWDlTM3JBcEZkNE5WTUhmUVJYM2g1NTRyaFNnZTNPY1NqNnE3VVRnPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR12MB5673.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(376005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZldmbkdkYjVUbHBGd1hVU0g5NFBhdkxYZmYrUEZrLzc1L3RKM1dRb0oyK0tV?= =?utf-8?B?ZTZLUy9Kc00wcUkxVmlVR2tMWVNRYis4OW1GMkNKYUVIQUUyQytObXJqMHM5?= =?utf-8?B?OUlYQnVxaDB5YXBybHo3REVyRnNOU2FNMlZ5YzlPWE5JdWp4c1N0b3dDMG9W?= =?utf-8?B?OEpmbmNRQ1VFaXJ3eDdoK1AxNzJyVjVTaEZ4SmpaU2tKclJmYkJBdFNXN1Nn?= =?utf-8?B?bUFIay9Lc2QrSnA3SzJqdSt6d3dwd0tZVDRjRzIxcGR3L0hjQnFCdThsQ2tu?= =?utf-8?B?S2lyUTVJYlBrcGFrWWxmN2tSZHQ3eUhlZzlFajR0NHFwTjcvZzd4dGEybUo2?= =?utf-8?B?bWlCVnpXb1h6dFEwc2FWNklrUWozay81clRGT1FkZ1pqMC95dHl0bkZtTk13?= =?utf-8?B?ekJ1aWxXV3E5MVFQbndPYWVqQjY2TlozOVI3NFMwYU5jMUZ4ejFXR2FVUy9K?= =?utf-8?B?U0krUHkzNTBsU21yODFCdkV6K0J6QmpTSFAzQ1loSzUweS9seTlrd1dTcFEr?= =?utf-8?B?ejJGYUdTc0hmcjdTaGtVOFpRT0NuSUM1NHhaVDB3RjlMbUMzNEV0ZGJqMHJR?= =?utf-8?B?UlFkRVlHMXRrZ2dRNmpscVVPS2NrM2FwT25EMnZ4My9LazZGTnViU1hIS0Jz?= =?utf-8?B?NGVrZlY5MjdPL1pJZGRtdmswVkJGczlJdS9BYXRRQUlIcHZPUm5IeHR0TzFG?= =?utf-8?B?enZKbEYwY1hGTHhzaHFZY2F1Q1lwWWZzN0pwUUZ1dHZzc1MzMFI0Q0xsS09X?= =?utf-8?B?YXFFekNvWlBnaWkzTjNWRTkzSDlUZHd3eDh1RGFtWnlpTEJ1UDBLQU0zQjM3?= =?utf-8?B?cHNzaC9YQ2xoYlJYMzFPKzZXMUh4UEg1aEJlUk8zRnJzb0FTNnlQdStiK2Mr?= =?utf-8?B?c3oyS1B4czQ3WWhnalpUTUkyWE5GMmUrKzBlSG9JYXF0T2Z1cmRmc3JSVXNV?= =?utf-8?B?YVV1YlFuZXp0d2NNdHcyTFVNSHhkQVFTUmY2Ti9Selo1OXIxTHVqbDRqQ3B2?= =?utf-8?B?TGJidFk0Ny9TNGprZzU1YTVBbVJQajUrNGhrSnJzZW05MDJhZDFweEE4QmFR?= =?utf-8?B?cHBlZExyUHl2bEp6dGZHdDlueDRBWEFSaldxclRRMzVqcUpUK0pPbUx4Wkww?= =?utf-8?B?dUJHVUYxa2VWZHV1UUJYNFBxQjdwdnY0MVIvaVcya0hmQlZEdEZUK0VhNDR1?= =?utf-8?B?cUlkbS9DN0NIajVFNHJTcnp5NVU1Rk5Sd0ltcDhUaWlaZnhnc1ordUhmWmNq?= =?utf-8?B?WnhKUWQ4bWN6SXFSK1c4OVhGd1FrdFh0OThWMWxZQjBOV21MQmhObTMyV25i?= =?utf-8?B?KzEwSDZEUTF0WUlsOHd4VjZXdlhsR1l3UUloYnJFQVZVemdENmV0ZTJXM3Jj?= =?utf-8?B?RGEvZkhrSmJ6TDYwcWVRVU52ck4za0Q5VVZ1TU9BMXhDUUZHVEU1aDZNYVQ4?= =?utf-8?B?STAyejFyejFvVnpqTlFyQXptL3hFUEt5YVJPWDdKTjJOczdCOWJwOVN2ZEUr?= =?utf-8?B?dVFGNUJ2WFFCQVVEKzU1VmFaRHlCY3FhYjRMRUhRdXpEZmlVQlhMTmUvTHhL?= =?utf-8?B?RGJMbUVmWk12L1dYNlhhWU1pRWc3V3JNVmJCc3pEdzZWRjhWR3VOb1ZqbjJl?= =?utf-8?B?SmlqVk0wZy92U3VXZktKRVRRazZMUlFRVi82TjFXM2tVVG5qVXNaRlAzMXIw?= =?utf-8?B?Q2FyQ1dqSW1odkVRZVFsRHRHT3pmaFVhUkxKOFZ1YnVreUJTRGFQZGZSc3A1?= =?utf-8?B?ZnE0QlFsTEozaHcvc1E4czJwNmJaK1B1ZlNSZlN1TzYxMHpEVWxhdDBDUm94?= =?utf-8?B?dHNPWGZHZVlWa1o3RHYwS01qWXRWNi9oblZxOHV5VUZnd2I2VFdneXhkUmN4?= =?utf-8?B?ZWI5RTJIWTN1Q3NXTWFqVnAwWlNVa1gxVW05U000Si9maUdiZG9raHMwdUVq?= =?utf-8?B?Q3hrR29zY0JZaU1mUVlQZ203U1Y0L0FYbmI2NmsySUhIdDJ0UnRzRTFuSFhC?= =?utf-8?B?OXdoVFk0d1R6d203MHhERzRJRUs5eE00a3Npbk1naVR4RlJJY2R6cVVTQzRk?= =?utf-8?B?OWM1clVBYUtibjc1bWlEdjFQRWl3YWZuVmZTZFFZdU9qV0JncFdHLzhQTGhv?= =?utf-8?Q?8Ia4Q6KbgRTRkVvWqk0dKJZ3V?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82ec8481-27ea-4cb5-eb3f-08dc7a2358db X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB5685.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 05:52:22.7349 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Uffwc/FpRk1CZmzg9VkBCuLPa1J3nHgAtAz92j+jFrF9C/3pDtGitumXDofdhkKh X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7583 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Am 21.05.24 um 09:16 schrieb Thomas Hellström: > If contention and backoff occurs during a drm_exec ww transaction, > the contended lock is not locked again until the next orinary > attempt to lock a dma_resv lock. However, with the introduction of > drm_exec_trylock(), that doesn't work, since the locking of the > contended lock needs to be a sleeping lock. Neither can we ignore > locking the contended lock during a trylock since that would violate > at least the ww_mutex annotations. > > So resolve this by actually locking the contended lock during > drm_exec_retry_on_contention(). However, this introduces a new point > of failure since locking the contended lock may return -EINTR. > > Hence drm_exec_retry_on_contention() must take an error parameter and > also return a value indicating success. After thinking more about that I have to pretty clearly NAK this. It's an intentional design decision to guarantee that at the start of the loop no object is locked. This is because Sima and I wanted to integrate userptr handling into drm_exec as well in the long term. I think we should just document that drm_exec_trylock() can't be used to lock the first BO in the loop and explicitly WARN if that's the case. Regards, Christian. > > Cc: Christian König > Cc: Somalapuram Amaranath > Cc: Matthew Brost > Cc: > Signed-off-by: Thomas Hellström > --- > .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 ++++----- > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++--- > drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 8 ++--- > drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 4 +-- > drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 8 ++--- > drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 2 +- > drivers/gpu/drm/drm_exec.c | 35 ++++++++++++++----- > drivers/gpu/drm/drm_gpuvm.c | 8 ++--- > drivers/gpu/drm/imagination/pvr_job.c | 2 +- > drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- > drivers/gpu/drm/tests/drm_exec_test.c | 12 +++---- > drivers/gpu/drm/xe/xe_gt_pagefault.c | 4 +-- > drivers/gpu/drm/xe/xe_vm.c | 10 +++--- > include/drm/drm_exec.h | 23 +++++++++--- > 17 files changed, 92 insertions(+), 62 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > index e4d4e55c08ad..4a08a692aa1f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c > @@ -1152,12 +1152,12 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, > drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); > drm_exec_until_all_locked(&ctx->exec) { > ret = amdgpu_vm_lock_pd(vm, &ctx->exec, 2); > - drm_exec_retry_on_contention(&ctx->exec); > + ret = drm_exec_retry_on_contention(&ctx->exec, ret); > if (unlikely(ret)) > goto error; > > ret = drm_exec_prepare_obj(&ctx->exec, &bo->tbo.base, 1); > - drm_exec_retry_on_contention(&ctx->exec); > + ret = drm_exec_retry_on_contention(&ctx->exec, ret); > if (unlikely(ret)) > goto error; > } > @@ -1199,14 +1199,14 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, > > ret = amdgpu_vm_lock_pd(entry->bo_va->base.vm, > &ctx->exec, 2); > - drm_exec_retry_on_contention(&ctx->exec); > + ret = drm_exec_retry_on_contention(&ctx->exec, ret); > if (unlikely(ret)) > goto error; > ++ctx->n_vms; > } > > ret = drm_exec_prepare_obj(&ctx->exec, &bo->tbo.base, 1); > - drm_exec_retry_on_contention(&ctx->exec); > + ret = drm_exec_retry_on_contention(&ctx->exec, ret); > if (unlikely(ret)) > goto error; > } > @@ -2619,7 +2619,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) > list_for_each_entry(peer_vm, &process_info->vm_list_head, > vm_list_node) { > ret = amdgpu_vm_lock_pd(peer_vm, &exec, 2); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (unlikely(ret)) > goto unreserve_out; > } > @@ -2631,7 +2631,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) > > gobj = &mem->bo->tbo.base; > ret = drm_exec_prepare_obj(&exec, gobj, 1); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (unlikely(ret)) > goto unreserve_out; > } > @@ -2875,7 +2875,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu * > list_for_each_entry(peer_vm, &process_info->vm_list_head, > vm_list_node) { > ret = amdgpu_vm_lock_pd(peer_vm, &exec, 2); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (unlikely(ret)) { > pr_err("Locking VM PD failed, ret: %d\n", ret); > goto ttm_reserve_fail; > @@ -2891,7 +2891,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence __rcu * > > gobj = &mem->bo->tbo.base; > ret = drm_exec_prepare_obj(&exec, gobj, 1); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (unlikely(ret)) { > pr_err("drm_exec_prepare_obj failed, ret: %d\n", ret); > goto ttm_reserve_fail; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > index ec888fc6ead8..299e46a6d934 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@ -897,7 +897,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, > > drm_exec_until_all_locked(&p->exec) { > r = amdgpu_vm_lock_pd(&fpriv->vm, &p->exec, 1 + p->gang_size); > - drm_exec_retry_on_contention(&p->exec); > + r = drm_exec_retry_on_contention(&p->exec, r); > if (unlikely(r)) > goto out_free_user_pages; > > @@ -905,7 +905,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, > /* One fence for TTM and one for each CS job */ > r = drm_exec_prepare_obj(&p->exec, &e->bo->tbo.base, > 1 + p->gang_size); > - drm_exec_retry_on_contention(&p->exec); > + r = drm_exec_retry_on_contention(&p->exec, r); > if (unlikely(r)) > goto out_free_user_pages; > > @@ -915,7 +915,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, > if (p->uf_bo) { > r = drm_exec_prepare_obj(&p->exec, &p->uf_bo->tbo.base, > 1 + p->gang_size); > - drm_exec_retry_on_contention(&p->exec); > + r = drm_exec_retry_on_contention(&p->exec, r); > if (unlikely(r)) > goto out_free_user_pages; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c > index cfdf558b48b6..8b2b86c7a6c5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c > @@ -74,7 +74,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, > r = amdgpu_vm_lock_pd(vm, &exec, 0); > if (likely(!r)) > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) { > DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r); > goto error; > @@ -114,7 +114,7 @@ int amdgpu_unmap_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, > r = amdgpu_vm_lock_pd(vm, &exec, 0); > if (likely(!r)) > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) { > DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r); > goto error; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > index 67c234bcf89f..17e16c971e21 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c > @@ -239,12 +239,12 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, > drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0); > drm_exec_until_all_locked(&exec) { > r = drm_exec_prepare_obj(&exec, &bo->tbo.base, 1); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > > r = amdgpu_vm_lock_pd(vm, &exec, 0); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > } > @@ -776,13 +776,13 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, > drm_exec_until_all_locked(&exec) { > if (gobj) { > r = drm_exec_lock_obj(&exec, gobj); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error; > } > > r = amdgpu_vm_lock_pd(&fpriv->vm, &exec, 2); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c > index 5ca5c47ab54e..1b1a5147606e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c > @@ -1221,12 +1221,12 @@ int amdgpu_mes_ctx_map_meta_data(struct amdgpu_device *adev, > drm_exec_until_all_locked(&exec) { > r = drm_exec_lock_obj(&exec, > &ctx_data->meta_data_obj->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error_fini_exec; > > r = amdgpu_vm_lock_pd(vm, &exec, 0); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error_fini_exec; > } > @@ -1292,12 +1292,12 @@ int amdgpu_mes_ctx_unmap_meta_data(struct amdgpu_device *adev, > drm_exec_until_all_locked(&exec) { > r = drm_exec_lock_obj(&exec, > &ctx_data->meta_data_obj->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > > r = amdgpu_vm_lock_pd(vm, &exec, 0); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c > index e22cb2b5cd92..72b8213e352c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c > @@ -77,7 +77,7 @@ int amdgpu_seq64_map(struct amdgpu_device *adev, struct amdgpu_vm *vm, > r = amdgpu_vm_lock_pd(vm, &exec, 0); > if (likely(!r)) > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error; > } > @@ -138,7 +138,7 @@ void amdgpu_seq64_unmap(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv) > r = amdgpu_vm_lock_pd(vm, &exec, 0); > if (likely(!r)) > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error; > } > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c > index e01c1c8e64c4..63392ce43945 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c > @@ -89,12 +89,12 @@ static int map_ring_data(struct amdgpu_device *adev, struct amdgpu_vm *vm, > drm_exec_init(&exec, 0, 0); > drm_exec_until_all_locked(&exec) { > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error_fini_exec; > > r = amdgpu_vm_lock_pd(vm, &exec, 0); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto error_fini_exec; > } > @@ -152,12 +152,12 @@ static int unmap_ring_data(struct amdgpu_device *adev, struct amdgpu_vm *vm, > drm_exec_init(&exec, 0, 0); > drm_exec_until_all_locked(&exec) { > r = drm_exec_lock_obj(&exec, &bo->tbo.base); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > > r = amdgpu_vm_lock_pd(vm, &exec, 0); > - drm_exec_retry_on_contention(&exec); > + r = drm_exec_retry_on_contention(&exec, r); > if (unlikely(r)) > goto out_unlock; > } > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > index 386875e6eb96..a3aa7fd22f6a 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c > @@ -1499,7 +1499,7 @@ static int svm_range_reserve_bos(struct svm_validate_context *ctx, bool intr) > vm = drm_priv_to_vm(pdd->drm_priv); > > r = amdgpu_vm_lock_pd(vm, &ctx->exec, 2); > - drm_exec_retry_on_contention(&ctx->exec); > + r = drm_exec_retry_on_contention(&ctx->exec, r); > if (unlikely(r)) { > pr_debug("failed %d to reserve bo\n", r); > goto unreserve_out; > diff --git a/drivers/gpu/drm/drm_exec.c b/drivers/gpu/drm/drm_exec.c > index 2da094bdf8a4..3770a5d30213 100644 > --- a/drivers/gpu/drm/drm_exec.c > +++ b/drivers/gpu/drm/drm_exec.c > @@ -28,12 +28,12 @@ > * drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT); > * drm_exec_until_all_locked(&exec) { > * ret = drm_exec_prepare_obj(&exec, boA, 1); > - * drm_exec_retry_on_contention(&exec); > + * ret = drm_exec_retry_on_contention(&exec, ret); > * if (ret) > * goto error; > * > * ret = drm_exec_prepare_obj(&exec, boB, 1); > - * drm_exec_retry_on_contention(&exec); > + * ret = drm_exec_retry_on_contention(&exec, ret); > * if (ret) > * goto error; > * } > @@ -48,7 +48,8 @@ > */ > > /* Dummy value used to initially enter the retry loop */ > -#define DRM_EXEC_DUMMY ((void *)~0) > +#define DRM_EXEC_DUMMY ERR_PTR(-ESTALE) > +#define DRM_EXEC_CONTENDED ERR_PTR(-EDEADLK) > > /* Unlock all objects and drop references */ > static void drm_exec_unlock_all(struct drm_exec *exec) > @@ -131,8 +132,7 @@ bool drm_exec_cleanup(struct drm_exec *exec) > return true; > } > > - drm_exec_unlock_all(exec); > - exec->num_objects = 0; > + exec->contended = NULL; > return true; > } > EXPORT_SYMBOL(drm_exec_cleanup); > @@ -194,6 +194,27 @@ static int drm_exec_lock_contended(struct drm_exec *exec) > return ret; > } > > +/** > + * drm_exec_handle_contended() - Perform cleanup before a ww transaction restart > + * @exec: Pointer to the drm_exec object. > + * > + * Unlocks all held resvs and re-locks the contended object. > + * > + * Return: 0 on success, negative error code on failure. > + */ > +int drm_exec_handle_contended(struct drm_exec *exec) > +{ > + int ret; > + > + drm_exec_unlock_all(exec); > + exec->num_objects = 0; > + ret = drm_exec_lock_contended(exec); > + exec->contended = DRM_EXEC_CONTENDED; > + > + return ret; > +} > +EXPORT_SYMBOL(drm_exec_handle_contended); > + > /** > * drm_exec_lock_obj - lock a GEM object for use > * @exec: the drm_exec object with the state > @@ -209,10 +230,6 @@ int drm_exec_lock_obj(struct drm_exec *exec, struct drm_gem_object *obj) > { > int ret; > > - ret = drm_exec_lock_contended(exec); > - if (unlikely(ret)) > - return ret; > - > if (exec->prelocked == obj) { > drm_gem_object_put(exec->prelocked); > exec->prelocked = NULL; > diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c > index f9eb56f24bef..0923d6ae18e2 100644 > --- a/drivers/gpu/drm/drm_gpuvm.c > +++ b/drivers/gpu/drm/drm_gpuvm.c > @@ -1254,18 +1254,18 @@ drm_gpuvm_exec_lock(struct drm_gpuvm_exec *vm_exec) > > drm_exec_until_all_locked(exec) { > ret = drm_gpuvm_prepare_vm(gpuvm, exec, num_fences); > - drm_exec_retry_on_contention(exec); > + ret = drm_exec_retry_on_contention(exec, ret); > if (ret) > goto err; > > ret = drm_gpuvm_prepare_objects(gpuvm, exec, num_fences); > - drm_exec_retry_on_contention(exec); > + ret = drm_exec_retry_on_contention(exec, ret); > if (ret) > goto err; > > if (vm_exec->extra.fn) { > ret = vm_exec->extra.fn(vm_exec); > - drm_exec_retry_on_contention(exec); > + ret = drm_exec_retry_on_contention(exec, ret); > if (ret) > goto err; > } > @@ -1346,7 +1346,7 @@ drm_gpuvm_exec_lock_range(struct drm_gpuvm_exec *vm_exec, > drm_exec_until_all_locked(exec) { > ret = drm_gpuvm_prepare_range(gpuvm, exec, addr, range, > vm_exec->num_fences); > - drm_exec_retry_on_contention(exec); > + ret = drm_exec_retry_on_contention(exec, ret); > if (ret) > goto err; > } > diff --git a/drivers/gpu/drm/imagination/pvr_job.c b/drivers/gpu/drm/imagination/pvr_job.c > index 78c2f3c6dce0..6e0ce6c4576c 100644 > --- a/drivers/gpu/drm/imagination/pvr_job.c > +++ b/drivers/gpu/drm/imagination/pvr_job.c > @@ -574,7 +574,7 @@ prepare_job_resvs_for_each(struct drm_exec *exec, struct pvr_job_data *job_data, > drm_exec_until_all_locked(exec) { > int err = jobs_lock_all_objs(exec, job_data, job_count); > > - drm_exec_retry_on_contention(exec); > + err = drm_exec_retry_on_contention(exec, err); > if (err) > return err; > } > diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c > index fba78193127d..01992b43ea4b 100644 > --- a/drivers/gpu/drm/msm/msm_gem_submit.c > +++ b/drivers/gpu/drm/msm/msm_gem_submit.c > @@ -259,7 +259,7 @@ static int submit_lock_objects(struct msm_gem_submit *submit) > for (unsigned i = 0; i < submit->nr_bos; i++) { > struct drm_gem_object *obj = submit->bos[i].obj; > ret = drm_exec_prepare_obj(&submit->exec, obj, 1); > - drm_exec_retry_on_contention(&submit->exec); > + ret = drm_exec_retry_on_contention(&submit->exec, ret); > if (ret) > goto error; > } > diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouveau/nouveau_uvmm.c > index ee02cd833c5e..0c871634fdfb 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c > @@ -1350,7 +1350,7 @@ nouveau_uvmm_bind_job_submit(struct nouveau_job *job, > drm_exec_init(exec, vme->flags, 0); > drm_exec_until_all_locked(exec) { > ret = bind_lock_validate(job, exec, vme->num_fences); > - drm_exec_retry_on_contention(exec); > + ret = drm_exec_retry_on_contention(exec, ret); > if (ret) { > op = list_last_op(&bind_job->ops); > goto unwind; > diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c > index 81f928a429ba..28558fdb08df 100644 > --- a/drivers/gpu/drm/tests/drm_exec_test.c > +++ b/drivers/gpu/drm/tests/drm_exec_test.c > @@ -63,7 +63,7 @@ static void test_lock(struct kunit *test) > drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); > drm_exec_until_all_locked(&exec) { > ret = drm_exec_lock_obj(&exec, &gobj); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > @@ -83,14 +83,14 @@ static void test_lock_unlock(struct kunit *test) > drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); > drm_exec_until_all_locked(&exec) { > ret = drm_exec_lock_obj(&exec, &gobj); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > > drm_exec_unlock_obj(&exec, &gobj); > ret = drm_exec_lock_obj(&exec, &gobj); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > @@ -110,13 +110,13 @@ static void test_duplicates(struct kunit *test) > drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0); > drm_exec_until_all_locked(&exec) { > ret = drm_exec_lock_obj(&exec, &gobj); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > > ret = drm_exec_lock_obj(&exec, &gobj); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > @@ -137,7 +137,7 @@ static void test_prepare(struct kunit *test) > drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0); > drm_exec_until_all_locked(&exec) { > ret = drm_exec_prepare_obj(&exec, &gobj, 1); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > KUNIT_EXPECT_EQ(test, ret, 0); > if (ret) > break; > diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c > index 040dd142c49c..20ec1ab1b52d 100644 > --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c > +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c > @@ -200,7 +200,7 @@ static int handle_pagefault(struct xe_gt *gt, struct pagefault *pf) > drm_exec_init(&exec, 0, 0); > drm_exec_until_all_locked(&exec) { > ret = xe_pf_begin(&exec, vma, atomic, tile->id); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (ret) > goto unlock_dma_resv; > > @@ -543,7 +543,7 @@ static int handle_acc(struct xe_gt *gt, struct acc *acc) > drm_exec_init(&exec, 0, 0); > drm_exec_until_all_locked(&exec) { > ret = xe_pf_begin(&exec, vma, true, tile->id); > - drm_exec_retry_on_contention(&exec); > + ret = drm_exec_retry_on_contention(&exec, ret); > if (ret) > break; > } > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > index e2ec148c9c33..335524e803e7 100644 > --- a/drivers/gpu/drm/xe/xe_vm.c > +++ b/drivers/gpu/drm/xe/xe_vm.c > @@ -501,7 +501,7 @@ static void preempt_rebind_work_func(struct work_struct *w) > bool done = false; > > err = xe_preempt_work_begin(&exec, vm, &done); > - drm_exec_retry_on_contention(&exec); > + err = drm_exec_retry_on_contention(&exec, err); > if (err || done) { > drm_exec_fini(&exec); > if (err && xe_vm_validate_should_retry(&exec, err, &end)) > @@ -1052,7 +1052,7 @@ static void xe_vma_destroy_unlocked(struct xe_vma *vma) > drm_exec_init(&exec, 0, 0); > drm_exec_until_all_locked(&exec) { > err = xe_vm_lock_vma(&exec, vma); > - drm_exec_retry_on_contention(&exec); > + err = drm_exec_retry_on_contention(&exec, err); > if (XE_WARN_ON(err)) > break; > } > @@ -2148,11 +2148,11 @@ static struct xe_vma *new_vma(struct xe_vm *vm, struct drm_gpuva_op_map *op, > err = 0; > if (!bo->vm) { > err = drm_exec_lock_obj(&exec, xe_vm_obj(vm)); > - drm_exec_retry_on_contention(&exec); > + err = drm_exec_retry_on_contention(&exec, err); > } > if (!err) { > err = drm_exec_lock_obj(&exec, &bo->ttm.base); > - drm_exec_retry_on_contention(&exec); > + err = drm_exec_retry_on_contention(&exec, err); > } > if (err) { > drm_exec_fini(&exec); > @@ -2884,7 +2884,7 @@ static int vm_bind_ioctl_ops_execute(struct xe_vm *vm, > DRM_EXEC_IGNORE_DUPLICATES, 0); > drm_exec_until_all_locked(&exec) { > err = vm_bind_ioctl_ops_lock_and_prep(&exec, vm, vops); > - drm_exec_retry_on_contention(&exec); > + err = drm_exec_retry_on_contention(&exec, err); > if (err) > goto unlock; > > diff --git a/include/drm/drm_exec.h b/include/drm/drm_exec.h > index aa786b828a0a..fafb40d96e38 100644 > --- a/include/drm/drm_exec.h > +++ b/include/drm/drm_exec.h > @@ -51,6 +51,8 @@ struct drm_exec { > struct drm_gem_object *prelocked; > }; > > +int drm_exec_handle_contended(struct drm_exec *exec); > + > /** > * drm_exec_obj() - Return the object for a give drm_exec index > * @exec: Pointer to the drm_exec context > @@ -113,15 +115,26 @@ __PASTE(__drm_exec_, __LINE__): \ > /** > * drm_exec_retry_on_contention - restart the loop to grap all locks > * @exec: drm_exec object > + * @_ret: The current error status > * > * Control flow helper to continue when a contention was detected and we need to > * clean up and re-start the loop to prepare all GEM objects. > + * > + * Return: If no loop restart occurred: The error status. > */ > -#define drm_exec_retry_on_contention(exec) \ > - do { \ > - if (unlikely(drm_exec_is_contended(exec))) \ > - goto *__drm_exec_retry_ptr; \ > - } while (0) > +#define drm_exec_retry_on_contention(exec, _ret) \ > + ({ \ > + struct drm_exec *__exec = (exec); \ > + int __ret = (_ret); \ > + \ > + if (unlikely(drm_exec_is_contended(__exec))) { \ > + WARN_ON(__ret != -EDEADLK); \ > + __ret = drm_exec_handle_contended(__exec); \ > + if (!__ret) \ > + goto *__drm_exec_retry_ptr; \ > + } \ > + __ret; \ > + }) > > /** > * drm_exec_is_contended - check for contention