From mboxrd@z Thu Jan 1 00:00:00 1970 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 9BE3D329E46; Sat, 30 May 2026 17:30:45 +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=1780162246; cv=none; b=s7e0cWNrummdVXSMl218cdbBGimqnZ1RnaBwOmj+vdd02y3fadHliAsxFqn5qi7X8HxebxoRzWBbe0h6rSBAWlBt7yDLkxXp5Le7wF6TaaIVUsQJjX8MMHwPc188CmQcUxcx3MFMbPIBqW5Ubmz6FS2d2P1Whyi5Km9sltVeu3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780162246; c=relaxed/simple; bh=nrBbFNaXTnidQNLff0PW+gwGwxcpQ8RPm4E9zNB+TB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s8rKdYk381VNyyHjnKyKZMSmnEnlW2GGzWRGINU/WxeTI8FaItIP4J7whg94HOxzSYRO5AiegoNBObpCj98Cd2QJ8/kppI+dgxcbleNEcwNtEBZLPga8lBd6O+5mPkb/gYS8kh69wnHBvSrpWCa4mUPSq+EgVkMhFalQqS7jfq8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=K2v4f5Al; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="K2v4f5Al" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFF201F00898; Sat, 30 May 2026 17:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780162245; bh=hiad4Z8pWrgigjITPuCCRGRoe2JMio/Gs1a9yyHIQp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K2v4f5Alt7CaS0ty0BXT2+EKJatZR0D/lAwUCczA4Q95ln8XyqIhJAd9WUNWAWtL8 a74fmfRPfKrFwIAy9iOsIHummYkB+ptygaYHpipHxtAlJUivLTCJkQe950y4HVXS8k VJKx0pxZi6pw2nwUHN6EjJuwyhMSrjcOult/eIbI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sebastian Brzezinka , Krzysztof Karas , Andi Shyti , Tvrtko Ursulin Subject: [PATCH 6.1 825/969] drm/i915: skip __i915_request_skip() for already signaled requests Date: Sat, 30 May 2026 18:05:49 +0200 Message-ID: <20260530160323.423802074@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastian Brzezinka commit 4cfe4c0efbdcde742a47813180cc69b132d7598e upstream. After a GPU reset the HWSP is zeroed, so previously completed requests appear incomplete. If such a request is picked up during reset_rewind() and marked guilty, i915_request_set_error_once() returns early (fence already signaled), leaving fence.error without a fatal error code. The subsequent __i915_request_skip() then hits: ``` GEM_BUG_ON(!fatal_error(rq->fence.error)) ``` Fixes a kernel BUG observed on Sandy Bridge (Gen6) during heartbeat-triggered engine resets. ``` kernel BUG at drivers/gpu/drm/i915/i915_request.c:556! RIP: __i915_request_skip+0x15e/0x1d0 [i915] ... __i915_request_reset+0x212/0xa70 [i915] reset_rewind+0xe4/0x280 [i915] intel_gt_reset+0x30d/0x5b0 [i915] heartbeat+0x516/0x530 [i915] ``` Guard __i915_request_skip() with i915_request_signaled(), if the fence is already signaled, the ring content is committed and there is nothing left to skip. Fixes: 36e191f0644b ("drm/i915: Apply i915_request_skip() on submission") Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/work_items/13729 Signed-off-by: Sebastian Brzezinka Cc: stable@vger.kernel.org # v5.7+ Reviewed-by: Krzysztof Karas Reviewed-by: Andi Shyti Signed-off-by: Andi Shyti Link: https://lore.kernel.org/r/fe76921d35b6ae85aa651822726d0d9815aa5362.1776339012.git.sebastian.brzezinka@intel.com (cherry picked from commit 5ba54393dcd7adf75a9f39f5a933b1538349cad5) Signed-off-by: Tvrtko Ursulin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gt/intel_reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -144,7 +144,8 @@ void __i915_request_reset(struct i915_re rcu_read_lock(); /* protect the GEM context */ if (guilty) { i915_request_set_error_once(rq, -EIO); - __i915_request_skip(rq); + if (!i915_request_signaled(rq)) + __i915_request_skip(rq); banned = mark_guilty(rq); } else { i915_request_set_error_once(rq, -EAGAIN);