Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C11862F28FC for ; Sat, 1 Aug 2026 14:04:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785593053; cv=none; b=bSOX1qP2xfrfXKg7/VSuvY89b4zWonwLYMy5VWx2Dgf6kErN7Ad54i7j/SZR9jOKA8CAspA0Nvs6H8Q6YUDMi83ss4Dlr0wRjCG7Fg8s7TOMSzQ9RXfFj/OBr0o9vYaGA6M7LZSBgTwQklxGyXaruPQCCq+tKyud0tPo13ORSuU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785593053; c=relaxed/simple; bh=cRUA2hx5v3Q3p4CEvVidhcBK3+9wPAvEKYNjfwADJwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eX8+0c6dy5e4HO77m4bgH4hIF3oQMqaZWC8SZYw2YDQAJCM1+lSmzPCzA+7HYWI7oYtY6cH287nNi5YVWqXSUsE7aXN91rzy75tzwdBApEFb3In/Ey7rVDmUC5KzcowqMbnzCj3NhQUjEFHlF7uNwBCk0iCNGg0VHDBiv1uREMU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hvGgfWBS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hvGgfWBS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1FA01F00ACF; Sat, 1 Aug 2026 14:04:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785593051; bh=bDnVwFnY5ccGZT+NDTwoMYpsOzxHsAUWmiFLcoE7sKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hvGgfWBST3cYEs+PQJIZGZdmziV2fL+stax43gEZJlmge8sCV6tWaOOeDDkHCapuQ TL2RVKtdaPdfjxoHePbVyt+1YDttK4jpjgnb/PVSQ5xJMP24uGmepx29nzslZTWepu Jsy96HEFAn8OEPowlBhu9FMJt9cpdtANhQrkxqDuDfc54wD9Ea+o+T++ATAa5ff1J5 6HyHpw2yFtWSSUxLJBJzwRyLTY1MieTSOEoYF9g28idCGpJ7fEPPy1vCL6o2o8W3FS 04OJ3pAJuRFtebROrz0KNBFml7qdEUla3MyD+AN7o2jj8OdmAWPjokmcqHf/5UPQWQ yk9+5cpQ2JaMg== From: Sasha Levin To: stable@vger.kernel.org Cc: Matthew Brost , Matthew Auld , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Sasha Levin Subject: [PATCH 7.1.y 2/2] drm/xe: Wait on external BO kernel fences in exec IOCTL Date: Sat, 1 Aug 2026 10:04:08 -0400 Message-ID: <20260801140408.3645911-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260801140408.3645911-1-sashal@kernel.org> References: <2026072910-croon-outlet-91f2@gregkh> <20260801140408.3645911-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Matthew Brost [ Upstream commit af80e2bfde9312c76b60cf9274248dce0410b30d ] Before arming a user job, xe_exec_ioctl() only added the VM's dma-resv KERNEL slot as a dependency. That slot covers rebinds and the kernel operations of the VM's private BOs, but not external BOs (bo->vm == NULL), which carry their kernel operations (evictions, moves, ...) in their own dma-resv KERNEL slot. The DMA_RESV_USAGE_KERNEL slot is the cross-driver contract for memory management operations that must complete before the BO or its backing store may be used: any accessor is required to wait on the KERNEL fences before touching the resv. By skipping the external BOs' KERNEL slots, the exec path violated that contract and could schedule a user job while a kernel operation on an external BO mapped by the VM was still in flight, racing against it and potentially reading or writing memory that was being moved. Replace the VM-only dependency with an iteration over every object locked by the exec, adding each object's KERNEL slot as a job dependency. This covers the VM resv (rebinds and private BOs) as well as every external BO, mirroring the drm_gpuvm_resv_add_fence() call that later publishes the job fence to the same set of objects. Long-running mode continues to skip this, as before. Fixes: dd08ebf6c352 ("drm/xe: Introduce a new DRM driver for Intel GPUs") Cc: stable@vger.kernel.org Assisted-by: GitHub_Copilot:claude-opus-4.8 Signed-off-by: Matthew Brost Reviewed-by: Matthew Auld Link: https://patch.msgid.link/20260702215805.4011228-1-matthew.brost@intel.com (cherry picked from commit a6b842acf3ddd1efc53a56de9260cfa718fb35e7) Signed-off-by: Thomas Hellström Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_exec.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_exec.c b/drivers/gpu/drm/xe/xe_exec.c index e05dabfcd43c..d5293bc33a67 100644 --- a/drivers/gpu/drm/xe/xe_exec.c +++ b/drivers/gpu/drm/xe/xe_exec.c @@ -292,13 +292,23 @@ int xe_exec_ioctl(struct drm_device *dev, void *data, struct drm_file *file) goto err_exec; } - /* Wait behind rebinds */ + /* + * Wait behind rebinds and any kernel operations (evictions, defrag + * moves, ...) on the VM and all external BOs. The VM's private BOs + * carry their kernel ops in the VM dma-resv KERNEL slot, while each + * external BO carries them in its own dma-resv KERNEL slot; both are + * covered by iterating every object locked by the exec, mirroring the + * drm_gpuvm_resv_add_fence() below. + */ if (!xe_vm_in_lr_mode(vm)) { - err = xe_sched_job_add_deps(job, - xe_vm_resv(vm), - DMA_RESV_USAGE_KERNEL); - if (err) - goto err_put_job; + struct drm_gem_object *obj; + + drm_exec_for_each_locked_object(exec, obj) { + err = xe_sched_job_add_deps(job, obj->resv, + DMA_RESV_USAGE_KERNEL); + if (err) + goto err_put_job; + } } for (i = 0; i < num_syncs && !err; i++) -- 2.53.0