From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=203.254.224.34 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793839438; b=1NJSUpb7K9kKXiTjjqK+tXiqOqrG9imGa4jDpUm9aN1SWl4eYx7Jcy2d5PWKyS/ahTjn wYlKv1dQ4Pk3ARESsxSQsFfMjUsUq963yYs/rKIdAjyANn0sQYRiz913Orz8XhAvrTuhN ZugbX21882VEeJpNKj8fAsB5490ZDkjslq+WIbgeuinKA8NFs+ouRq0X1qzYXGwsfGlAH u6UO2dzXtcahLF+xrhFFKXFT6mKhE7yv2XC0zrHo8s9lEYTUNwMMNdFjGlO1wGllTj0rH 8W2nBcoMZe8ZSuERrSn1HbzDmQ1BWLq0c3Q66E55n3ZIswqVFmN8kGkPMPd/JHmbs5w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793839438; h=DMARC-Filter:Received:DKIM-Filter:DKIM-Signature:Received:Received: Received:Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:MIME-Version:Content-Transfer-Encoding:X-CMS-MailID: X-Msg-Generator:Content-Type:X-Sendblock-Type:CMS-TYPE:X-CPGSPASS: cpgsPolicy:X-CFilter-Loop:X-CMS-RootMailID:References; bh=TRvgzI3qXoA2HIsl7Zv36AwD/K99XeT08hxCxLH0B9A=; b=oLBk8fJ8HlX7kB6v8uwlNek56MYIgHcyUOqgxk1J9I8CRKGA6Cfix9rsGtngZ+XV5zd9 p9OQ9iDqiwSObNS5O0pW2khL1pzsDX/dSw/LgINzJzgxtzN762ZJsgObn7bBu4Yfl8SrF G5oJ5aBlPTWH2rNdb1yBhVvar/iwF7/YPDHl2pT3X/+Ky5OD6ME9Aw0i9/3ehzkp6ZnGD oPUyY3WFwSYADszcDevaV4PISM1dNb3OVTsCU3VAyzUBeM48vJzc9sWsKu/7S+4lt8qLZ gdXTtiLizlmcSClJ6JK7A5G6VihwgnRNI9sV8OuExVB0TNuu6TCvTRlt/0kGiu+iPkQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=samsung.com; spf=pass smtp.mailfrom=samsung.com; dkim=pass header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=gEPGYb1k; arc=none smtp.remote-ip=203.254.224.34 Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A628606A32E for ; Thu, 5 Nov 2026 00:43:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 1A628606A32E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=samsung.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=gEPGYb1k Received: from epcas2p4.samsung.com (unknown [182.195.41.56]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20261105004354epoutp04b64a0b2a8a75ddcc3150152d0a988dbe~k-3YjM12h0507505075epoutp04B for ; Thu, 5 Nov 2026 00:43:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20261105004354epoutp04b64a0b2a8a75ddcc3150152d0a988dbe~k-3YjM12h0507505075epoutp04B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1793839434; bh=TRvgzI3qXoA2HIsl7Zv36AwD/K99XeT08hxCxLH0B9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gEPGYb1ktlGAv1wBW5AoEU3AJgR69HF/eFfsSWPdvxR6xGNkRMaul/NKZHoZsGIvW aeD2GinMhCZZAF0MKXB26AyE7ACehry5fETjciwVdMnvtJq+VwGfDT1hnRnV5GX8iB G45IFo0HOkh9OrWOj2mLDmaSP1g5jVqivEXUf2bo= Received: from epsnrtp01.localdomain (unknown [182.195.42.153]) by epcas2p3.samsung.com (KnoxPortal) with ESMTPS id 20261105004353epcas2p33c41ad53cd488389d79916ef07439117~k-3X813PC1259112591epcas2p3E; Thu, 5 Nov 2026 00:43:53 +0000 (GMT) Received: from epcas2p2.samsung.com (unknown [182.195.38.206]) by epsnrtp01.localdomain (Postfix) with ESMTP id 4jKk89329Lz6B9mF; Thu, 5 Nov 2026 00:43:53 +0000 (GMT) Received: from epsmtip2.samsung.com (unknown [182.195.34.31]) by epcas2p3.samsung.com (KnoxPortal) with ESMTPA id 20261105004352epcas2p307ea40aadb636015545cee6e79470a03~k-3WU95OM2408824088epcas2p3l; Thu, 5 Nov 2026 00:43:52 +0000 (GMT) Received: from apsw.samsungds.net (unknown [12.80.211.160]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20261105004351epsmtip209a25c3e4e97031d57f7fa4fb718bd32~k-3WOYWCl0761307613epsmtip2S; Thu, 5 Nov 2026 00:43:51 +0000 (GMT) From: Kiwoong Kim To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, alim.akhtar@samsung.com, jejb@linux.ibm.com, martin.petersen@oracle.com, bvanassche@acm.org, kwangwon.min@samsung.com, hy50.seo@samsung.com, cpgs@samsung.com, h10.kim@samsung.com Cc: stable@vger.kernel.org, stanleyjhu@google.com, Kiwoong Kim , Bean Huo Subject: [PATCH v6 1/2] ufs: core: skip ABORT TASK for device management commands Date: Thu, 5 Nov 2026 09:43:32 +0900 Message-ID: <20261105004333.1097899-2-kwmad.kim@samsung.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261105004333.1097899-1-kwmad.kim@samsung.com> X-Mailing-List: linux-kernel@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 X-CMS-MailID: 20261105004352epcas2p307ea40aadb636015545cee6e79470a03 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-CPGSPASS: Y cpgsPolicy: CPGSC10-234,Y X-CFilter-Loop: Reflected X-CMS-RootMailID: 20261105004352epcas2p307ea40aadb636015545cee6e79470a03 References: <20261105004333.1097899-1-kwmad.kim@samsung.com> In MCQ mode, ufshcd_mcq_abort() falls through to ufshcd_try_to_abort_task() for all timed-out commands. However, device management commands (query, NOP) use reserved requests and are not SCSI I/O commands. The ABORT TASK task management function is designed for SCSI I/O UPIUs and is not applicable to device management UPIUs. This is only reachable since device management commands were converted to scsi_get_internal_cmd(); before that, a timed-out query was handled by ufshcd_wait_for_dev_cmd() -> ufshcd_clear_cmd() and never reached ufshcd_try_to_abort_task(). Fix this by checking ufshcd_is_scsi_cmd() in ufshcd_try_to_abort_task(). When the request is a reserved (device management) command, skip the TM path and call ufshcd_clear_cmd() directly instead. Fixes: 08b12cda6c44 ("scsi: ufs: core: Switch to scsi_get_internal_cmd()") Signed-off-by: Kiwoong Kim Reviewed-by: Bean Huo Reported-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index bcc2512bf34b..7fc80926eeec 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8046,6 +8046,9 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) lrbp = scsi_cmd_priv(cmd); + if (!ufshcd_is_scsi_cmd(cmd)) + goto clear_cmd; + for (poll_cnt = 100; poll_cnt; poll_cnt--) { err = ufshcd_issue_tm_cmd(hba, lrbp->lun, tag, UFS_QUERY_TASK, &resp); @@ -8091,6 +8094,7 @@ int ufshcd_try_to_abort_task(struct ufs_hba *hba, int tag) return err; } +clear_cmd: err = ufshcd_clear_cmd(hba, tag); if (err) dev_err(hba->dev, "%s: Failed clearing cmd at tag %d, err %d\n", -- 2.43.0