scsi: core: add re-probe logic into SCSI rescan
PATCH v4 1/1 scsi: core: add re-probe logic into SCSI rescan
SCSI rescanning will skip updating inquiry data if a device has already been created. This means that if a target changes the inquiry data of a device whether or not a unit attention is posted that will not ever be changed on a device.
This is a particular problem for handling the ALUA unavailable state which requires setting the peripheral qualifier on a LUN. This toggling of that value makes it impossible without this functionality to properly handle that state.
Additionally this fixes the updating of inquiry data when a unit attention of inquiry data has changed is returned from the target.
I created a blktest that shows that the reprobe functionality works as expected. I am not sure about the order of checking that it though since it will fail with this change.
--- drivers/scsi/scsi.c | 159 ++++++++++++++++++++ drivers/scsi/scsi_scan.c | 300 ++++++++++++++++++++++++++----------- drivers/scsi/scsi_sysfs.c | 70 ++++++++- include/scsi/scsi.h | 171 +++++++++++++++++++++ include/scsi/scsi_device.h | 2 + 5 files changed, 611 insertions(+), 91 deletions(-)
drivers/scsi/scsi.c +159 -0
@@ -61,6 +61,7 @@#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> #include <scsi/scsi_device.h> +#include <scsi/scsi_devinfo.h> #include <scsi/scsi_driver.h> #include <scsi/scsi_eh.h> #include <scsi/scsi_host.h>
@@ -549,6 +550,164 @@ void scsi_attach_vpd(struct scsi_device *sdev)kfree (vpd_buf); } +/** +* scsi_update_inquiry_data - Update standard INQUIRY data for a SCSI device +* @sdev: The device to update +* @inq_result: Buffer containing new INQUIRY data +* @inq_len: Length of inquiry data +* +* Updates the standard INQUIRY data (vendor, model, rev, peripheral qualifier, +* device type, removable media flag) and capability flags derived from INQUIRY +* data for a SCSI device. This is used during both initial device setup and +* when reprobing a device to get fresh INQUIRY information. The old inquiry +* buffer is freed and replaced with the new data under the protection of +* inquiry_mutex. +* +* Blacklist flags (BLIST_ISROM, BLIST_NOTQ) are respected when updating +* device properties. +* +* Returns: +* 0 on success +* 1 if device type or peripheral qualifier changed (caller should call device_reprobe()) +* -ENOMEM on allocation failure +* -EINVAL if inquiry data is too short +*/ +int scsi_update_inquiry_data (struct scsi_device *sdev, +unsigned char *inq_result,size_t inq_len) +{ +unsigned char *new_inquiry; +unsigned char old_type; +unsigned char old_periph_qual; + +/* +* Ensure we have at least the minimum standard INQUIRY data (36 bytes) +* to safely access device type, vendor, model, rev, and capability flags. +*/ +if (inq_len <SCSI_INQ_STD_LEN ) { +sdev_printk (KERN_WARNING , sdev, +"INQUIRY data too short (%zu bytes), need at least %d\n" , + inq_len,SCSI_INQ_STD_LEN ); +return -EINVAL ; + } + +/* Allocate new inquiry buffer */ + new_inquiry =kmemdup (inq_result,max_t (size_t, inq_len,SCSI_INQ_STD_LEN ), +GFP_KERNEL ); +if (!new_inquiry) +return -ENOMEM ; + +/* Update inquiry data under mutex protection */ +mutex_lock (&sdev->inquiry_mutex); + +/* Save old values to detect changes that require reprobe */ + old_type = sdev->type; + old_periph_qual = sdev->inq_periph_qual; + +kfree (sdev->inquiry); + sdev->inquiry = new_inquiry; + sdev->vendor =scsi_inq_vendor (sdev->inquiry); + sdev->model =scsi_inq_product (sdev->inquiry); + sdev->rev =scsi_inq_revision (sdev->inquiry); + sdev->inq_periph_qual =scsi_inq_periph_qual (inq_result[0 ]); + +/* +* Check if this is an ATA device (SATA emulation layer). +* ATA devices need allow_restart set to work around SATL power +* management specifications. +*/ +if (strncmp (sdev->vendor,"ATA " ,8 ) ==0 ) { + sdev->is_ata =1 ; + sdev->allow_restart =1 ; + }else + sdev->is_ata =0 ; + +/* +* Update device type from INQUIRY byte 0. +* BLIST_ISROM is a quirk for devices that report wrong type but should +* be treated as (removable) CD-ROM. Override to TYPE_ROM as exception. +*/ +if (sdev->sdev_bflags &BLIST_ISROM ) + sdev->type =TYPE_ROM ; +else + sdev->type =scsi_inq_device_type (inq_result[0 ], sdev->lun); + +/* +* Update removable flag from INQUIRY byte 1. +* BLIST_ISROM devices are always removable (exception/quirk). +*/ +if (sdev->sdev_bflags &BLIST_ISROM ) + sdev->removable =1 ; +else + sdev->removable =scsi_inq_removable (inq_result[1 ]); + +/* +* Set lockable to match removable. Devices with removable media +* can typically have their media locked/unlocked via the +* ALLOW_MEDIUM_REMOVAL command. +*/ + sdev->lockable = sdev->removable; + +/* Update capability flags from INQUIRY byte 7 */ + sdev->soft_reset = (scsi_inq_sftre (inq_result[7 ]) && + (scsi_inq_resp_data_fmt (inq_result[3 ]) ==2 )) ?1 :0 ; + +/* +* Update protocol support flags. +* Only update ppr if we have enough INQUIRY data (>56 bytes) to check +* byte 56, or if scsi_level indicates SCSI-3+ support. If we don't have +* enough data, leave ppr unchanged to avoid incorrectly clearing it +* during rescan with short INQUIRY. +*/ +if (sdev->scsi_level >=SCSI_3 || inq_len >56 ) + sdev->ppr = (sdev->scsi_level >=SCSI_3 || + (inq_len >56 && inq_result[56 ] &0x04 )) ?1 :0 ; + sdev->wdtr =scsi_inq_wbus16 (inq_result[7 ]); + sdev->sdtr =scsi_inq_sync (inq_result[7 ]); + +/* +* Update tagged queuing support from INQUIRY byte 7. +* BLIST_NOTQ is an exception to force tagged queuing off. +*/ +if (sdev->sdev_bflags &BLIST_NOTQ ) + sdev->tagged_supported =0 ; +else + sdev->tagged_supported = ((sdev->scsi_level >=SCSI_2 ) && +scsi_inq_cmdque (inq_result[7 ])) ?1 :0 ; + sdev->simple_tags = sdev->tagged_supported; + +mutex_unlock (&sdev->inquiry_mutex); + +/* +* If device type or peripheral qualifier changed, return a special +* code to indicate that caller should trigger device_reprobe() to +* re-match with appropriate upper-layer driver. +* +* - Type changes require different drivers (sd vs sr vs st, etc.) +* - PQ changes affect scsi_bus_match() which only matches PQ == 0 +* +* Note: We check this AFTER updating all fields and releasing the +* mutex, so all INQUIRY-derived data is current regardless of whether +* reprobe is needed. +* +* During initial setup, old values may not be meaningful (type is -1, +* periph_qual is 0), but callers handle this appropriately. +*/ +if (old_type != sdev->type || old_periph_qual != sdev->inq_periph_qual) { +if (old_type != sdev->type) +sdev_printk (KERN_NOTICE , sdev, +"device type changed from %d to %d\n" , + old_type, sdev->type); +if (old_periph_qual != sdev->inq_periph_qual) +sdev_printk (KERN_NOTICE , sdev, +"peripheral qualifier changed from %d to %d\n" , + old_periph_qual, sdev->inq_periph_qual); +return 1 ;/* Type or PQ changed - caller should reprobe */ + } + +return 0 ; +} +EXPORT_SYMBOL (scsi_update_inquiry_data); +/** * scsi_report_opcode - Find out if a given command is supported * @sdev: scsi device to query
drivers/scsi/scsi_scan.c +216 -84
375 lines not on this page · raw message
drivers/scsi/scsi_sysfs.c +63 -7
84 lines not on this page · raw message
include/scsi/scsi.h +171 -0
177 lines not on this page · raw message
include/scsi/scsi_device.h +2 -0
@@ -406,6 +406,8 @@ extern int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh);void scsi_attach_vpd (struct scsi_device *sdev);void scsi_cdl_check (struct scsi_device *sdev);int scsi_cdl_enable (struct scsi_device *sdev,bool enable); +int scsi_update_inquiry_data (struct scsi_device *sdev, +unsigned char *inq_result,size_t inq_len);extern struct scsi_device *scsi_device_from_queue (struct request_queue *q);extern int __must_check scsi_device_get (struct scsi_device *);
Signature · 1 line
2.52.0