From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0303235AC19 for ; Tue, 7 Apr 2026 15:14:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775574865; cv=none; b=OVYhuu+eZL99apNZA2esxmVacvGaJGTCly9hPYf0xNs66qexdqoddhfcRcWyOphUF138z2a77j+cPMMvtmcPnvvRnb2+HVRL6VPLL5Sy7XCyr0GTVOwwTBs/egKc+80j0agXVGyQ6dvlXrxqdIua610T8u0K2HX2zvxm5OCvQ7Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775574865; c=relaxed/simple; bh=lpa8PY/WNqiqtY9XPdu7liPeQZdvALg92fsb4Oz9JBM=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=LscMBfaItx4LyCLrXoqSsZWjQhJLeIs/VLE3xIAvW4vgALNNTEUpSRQ2XReiGEKhMG2CaFf/X10GWbTM/Qt0gTY+KTemv/H7uS4v1HfbKHeSGNAi6JtFCZwByeFUHVrzhiT6iEZDvBDcKLoBe7/AUNEqaF6M7C0L9mObpbLBu2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=I1bbf0m1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="I1bbf0m1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D560C116C6; Tue, 7 Apr 2026 15:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775574864; bh=lpa8PY/WNqiqtY9XPdu7liPeQZdvALg92fsb4Oz9JBM=; h=Subject:To:Cc:From:Date:From; b=I1bbf0m1pDO626Es6cQr9nCT8Nc9U7cgjX69k2wyc2G4Eyeh4BjwhkC9aLn6xDhlN HprxcnNyb8fRnKLACkt/XG+5BjSS/8vIlerPnkDuDrXbyFz/94ouqzRrIouulhWB1k Owz1KuJjkVNYfbqcNxPnLvHIJl26LH81CuP9/pII= Subject: FAILED: patch "[PATCH] drm/xe: Disable garbage collector work item on SVM close" failed to apply to 6.18-stable tree To: matthew.brost@intel.com,rodrigo.vivi@intel.com,thomas.hellstrom@linux.intel.com Cc: From: Date: Tue, 07 Apr 2026 17:14:14 +0200 Message-ID: <2026040714-politely-veggie-24a4@gregkh> 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 The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x bce7cd6db2386e7a2b49ad3c09df0beabddfa3c4 # git commit -s git send-email --to '' --in-reply-to '2026040714-politely-veggie-24a4@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From bce7cd6db2386e7a2b49ad3c09df0beabddfa3c4 Mon Sep 17 00:00:00 2001 From: Matthew Brost Date: Thu, 26 Feb 2026 17:52:25 -0800 Subject: [PATCH] drm/xe: Disable garbage collector work item on SVM close MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When an SVM is closed, the garbage collector work item must be stopped synchronously and any future queuing must be prevented. Replace flush_work() with disable_work_sync() to ensure both conditions are met. Fixes: 63f6e480d115 ("drm/xe: Add SVM garbage collector") Cc: stable@vger.kernel.org Signed-off-by: Matthew Brost Reviewed-by: Thomas Hellström Link: https://patch.msgid.link/20260227015225.3081787-1-matthew.brost@intel.com (cherry picked from commit 2247feb9badca5a4774df9a437bfc44fba4f22de) Signed-off-by: Rodrigo Vivi diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c index ca67d0bdbfac..c6b92d4ea6f4 100644 --- a/drivers/gpu/drm/xe/xe_svm.c +++ b/drivers/gpu/drm/xe/xe_svm.c @@ -903,7 +903,7 @@ int xe_svm_init(struct xe_vm *vm) void xe_svm_close(struct xe_vm *vm) { xe_assert(vm->xe, xe_vm_is_closed(vm)); - flush_work(&vm->svm.garbage_collector.work); + disable_work_sync(&vm->svm.garbage_collector.work); xe_svm_put_pagemaps(vm); drm_pagemap_release_owner(&vm->svm.peer); }