libata: Honor RQF_QUIET flag

Currently, libata ignores requests RQF_QUIET flag and print error
messages for failed commands, regardless if this flag is set in the
command request. Fix this by introducing the ata_eh_quiet() function and
using this function in ata_eh_link_autopsy() to determine if the EH
context should be quiet. This works by counting the number of failed
commands and the number of commands with the quiet flag set. If both
numbers are equal, the the EH context can be set to quiet and all error
messages suppressed. Otherwise, only the error messages for the failed
commands are suppressed and the link Emask and irq_stat messages printed.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index e85ab60..b933357 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2153,6 +2153,21 @@ static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc)
        return qc->err_mask != AC_ERR_DEV;  /* retry if not dev error */
 }
 
+/**
+ *      ata_eh_quiet - check if we need to be quiet about a command error
+ *      @qc: qc to check
+ *
+ *      Look at the qc flags anbd its scsi command request flags to determine
+ *      if we need to be quiet about the command failure.
+ */
+static inline bool ata_eh_quiet(struct ata_queued_cmd *qc)
+{
+       if (qc->scsicmd &&
+           qc->scsicmd->request->rq_flags & RQF_QUIET)
+               qc->flags |= ATA_QCFLAG_QUIET;
+       return qc->flags & ATA_QCFLAG_QUIET;
+}
+
 /**
  *     ata_eh_link_autopsy - analyze error and determine recovery action
  *     @link: host link to perform autopsy on
@@ -2170,7 +2185,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
        struct ata_eh_context *ehc = &link->eh_context;
        struct ata_device *dev;
        unsigned int all_err_mask = 0, eflags = 0;
-       int tag;
+       int tag, nr_failed = 0, nr_quiet = 0;
        u32 serror;
        int rc;
 
@@ -2236,8 +2251,17 @@ static void ata_eh_link_autopsy(struct ata_link *link)
                if (qc->flags & ATA_QCFLAG_IO)
                        eflags |= ATA_EFLAG_IS_IO;
                trace_ata_eh_link_autopsy_qc(qc);
+
+               /* Count quiet errors */
+               if (ata_eh_quiet(qc))
+                       nr_quiet++;
+               nr_failed++;
        }
 
+       /* If all failed commands requested silence, then be quiet */
+       if (nr_quiet == nr_failed)
+               ehc->i.flags |= ATA_EHI_QUIET;
+
        /* enforce default EH actions */
        if (ap->pflags & ATA_PFLAG_FROZEN ||
            all_err_mask & (AC_ERR_HSM | AC_ERR_TIMEOUT))

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 89a9d4a..8d76de9 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -872,6 +872,9 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
 
                qc->sg = scsi_sglist(cmd);
                qc->n_elem = scsi_sg_count(cmd);
+
+               if (cmd->request->rq_flags & RQF_QUIET)
+                       qc->flags |= ATA_QCFLAG_QUIET;
        } else {
                cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1);
                cmd->scsi_done(cmd);