| Message ID | 1447939026-25306-1-git-send-email-vkuznets@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
This looks like a good compromise:
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>> "Vitaly" == Vitaly Kuznetsov <vkuznets@redhat.com> writes:
Vitaly> Some host adapters (e.g. Hyper-V storvsc) are known for not
Vitaly> respecting the SPC-2/3/4 requirement for 'INQUIRY data (see
Vitaly> table ...) shall contain at least 36 bytes'. As a result we get
Vitaly> tons on 'scsi 0:7:1:1: scsi scan: INQUIRY result too short (5),
Vitaly> using 36' messages on console. This can be problematic for slow
Vitaly> consoles. Introduce short_inquiry flag in struct Scsi_Host to
Vitaly> print the message once per host.
Applied to the 4.4 queue.
On 11/19/2015 02:17 PM, Vitaly Kuznetsov wrote: > Some host adapters (e.g. Hyper-V storvsc) are known for not respecting the > SPC-2/3/4 requirement for 'INQUIRY data (see table ...) shall contain at > least 36 bytes'. As a result we get tons on 'scsi 0:7:1:1: scsi scan: > INQUIRY result too short (5), using 36' messages on console. This can be > problematic for slow consoles. Introduce short_inquiry flag in struct > Scsi_Host to print the message once per host. > > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> > --- > Changes since v3 RESEND: > - No changes, this is just a RESEND. > > Changes since v3: > - No changes, this is just a RESEND. > > Changes since v2: > - This is a successor of previously sent (and still not merged) "scsi: > introduce short_inquiry flag for broken host adapters" patch. I'm not > particularly sure which solution is better but I'm leaning towards this > one as it doesn't require changes to adapter drivers. > --- > drivers/scsi/scsi_scan.c | 9 ++++++--- > include/scsi/scsi_host.h | 3 +++ > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index 8324539..054923e 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -701,9 +701,12 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, > * strings. > */ > if (sdev->inquiry_len < 36) { > - sdev_printk(KERN_INFO, sdev, > - "scsi scan: INQUIRY result too short (%d)," > - " using 36\n", sdev->inquiry_len); > + if (!sdev->host->short_inquiry) { > + shost_printk(KERN_INFO, sdev->host, > + "scsi scan: INQUIRY result too short (%d)," > + " using 36\n", sdev->inquiry_len); > + sdev->host->short_inquiry = 1; > + } > sdev->inquiry_len = 36; > } > > diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h > index ed52712..fcfa3d7 100644 > --- a/include/scsi/scsi_host.h > +++ b/include/scsi/scsi_host.h > @@ -668,6 +668,9 @@ struct Scsi_Host { > unsigned use_blk_mq:1; > unsigned use_cmd_list:1; > > + /* Host responded with short (<36 bytes) INQUIRY result */ > + unsigned short_inquiry:1; > + > /* > * Optional work queue to be utilized by the transport > */ > Ok, that's fine with me. Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 8324539..054923e 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -701,9 +701,12 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, * strings. */ if (sdev->inquiry_len < 36) { - sdev_printk(KERN_INFO, sdev, - "scsi scan: INQUIRY result too short (%d)," - " using 36\n", sdev->inquiry_len); + if (!sdev->host->short_inquiry) { + shost_printk(KERN_INFO, sdev->host, + "scsi scan: INQUIRY result too short (%d)," + " using 36\n", sdev->inquiry_len); + sdev->host->short_inquiry = 1; + } sdev->inquiry_len = 36; } diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index ed52712..fcfa3d7 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -668,6 +668,9 @@ struct Scsi_Host { unsigned use_blk_mq:1; unsigned use_cmd_list:1; + /* Host responded with short (<36 bytes) INQUIRY result */ + unsigned short_inquiry:1; + /* * Optional work queue to be utilized by the transport */
Some host adapters (e.g. Hyper-V storvsc) are known for not respecting the SPC-2/3/4 requirement for 'INQUIRY data (see table ...) shall contain at least 36 bytes'. As a result we get tons on 'scsi 0:7:1:1: scsi scan: INQUIRY result too short (5), using 36' messages on console. This can be problematic for slow consoles. Introduce short_inquiry flag in struct Scsi_Host to print the message once per host. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> --- Changes since v3 RESEND: - No changes, this is just a RESEND. Changes since v3: - No changes, this is just a RESEND. Changes since v2: - This is a successor of previously sent (and still not merged) "scsi: introduce short_inquiry flag for broken host adapters" patch. I'm not particularly sure which solution is better but I'm leaning towards this one as it doesn't require changes to adapter drivers. --- drivers/scsi/scsi_scan.c | 9 ++++++--- include/scsi/scsi_host.h | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-)