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 2832BFD88C5 for ; Tue, 10 Mar 2026 22:50:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E13A310E792; Tue, 10 Mar 2026 22:50:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GscPPkkZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2378010E78F for ; Tue, 10 Mar 2026 22:50:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773183043; x=1804719043; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tg6eATn+DjxTL9bL2/6WODzKwQNcIQ8b2ky1QFKzL7M=; b=GscPPkkZc2aLuD9reLQ/VdrQwMeoplP8PkjGzqEd3cIdjyZZZMkUcqXS 9JrYXWxXqZ/pHOcVw1pf2CC4n5RK43O4XA9tD3ZIbSKLmMAmbMy1Jy8+Q GTnp+KkfdkpuvXtJFSYLhKrPO+DntI6Y5kuTt5jqiVMmAVK7nC9n2xwZV q1RUd+WqRf6NXehCXV0elDOtEYEeyA6uWIib/9hLmNwxRzDDplfTM9xMB f/MdJ5S6m9J7Rn76Imgo47nhHqqxeWfkjL3ZZkyDbSo+3BaYxjdP+9uba BJaX1XITao4iMo8D3X4FJ66qPu9uc5vGdWutpI72LaHZlihoIeQs37T85 Q==; X-CSE-ConnectionGUID: vZcNGg2fRp+f/Jes7fB7Hw== X-CSE-MsgGUID: iICDnoa1S1e0BUuuS5Oybg== X-IronPort-AV: E=McAfee;i="6800,10657,11725"; a="61817881" X-IronPort-AV: E=Sophos;i="6.23,113,1770624000"; d="scan'208";a="61817881" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2026 15:50:42 -0700 X-CSE-ConnectionGUID: GtIoALu7T+Cor/WVVgaz9g== X-CSE-MsgGUID: vMmiEN8TSNaLBeUHaP28cQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,113,1770624000"; d="scan'208";a="220440987" Received: from guc-pnp-dev-box-1.fm.intel.com ([10.1.39.24]) by orviesa007.jf.intel.com with ESMTP; 10 Mar 2026 15:50:41 -0700 From: Zhanjun Dong To: intel-xe@lists.freedesktop.org Cc: Matthew Brost , stable@vger.kernel.org, Zhanjun Dong , Stuart Summers Subject: [PATCH v9 1/7] drm/xe: Always kill exec queues in xe_guc_submit_pause_abort Date: Tue, 10 Mar 2026 18:50:33 -0400 Message-Id: <20260310225039.1320161-2-zhanjun.dong@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260310225039.1320161-1-zhanjun.dong@intel.com> References: <20260310225039.1320161-1-zhanjun.dong@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" From: Matthew Brost xe_guc_submit_pause_abort is intended to be called after something disastrous occurs (e.g., VF migration fails, device wedging, or driver unload) and should immediately trigger the teardown of remaining submission state. With that, kill any remaining queues in this function. Fixes: 7c4b7e34c83b ("drm/xe/vf: Abort VF post migration recovery on failure") Cc: stable@vger.kernel.org Signed-off-by: Zhanjun Dong Reviewed-by: Stuart Summers --- drivers/gpu/drm/xe/xe_guc_submit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index ca7aa4f358d0..b31e0e0af5cb 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -2763,8 +2763,7 @@ void xe_guc_submit_pause_abort(struct xe_guc *guc) continue; xe_sched_submission_start(sched); - if (exec_queue_killed_or_banned_or_wedged(q)) - xe_guc_exec_queue_trigger_cleanup(q); + guc_exec_queue_kill(q); } mutex_unlock(&guc->submission_state.lock); } -- 2.34.1