Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1211348

[PATCH v1 03/15] scsi: ufs: verify command tag validity

From Yaniv Gardi <ygardi@codeaurora.org>
Newsgroups linux.kernel
Subject [PATCH v1 03/15] scsi: ufs: verify command tag validity
Date 2015-08-22 00:20 +0200
Message-ID <q02Pf-8pP-9@gated-at.bofh.it> (permalink)
References <q02Pf-8pP-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

A race condition appear to exist between request completion when
scsi_done() is called to end the request and set the tag back to
-1 (at blk_queue_end_tag() scsi_end_request), and scsi layer error
handling which aborts the command and reuses it to request sense
data. Sending the request sense is done with tag which was set to -1
and so it is invalid.
Assert command tag passed from scsi layer is valid.

Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>

---
 drivers/scsi/ufs/ufshcd.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2d3ebca..61e98a9 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -190,6 +190,10 @@ static int ufshcd_config_pwr_mode(struct ufs_hba *hba,
 		struct ufs_pa_layer_attr *desired_pwr_mode);
 static int ufshcd_change_power_mode(struct ufs_hba *hba,
 			     struct ufs_pa_layer_attr *pwr_mode);
+static inline bool ufshcd_valid_tag(struct ufs_hba *hba, int tag)
+{
+	return tag >= 0 && tag < hba->nutrs;
+}
 
 static inline int ufshcd_enable_irq(struct ufs_hba *hba)
 {
@@ -1310,6 +1314,12 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 	hba = shost_priv(host);
 
 	tag = cmd->request->tag;
+	if (!ufshcd_valid_tag(hba, tag)) {
+		dev_err(hba->dev,
+			"%s: invalid command tag %d: cmd=0x%p, cmd->request=0x%p",
+			__func__, tag, cmd, cmd->request);
+		BUG();
+	}
 
 	spin_lock_irqsave(hba->host->host_lock, flags);
 	switch (hba->ufshcd_state) {
@@ -3862,11 +3872,21 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
 	host = cmd->device->host;
 	hba = shost_priv(host);
 	tag = cmd->request->tag;
+	if (!ufshcd_valid_tag(hba, tag)) {
+		dev_err(hba->dev,
+			"%s: invalid command tag %d: cmd=0x%p, cmd->request=0x%p",
+			__func__, tag, cmd, cmd->request);
+		BUG();
+	}
 
 	ufshcd_hold(hba, false);
 	/* If command is already aborted/completed, return SUCCESS */
-	if (!(test_bit(tag, &hba->outstanding_reqs)))
+	if (!(test_bit(tag, &hba->outstanding_reqs))) {
+		dev_err(hba->dev,
+			"%s: cmd at tag %d already completed, outstanding=0x%lx, doorbell=0x%x\n",
+			__func__, tag, hba->outstanding_reqs, reg);
 		goto out;
+	}
 
 	reg = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 	if (!(reg & (1 << tag))) {
-- 
1.8.5.2

-- 
QUALCOMM ISRAEL, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v1 00/15] Big fixes, retries, handle a race condition Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 02/15] scsi: ufs: clear fields UTRD, UPIU req and rsp before new transfers Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 03/15] scsi: ufs: verify command tag validity Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 15/15] scsi: ufs: add wrapper for retrying sending query attribute Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
    Re: [PATCH v1 15/15] scsi: ufs: add wrapper for retrying sending  query attribute Rob Herring <robherring2@gmail.com> - 2015-08-23 23:10 +0200
      Re: [PATCH v1 15/15] scsi: ufs: add wrapper for retrying sending  query attribute ygardi@codeaurora.org - 2015-08-25 14:50 +0200
        Re: [PATCH v1 15/15] scsi: ufs: add wrapper for retrying sending  query attribute ygardi@codeaurora.org - 2015-08-25 15:30 +0200
  [PATCH v1 04/15] scsi: ufs: clear outstanding_request bit in case query timeout Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 11/15] scsi: ufs: retry failed query flag requests Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 14/15] scsi: ufs: commit descriptors before setting the doorbell Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
    Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting the doorbell Rob Herring <robherring2@gmail.com> - 2015-08-23 23:20 +0200
      Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting  the doorbell ygardi@codeaurora.org - 2015-08-25 14:40 +0200
        Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting the doorbell Rob Herring <robherring2@gmail.com> - 2015-08-25 20:30 +0200
          Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting  the doorbell ygardi@codeaurora.org - 2015-08-27 14:20 +0200
            Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting the doorbell Rob Herring <robherring2@gmail.com> - 2015-08-27 19:30 +0200
              Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting  the doorbell ygardi@codeaurora.org - 2015-08-30 12:00 +0200
        Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting  the doorbell ygardi@codeaurora.org - 2015-08-27 14:30 +0200
          Re: [PATCH v1 14/15] scsi: ufs: commit descriptors before setting the doorbell Rob Herring <robherring2@gmail.com> - 2015-08-27 19:10 +0200
  [PATCH v1 10/15] scsi: ufs: fix error recovery after the hibern8 exit failure Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 05/15] scsi: ufs: increase fDeviceInit query response timeout Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 13/15] scsi: ufs: add missing memory barriers Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 12/15] scsi: ufs: reduce the interrupts for power mode change requests Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200
  [PATCH v1 08/15] scsi: ufs: add retries to dme_peer get and set attribute Yaniv Gardi <ygardi@codeaurora.org> - 2015-08-22 00:20 +0200

csiph-web