From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063615; b=yFvG+YDgXmDpJeJJ/2m0m0DVqAAHGFYy5sQvwycTjUj4ry+/zShh6SHc0BOWZAKPpp8j xmTwbaTOJPBWdZ02f4VmYPgIDfLqNtlRfWG42PlScDXBvTkY/pR8g+vgRWZY5SCxZxHQg O0amwS0JPcen0iB586QkJmfl6m1EBssy0UdU52J4GPbw36Ee2VWVkCBJHsd6SB0DegHld DLU8H+foOnwzsXUIjGpazsAJb9LqqH5+VocFbnzE+QfTzerNmi3rd2Gd9lvSHUpD4x5MN hJ0Bgm6HRa3F+7q7JuqVUvZJR/rZe0TFpSCzWt1DPS7ga1LYG8CgLoYPKQXt6FFnTew== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063615; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=GjxCNClJQejwtDtWzzPDCt2l1yH0YdoyVedIuAqWZm4=; b=1bvmbWoDaUIfRm2C16k8ME/zqa94fx1mlcjSIEklHc6oN7p3PJaszNvHydMAjOMHvVkP 5UogxJSwWIi9JMmA35aGNdrRtHSvixwWzlzApL/4EA5o4pAZx8zv0DMRz+jX8MMl7ae40 4d4s9dTecXqaZS031TxGgrYR/SdxbR+IQfu3EA0sHJNEkMdCxu0HT9EUertoLoTaeecd1 dG191muevBfevBx6BdyvWj2SCEgdA1Ki+/SuC4nifRlt2EN3jWywX7mrKe837EoLOTyGB 1WevcJpbI+s2toOflCGjNazVtaD+WcDVsr16ySPK+z9NTytbB13vyV83LBKOZjulXLg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ETH5iIG4; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17A186082BE2; Sat, 7 Nov 2026 15:00:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ETH5iIG4 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B67701F0089F; Sat, 7 Nov 2026 15:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063614; bh=GjxCNClJQejwtDtWzzPDCt2l1yH0YdoyVedIuAqWZm4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ETH5iIG4PZJVvi3bI2GH0fNxeOp2MoSUIrJf+xSgPNrxy2Dmwc/4a2llJbX6y4IZD 1+al37D7intLp1NWdkudnULXCsfCRpQRFXnsZeOeSJUGd8qRbvhCVDn+TVr9XTcuhP B+8MANChPc8kk6NSJeMF9qelkmPyJ65s5oHZV12k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stanley Jhu , Peter Wang , Bean Huo , Bart Van Assche , "Martin K. Petersen (Oracle)" , Sasha Levin Subject: [PATCH 6.18 736/869] scsi: ufs: core: Remove completed-without-interrupt path in ufshcd_abort() Date: Sat, 7 Nov 2026 08:56:58 -0500 Message-ID: <20261107134917.788781875@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stanley Jhu [ Upstream commit 7cfdfdd6557906fd09cf0a9a564a07012e7fb0c1 ] In SDB mode, a command that times out right as the controller finishes it can be completed twice: 1. The command times out and scsi_timeout() schedules ufshcd_abort(). 2. The controller finishes the command and clears its doorbell bit in REG_UTP_TRANSFER_REQ_DOOR_BELL, while the completion handler has not yet cleared BIT(tag) in hba->outstanding_reqs. 3. ufshcd_abort() sees the doorbell bit clear and calls __ufshcd_transfer_req_compl() without clearing BIT(tag) in hba->outstanding_reqs. 4. The normal completion handler or the logical unit reset that follows sees BIT(tag) still set in hba->outstanding_reqs and completes the same command a second time. This branch only exists for a rare corner case, a completion interrupt that is lost or arrives late. Remove it to simplify the abort path and leave such a command to the SCSI error handler, like any other command that cannot be aborted. The cost is a slower recovery in this corner case, which is acceptable since it only happens after a timeout. Fixes: 169f5eb28869 ("scsi: ufs: Optimize SCSI command processing") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/fdb5c391-01ef-4a23-94c2-4f3853909348@acm.org Signed-off-by: Stanley Jhu Reviewed-by: Peter Wang Reviewed-by: Bean Huo Reviewed-by: Bart Van Assche Link: https://patch.msgid.link/20261022034443.3034432-6-stanleyjhu@google.com Signed-off-by: Martin K. Petersen (Oracle) Signed-off-by: Sasha Levin --- drivers/ufs/core/ufshcd.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index b3dbfd3552dc4..97f86b6905b56 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -7777,15 +7777,6 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) } hba->req_abort_count++; - if (!hba->mcq_enabled && !(reg & (1 << tag))) { - /* only execute this code in single doorbell mode */ - dev_err(hba->dev, - "%s: cmd was completed, but without a notifying intr, tag = %d", - __func__, tag); - __ufshcd_transfer_req_compl(hba, 1UL << tag); - goto release; - } - /* * Task abort to the device W-LUN is illegal. When this command * will fail, due to spec violation, scsi err handling next step -- 2.53.0