From: Kashyap Desai <kashyap.desai@broadcom.com>
To: linux-scsi@vger.kernel.org
Cc: jejb@linux.ibm.com, martin.petersen@oracle.com,
steve.hagan@broadcom.com, peter.rivera@broadcom.com,
mpi3mr-linuxdrv.pdl@broadcom.com,
Kashyap Desai <kashyap.desai@broadcom.com>,
sathya.prakash@broadcom.com
Subject: [PATCH v6 16/24] mpi3mr: hardware workaround for UNMAP commands to nvme drives
Date: Thu, 20 May 2021 20:55:37 +0530 [thread overview]
Message-ID: <20210520152545.2710479-17-kashyap.desai@broadcom.com> (raw)
In-Reply-To: <20210520152545.2710479-1-kashyap.desai@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 4018 bytes --]
The controller hardware can not handle certain unmap commands for NVMe
drives, this patch adds support in the driver to check those commands and
handle as appropriate.
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: sathya.prakash@broadcom.com
---
drivers/scsi/mpi3mr/mpi3mr_os.c | 100 ++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c
index 221a850..8dd8fb7 100644
--- a/drivers/scsi/mpi3mr/mpi3mr_os.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_os.c
@@ -2767,6 +2767,101 @@ static int mpi3mr_target_alloc(struct scsi_target *starget)
return retval;
}
+/**
+ * mpi3mr_check_return_unmap - Whether an unmap is allowed
+ * @mrioc: Adapter instance reference
+ * @scmd: SCSI Command reference
+ *
+ * The controller hardware cannot handle certain unmap commands
+ * for NVMe drives, this routine checks those and return true
+ * and completes the SCSI command with proper status and sense
+ * data.
+ *
+ * Return: TRUE for not allowed unmap, FALSE otherwise.
+ */
+static bool mpi3mr_check_return_unmap(struct mpi3mr_ioc *mrioc,
+ struct scsi_cmnd *scmd)
+{
+ unsigned char *buf;
+ u16 param_len, desc_len;
+
+ param_len = get_unaligned_be16(scmd->cmnd + 7);
+
+ if (!param_len) {
+ ioc_warn(mrioc,
+ "%s: cdb received with zero parameter length\n",
+ __func__);
+ scsi_print_command(scmd);
+ scmd->result = DID_OK << 16;
+ scmd->scsi_done(scmd);
+ return true;
+ }
+
+ if (param_len < 24) {
+ ioc_warn(mrioc,
+ "%s: cdb received with invalid param_len: %d\n",
+ __func__, param_len);
+ scsi_print_command(scmd);
+ scmd->result = (DRIVER_SENSE << 24) |
+ SAM_STAT_CHECK_CONDITION;
+ scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST,
+ 0x1A, 0);
+ scmd->scsi_done(scmd);
+ return true;
+ }
+ if (param_len != scsi_bufflen(scmd)) {
+ ioc_warn(mrioc,
+ "%s: cdb received with param_len: %d bufflen: %d\n",
+ __func__, param_len, scsi_bufflen(scmd));
+ scsi_print_command(scmd);
+ scmd->result = (DRIVER_SENSE << 24) |
+ SAM_STAT_CHECK_CONDITION;
+ scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST,
+ 0x1A, 0);
+ scmd->scsi_done(scmd);
+ return true;
+ }
+ buf = kzalloc(scsi_bufflen(scmd), GFP_ATOMIC);
+ if (!buf) {
+ scsi_print_command(scmd);
+ scmd->result = (DRIVER_SENSE << 24) |
+ SAM_STAT_CHECK_CONDITION;
+ scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST,
+ 0x55, 0x03);
+ scmd->scsi_done(scmd);
+ return true;
+ }
+ scsi_sg_copy_to_buffer(scmd, buf, scsi_bufflen(scmd));
+ desc_len = get_unaligned_be16(&buf[2]);
+
+ if (desc_len < 16) {
+ ioc_warn(mrioc,
+ "%s: Invalid descriptor length in param list: %d\n",
+ __func__, desc_len);
+ scsi_print_command(scmd);
+ scmd->result = (DRIVER_SENSE << 24) |
+ SAM_STAT_CHECK_CONDITION;
+ scsi_build_sense_buffer(0, scmd->sense_buffer, ILLEGAL_REQUEST,
+ 0x26, 0);
+ scmd->scsi_done(scmd);
+ kfree(buf);
+ return true;
+ }
+
+ if (param_len > (desc_len + 8)) {
+ scsi_print_command(scmd);
+ ioc_warn(mrioc,
+ "%s: Truncating param_len(%d) to desc_len+8(%d)\n",
+ __func__, param_len, (desc_len + 8));
+ param_len = desc_len + 8;
+ put_unaligned_be16(param_len, scmd->cmnd + 7);
+ scsi_print_command(scmd);
+ }
+
+ kfree(buf);
+ return false;
+}
+
/**
* mpi3mr_allow_scmd_to_fw - Command is allowed during shutdown
* @scmd: SCSI Command reference
@@ -2858,6 +2953,11 @@ static int mpi3mr_qcmd(struct Scsi_Host *shost,
goto out;
}
+ if ((scmd->cmnd[0] == UNMAP) &&
+ (stgt_priv_data->dev_type == MPI3_DEVICE_DEVFORM_PCIE) &&
+ mpi3mr_check_return_unmap(mrioc, scmd))
+ goto out;
+
host_tag = mpi3mr_host_tag_for_scmd(mrioc, scmd);
if (host_tag == MPI3MR_HOSTTAG_INVALID) {
scmd->result = DID_ERROR << 16;
--
2.18.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
next prev parent reply other threads:[~2021-05-20 15:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 15:25 [PATCH v6 00/24] Introducing mpi3mr driver Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 01/24] mpi3mr: add mpi30 Rev-R headers and Kconfig Kashyap Desai
2021-05-26 19:08 ` Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 02/24] mpi3mr: base driver code Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 03/24] mpi3mr: create operational request and reply queue pair Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 04/24] mpi3mr: add support of queue command processing Kashyap Desai
2021-06-01 13:30 ` Hannes Reinecke
2021-05-20 15:25 ` [PATCH v6 05/24] mpi3mr: add support of internal watchdog thread Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 06/24] mpi3mr: add support of event handling part-1 Kashyap Desai
2021-06-01 13:32 ` Hannes Reinecke
2021-05-20 15:25 ` [PATCH v6 07/24] mpi3mr: add support of event handling pcie devices part-2 Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 08/24] mpi3mr: add support of event handling part-3 Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 09/24] mpi3mr: add support for recovering controller Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 10/24] mpi3mr: add support of timestamp sync with firmware Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 11/24] mpi3mr: print ioc info for debugging Kashyap Desai
2021-06-01 13:33 ` Hannes Reinecke
2021-05-20 15:25 ` [PATCH v6 12/24] mpi3mr: add bios_param shost template hook Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 13/24] mpi3mr: implement scsi error handler hooks Kashyap Desai
2021-05-25 14:43 ` Tomas Henzl
2021-05-20 15:25 ` [PATCH v6 14/24] mpi3mr: add change queue depth support Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 15/24] mpi3mr: allow certain commands during pci-remove hook Kashyap Desai
2021-05-20 15:25 ` Kashyap Desai [this message]
2021-05-20 15:25 ` [PATCH v6 17/24] mpi3mr: add support of threaded isr Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 18/24] mpi3mr: add complete support of soft reset Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 19/24] mpi3mr: print pending host ios for debug Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 20/24] mpi3mr: wait for pending IO completions upon detection of VD IO timeout Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 21/24] mpi3mr: add support of PM suspend and resume Kashyap Desai
2021-12-16 23:30 ` Bjorn Helgaas
2021-12-16 23:32 ` Bjorn Helgaas
2021-12-16 23:45 ` Bjorn Helgaas
2021-05-20 15:25 ` [PATCH v6 22/24] mpi3mr: add support of DSN secure fw check Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 23/24] mpi3mr: add eedp dif dix support Kashyap Desai
2021-05-20 15:25 ` [PATCH v6 24/24] mpi3mr: add event handling debug prints Kashyap Desai
2021-06-02 5:11 ` [PATCH v6 00/24] Introducing mpi3mr driver Martin K. Petersen
2021-06-02 5:27 ` Kashyap Desai
2021-06-08 3:05 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210520152545.2710479-17-kashyap.desai@broadcom.com \
--to=kashyap.desai@broadcom.com \
--cc=jejb@linux.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mpi3mr-linuxdrv.pdl@broadcom.com \
--cc=peter.rivera@broadcom.com \
--cc=sathya.prakash@broadcom.com \
--cc=steve.hagan@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox