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 85D0B2EA168 for ; Wed, 25 Feb 2026 18:10:40 +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=1772043040; cv=none; b=s8IsLn29a+HndiKwDeOfRWZ8HDj2AUXnDw7VuyrDL48l6Xxg3ynuRvh62Iy/Yiurgie3iNLI7Kvuv81gWbhK2kEaaGbtXnJzRQcjQdBJ6X5NcJQVN63CaBp5qoA2tQjRJ9q518nMD7yK2OdFYr0nDDjy9wg2Q6piQ87e0KuyP5c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772043040; c=relaxed/simple; bh=8L1ejGIGlv63e0BT1ZiuMakCOCfi1Ggy81Xkfn7lnm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eAeP4P6EOgTKhNqoafwgOumphW4gQ98PITMNSaxrcxkvOkY7QoS84XO21wvTF8a/ubTAzjKoeCSm6TLE1L4z0y6uG/a8QEsKO/FV9As0JV5oTCD8tQy6IOtnUBczSYVwC8Kj9XNjLz+2IzQk1XvVBWOUNq7pakFB8R5uzA4bY5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jC2J4kTL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jC2J4kTL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CE20C2BC86; Wed, 25 Feb 2026 18:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772043040; bh=8L1ejGIGlv63e0BT1ZiuMakCOCfi1Ggy81Xkfn7lnm0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jC2J4kTLWvlutKZ4FbZ6NL28odZ3EBEWrwytzAg7CqtFlUAOMgrSim4CD8K/ic6tt J1K85XA0Tsgqb9oMyWdoyumPBoeh+kROeqgXAdkd1CCfkXWNim5q6tE72FXf6KzWDn CpdnuTWAWQx0XjDPmKroMvXy12poxI+O9ObKAJZ2PvOmc9lxpPp43unJjY7RtK6nf6 /yli3nYQkK+1RsEH3zM4v9dfbhwjK1fnruwvHBMuIJJXNg2wRSQjoljp+Oa7DhwaWQ 48/FsdM5fdiI4gidmkloyyyvnnHHyG3hpxHcG2NRtZtHCF2QALyiym3QCn119kS12m MOqKQEjkUmqIg== From: Sasha Levin To: stable@vger.kernel.org Cc: Damien Le Moal , Niklas Cassel , "Martin K. Petersen" , John Garry , Igor Pylypiv , Sasha Levin Subject: [PATCH 5.15.y 4/4] ata: libata-scsi: refactor ata_scsi_translate() Date: Wed, 25 Feb 2026 13:10:34 -0500 Message-ID: <20260225181034.910635-4-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260225181034.910635-1-sashal@kernel.org> References: <2026022431-await-dinginess-62b0@gregkh> <20260225181034.910635-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Damien Le Moal [ Upstream commit bb3a8154b1a1dc2c86d037482c0a2cf9186829ed ] Factor out of ata_scsi_translate() the code handling queued command deferral using the port qc_defer callback and issuing the queued command with ata_qc_issue() into the new function ata_scsi_qc_issue(), and simplify the goto used in ata_scsi_translate(). While at it, also add a lockdep annotation to check that the port lock is held when ata_scsi_translate() is called. No functional changes. Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Niklas Cassel Reviewed-by: Martin K. Petersen Reviewed-by: John Garry Reviewed-by: Igor Pylypiv Signed-off-by: Sasha Levin --- drivers/ata/libata-scsi.c | 81 ++++++++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 4fd8fcab5f972..59843188966e7 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1670,6 +1670,42 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) ata_qc_done(qc); } +static int ata_scsi_qc_issue(struct ata_port *ap, struct ata_queued_cmd *qc) +{ + int ret; + + if (!ap->ops->qc_defer) + goto issue; + + /* Check if the command needs to be deferred. */ + ret = ap->ops->qc_defer(qc); + switch (ret) { + case 0: + break; + case ATA_DEFER_LINK: + ret = SCSI_MLQUEUE_DEVICE_BUSY; + break; + case ATA_DEFER_PORT: + ret = SCSI_MLQUEUE_HOST_BUSY; + break; + default: + WARN_ON_ONCE(1); + ret = SCSI_MLQUEUE_HOST_BUSY; + break; + } + + if (ret) { + /* Force a requeue of the command to defer its execution. */ + ata_qc_free(qc); + return ret; + } + +issue: + ata_qc_issue(qc); + + return 0; +} + /** * ata_scsi_translate - Translate then issue SCSI command to ATA device * @dev: ATA device to which the command is addressed @@ -1693,66 +1729,49 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) * spin_lock_irqsave(host lock) * * RETURNS: - * 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY if the command - * needs to be deferred. + * 0 on success, SCSI_ML_QUEUE_DEVICE_BUSY or SCSI_MLQUEUE_HOST_BUSY if the + * command needs to be deferred. */ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd, ata_xlat_func_t xlat_func) { struct ata_port *ap = dev->link->ap; struct ata_queued_cmd *qc; - int rc; + lockdep_assert_held(ap->lock); + + /* + * ata_scsi_qc_new() calls scsi_done(cmd) in case of failure. So we + * have nothing further to do when allocating a qc fails. + */ qc = ata_scsi_qc_new(dev, cmd); if (!qc) - goto err_mem; + return 0; /* data is present; dma-map it */ if (cmd->sc_data_direction == DMA_FROM_DEVICE || cmd->sc_data_direction == DMA_TO_DEVICE) { if (unlikely(scsi_bufflen(cmd) < 1)) { ata_dev_warn(dev, "WARNING: zero len r/w req\n"); - goto err_did; + cmd->result = (DID_ERROR << 16); + goto done; } ata_sg_init(qc, scsi_sglist(cmd), scsi_sg_count(cmd)); - qc->dma_dir = cmd->sc_data_direction; } qc->complete_fn = ata_scsi_qc_complete; if (xlat_func(qc)) - goto early_finish; - - if (ap->ops->qc_defer) { - if ((rc = ap->ops->qc_defer(qc))) - goto defer; - } - - /* select device, send command to hardware */ - ata_qc_issue(qc); + goto done; - return 0; - -early_finish: - ata_qc_free(qc); - scsi_done(cmd); - return 0; + return ata_scsi_qc_issue(ap, qc); -err_did: +done: ata_qc_free(qc); - cmd->result = (DID_ERROR << 16); scsi_done(cmd); -err_mem: return 0; - -defer: - ata_qc_free(qc); - if (rc == ATA_DEFER_LINK) - return SCSI_MLQUEUE_DEVICE_BUSY; - else - return SCSI_MLQUEUE_HOST_BUSY; } struct ata_scsi_args { -- 2.51.0