scsi: rescan VPD attributes
PATCH 1/1 scsi: rescan VPD attributes
The VPD page information might change, so we need to be able to update it. This patch implements a VPD page rescan whenever the 'rescan' sysfs attribute is triggered.
--- drivers/scsi/scsi.c | 20 +++++++++++++++++--- drivers/scsi/scsi_scan.c | 4 ++++ drivers/scsi/scsi_sysfs.c | 8 ++++++-- drivers/scsi/ses.c | 12 +++++++++--- include/scsi/scsi_device.h | 5 +++-- 5 files changed, 39 insertions(+), 10 deletions(-)
drivers/scsi/scsi.c +17 -3
@@ -803,7 +803,7 @@ void scsi_attach_vpd(struct scsi_device *sdev)int vpd_len =SCSI_VPD_PG_LEN ;int pg80_supported =0 ;int pg83_supported =0 ; -unsigned char *vpd_buf; +unsigned char __rcu *vpd_buf, *orig_vpd_buf =NULL ;if (sdev->skip_vpd_pages)return ;
@@ -849,8 +849,16 @@ retry_pg80:kfree (vpd_buf); goto retry_pg80; } +mutex_lock (&sdev->inquiry_mutex); + orig_vpd_buf = sdev->vpd_pg80; sdev->vpd_pg80_len = result; - sdev->vpd_pg80 = vpd_buf; +rcu_assign_pointer (sdev->vpd_pg80, vpd_buf); +mutex_unlock (&sdev->inquiry_mutex); +synchronize_rcu (); +if (orig_vpd_buf) { +kfree (orig_vpd_buf); + orig_vpd_buf =NULL ; + } vpd_len =SCSI_VPD_PG_LEN ; }
@@ -870,8 +878,14 @@ retry_pg83:kfree (vpd_buf); goto retry_pg83; } +mutex_lock (&sdev->inquiry_mutex); + orig_vpd_buf = sdev->vpd_pg83; sdev->vpd_pg83_len = result; - sdev->vpd_pg83 = vpd_buf; +rcu_assign_pointer (sdev->vpd_pg83, vpd_buf); +mutex_unlock (&sdev->inquiry_mutex); +synchronize_rcu (); +if (orig_vpd_buf) +kfree (orig_vpd_buf); } }
drivers/scsi/scsi_scan.c +4 -0
@@ -236,6 +236,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,INIT_LIST_HEAD (&sdev->starved_entry);INIT_LIST_HEAD (&sdev->event_list);spin_lock_init (&sdev->list_lock); +mutex_init (&sdev->inquiry_mutex);INIT_WORK (&sdev->event_work, scsi_evt_thread);INIT_WORK (&sdev->requeue_work, scsi_requeue_run_queue);
@@ -1517,6 +1518,9 @@ EXPORT_SYMBOL(scsi_add_device);void scsi_rescan_device (struct device *dev) {device_lock (dev); + +scsi_attach_vpd (to_scsi_device (dev)); +if (dev->driver &&try_module_get (dev->driver->owner)) {struct scsi_driver *drv =to_scsi_driver (dev->driver);
drivers/scsi/scsi_sysfs.c +6 -2
@@ -758,11 +758,15 @@ show_vpd_##_page(struct file *filp, struct kobject *kobj, \ { \ struct device *dev = container_of(kobj, struct device, kobj); \struct scsi_device *sdev =to_scsi_device (dev); \ +int ret; \ if (!sdev->vpd_##_page) \return -EINVAL ; \ -return memory_read_from_buffer (buf, count, &off, \ - sdev->vpd_##_page, \ +rcu_read_lock (); \ + ret =memory_read_from_buffer (buf, count, &off, \ + rcu_dereference(sdev->vpd_##_page), \ sdev->vpd_##_page##_len); \ +rcu_read_unlock (); \ +return ret; \ } \ static struct bin_attribute dev_attr_vpd_##_page = { \ .attr = {.name = __stringify(vpd_##_page), .mode = S_IRUGO }, \
drivers/scsi/ses.c +9 -3
@@ -554,17 +554,22 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, struct scsi_device *sdev) {unsigned char *desc; +unsigned char __rcu *vpd_pg83;struct efd efd = { .addr =0 , };ses_enclosure_data_process (edev,to_scsi_device (edev->edev.parent),0 ); -if (!sdev->vpd_pg83_len) +rcu_read_lock (); + vpd_pg83 =rcu_dereference (sdev->vpd_pg83); +if (!vpd_pg83) { +rcu_read_unlock ();return ; + } - desc = sdev->vpd_pg83 +4 ; -while (desc < sdev->vpd_pg83 + sdev->vpd_pg83_len) { + desc = vpd_pg83 +4 ; +while (desc < vpd_pg83 + sdev->vpd_pg83_len) {enum scsi_protocol proto = desc[0 ] >>4 ;u8 code_set = desc[0 ] &0x0f ;u8 piv = desc[1 ] &0x80 ;
@@ -578,6 +583,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, desc += len +4 ; } +rcu_read_unlock ();if (efd.addr) { efd.dev = &sdev->sdev_gendev;
include/scsi/scsi_device.h +3 -2
@@ -109,6 +109,7 @@ struct scsi_device {char type;char scsi_level;char inq_periph_qual;/* PQ from INQUIRY data */ +struct mutex inquiry_mutex;unsigned char inquiry_len;/* valid bytes in 'inquiry' */ unsigned char * inquiry;/* INQUIRY response data */ const char * vendor;/* [back_compat] point into 'inquiry' ... */
@@ -117,9 +118,9 @@ struct scsi_device {#define SCSI_VPD_PG_LEN 255int vpd_pg83_len; -unsigned char *vpd_pg83; +unsigned char __rcu *vpd_pg83;int vpd_pg80_len; -unsigned char *vpd_pg80; +unsigned char __rcu *vpd_pg80;unsigned char current_tag;/* current tag */ struct scsi_target *sdev_target;/* used only for single_lun */
Signature · 1 line
1.8.5.6
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Hannes" == Hannes Reinecke <[email protected]> writes:
Hannes> The VPD page information might change, so we need to be able to Hannes> update it. This patch implements a VPD page rescan whenever the Hannes> 'rescan' sysfs attribute is triggered.
I was looking into merging the ALUA series but this prerequisite patch is lacking reviews...
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Hi Hannes,
I have one probably small nitpick about the patch. I'm not sure how likely what I've put below is likely to happen in real life though.
Is there any chance at all that sdev->vpd_pg83_len could change when updated? If there's any chance of that I'd have expected that both the length of and the pointer to the vpd data would need to be protected not just the pointer so someone would have a consistent picture of the vpd and its length. Without that there is a race where someone could be using a new length with the old vpd data. That leaves the potential for a length that exceeds the vpd size if the new data is larger than the old data - I don't know how likely it is but wanted to at least bring it up as something to consider.
I'm not so concerned about sdev->vpd_pg80_len changing since it should have 1 of 2 fixed sizes and it seems unlikely that once read the first time a device would increase it in size (but for consistency in the code if you make a change you might want to treat them the same way).
Thanks
Shane
Quoted 7 lines · Shane M
Hi Hannes,
I have one probably small nitpick about the patch. I'm not sure how likely what I've put below is likely to happen in real life though.
Is there any chance at all that
sdev->vpd_pg83_lencould change when updated? If there's any chance of that I'd have expected that both the
length of and the pointer to the vpd data
Quoted 1 line
would need to be protected not just the pointer so someone would
have a consistent picture of the vpd
Quoted 1 line
and its length. Without that there is a race where someone could
be using a new length with the old vpd
Quoted 1 line
data. That leaves the potential for a length that exceeds the vpd
size if the new data is larger than
Quoted 1 line
the old data - I don't know how likely it is but wanted to at
least bring it up as something to consider.
Quoted 1 line
Accesses to vpd_pgXX are rcu-protected, so we're ensured that we always see a _valid_ copy. And we know that integer updates are atomic, so we will always see a valid number in vpd_pgXX_len. Both, vpd_pgXX and vpd_pgXX_len, are updated at the same place, and under the same locks/mutexes. And as we're calling 'synchronize_rcu()' after updating vpd_pgXX, which needs to synchronize against all CPUs, I would think that this would take care of updating vpd_pgXX_len, too.
But you are right, we can get rid of vpd_pgXX_len and calculate it from the data.
However, I'd like to do this with another patch after the ALUA changes are in.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 175 lines · Hannes Reinecke
The VPD page information might change, so we need to be able to update it. This patch implements a VPD page rescan whenever the 'rescan' sysfs attribute is triggered.
Signed-off-by Hannes Reinecke <[email protected]>---
drivers/scsi/scsi.c | 20 +++++++++++++++++--- drivers/scsi/scsi_scan.c | 4 ++++ drivers/scsi/scsi_sysfs.c | 8 ++++++-- drivers/scsi/ses.c | 12 +++++++++---include/scsi/scsi_device.h| 5 +++--5 files changed, 39 insertions(+), 10 deletions(-)drivers/scsi/scsi.c +1
-1@@ -803,7 +803,7 @@ void scsi_attach_vpd(struct scsi_device *sdev) int vpd_len = SCSI_VPD_PG_LEN; int pg80_supported = 0; int pg83_supported = 0; -unsigned char *vpd_buf; +unsigned char __rcu *vpd_buf, *orig_vpd_buf =NULL ;
if (sdev->skip_vpd_pages)
return;drivers/scsi/scsi.c +9
-1@@ -849,8 +849,16 @@ retry_pg80: kfree(vpd_buf); goto retry_pg80; } +mutex_lock (&sdev->inquiry_mutex); + orig_vpd_buf = sdev->vpd_pg80; sdev->vpd_pg80_len = result; - sdev->vpd_pg80 = vpd_buf; +rcu_assign_pointer (sdev->vpd_pg80, vpd_buf); +mutex_unlock (&sdev->inquiry_mutex); +synchronize_rcu (); +if (orig_vpd_buf) { +kfree (orig_vpd_buf); + orig_vpd_buf =NULL ; + } vpd_len = SCSI_VPD_PG_LEN; }drivers/scsi/scsi.c +7
-1@@ -870,8 +878,14 @@ retry_pg83: kfree(vpd_buf); goto retry_pg83; } +mutex_lock (&sdev->inquiry_mutex); + orig_vpd_buf = sdev->vpd_pg83; sdev->vpd_pg83_len = result; - sdev->vpd_pg83 = vpd_buf; +rcu_assign_pointer (sdev->vpd_pg83, vpd_buf); +mutex_unlock (&sdev->inquiry_mutex); +synchronize_rcu (); +if (orig_vpd_buf) +kfree (orig_vpd_buf); } }drivers/scsi/scsi_scan.c +1
-0@@ -236,6 +236,7 @@ static struct scsi_device *scsi_alloc_sdev(structscsi_target *starget, INIT_LIST_HEAD(&sdev->starved_entry); INIT_LIST_HEAD(&sdev->event_list); spin_lock_init(&sdev->list_lock); +mutex_init (&sdev->inquiry_mutex); INIT_WORK(&sdev->event_work, scsi_evt_thread); INIT_WORK(&sdev->requeue_work, scsi_requeue_run_queue);drivers/scsi/scsi_scan.c +3
-0@@ -1517,6 +1518,9 @@ EXPORT_SYMBOL(scsi_add_device); void scsi_rescan_device(struct device *dev) { device_lock(dev); + +scsi_attach_vpd (to_scsi_device (dev)); + if (dev->driver && try_module_get(dev->driver->owner)) { struct scsi_driver *drv = to_scsi_driver(dev->driver);drivers/scsi/scsi_sysfs.c +3
-2@@ -758,11 +758,15 @@ show_vpd_##_page(struct file *filp, struct kobject *kobj, \ { \ struct device *dev = container_of(kobj, struct device, kobj); \ struct scsi_device *sdev = to_scsi_device(dev); \ +int ret; \ if (!sdev->vpd_##_page) \ return -EINVAL; \ - return memory_read_from_buffer(buf, count, &off, \ - sdev->vpd_##_page, \ +rcu_read_lock (); \ + ret = memory_read_from_buffer(buf, count, &off,\
drivers/scsi/scsi_sysfs.c +1
-0+ rcu_dereference(sdev->vpd_##_page), \sdev->vpd_##_page##_len); \
drivers/scsi/scsi_sysfs.c +2
-0+rcu_read_unlock (); \ +return ret; \} \
static structbin_attributedev_attr_vpd_##_page = { \
.attr = {.name =__stringify(vpd_##_page), .mode =S_IRUGO},\drivers/scsi/ses.c +1
-0@@ -554,17 +554,22 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, struct scsi_device *sdev) { unsigned char *desc; +unsigned char __rcu *vpd_pg83; struct efd efd = { .addr = 0, };
ses_enclosure_data_process(edev, to_scsi_device(edev->edev.parent), 0);drivers/scsi/ses.c +4
-1-if (!sdev->vpd_pg83_len) +rcu_read_lock (); + vpd_pg83 =rcu_dereference (sdev->vpd_pg83); +if (!vpd_pg83) { +rcu_read_unlock ();return;
drivers/scsi/ses.c +1
-0+ }drivers/scsi/ses.c +2
-2- desc = sdev->vpd_pg83 +4 ; -while (desc < sdev->vpd_pg83 + sdev->vpd_pg83_len) { + desc = vpd_pg83 +4 ; +while (desc < vpd_pg83 + sdev->vpd_pg83_len) {enum
scsi_protocolproto = desc[0] >> 4; u8code_set= desc[0] &0x0f; u8 piv = desc[1] &0x80;drivers/scsi/ses.c +0
-0@@ -578,6 +583,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
desc += len + 4;
}drivers/scsi/ses.c +1
-0+rcu_read_unlock ();if (efd.addr) {
efd.dev =&sdev->sdev_gendev;include/scsi/scsi_device.h +0
-0@@ -109,6 +109,7 @@ struct scsi_device { char type; char scsi_level;char
inq_periph_qual; /* PQ from INQUIRY data */include/scsi/scsi_device.h +1
-0+struct mutex inquiry_mutex;unsigned char
inquiry_len; /* valid bytes in 'inquiry' */
unsigned char * inquiry; /* INQUIRY response data */
const char * vendor; /* [back_compat] point into
'inquiry' ... */include/scsi/scsi_device.h +0
-0@@ -117,9 +118,9 @@ struct scsi_device {
#define SCSI_VPD_PG_LEN 255
intvpd_pg83_len;include/scsi/scsi_device.h +1
-1-unsigned char *vpd_pg83; +unsigned char __rcu *vpd_pg83;int
vpd_pg80_len;include/scsi/scsi_device.h +1
-1-unsigned char *vpd_pg80; +unsigned char __rcu *vpd_pg80;
Quoted 4 lines
unsigned char
current_tag; /* current tag */
struct scsi_target *sdev_target; /* used only forsingle_lun*/
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines
The VPD page information might change, so we need to be able to update it. This patch implements a VPD page rescan whenever the 'rescan' sysfs attribute is triggered.
Signed-off-by Hannes Reinecke <[email protected]>---
Martin K. Petersen
AppliedQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Hannes" == Hannes Reinecke <[email protected]> writes:
Hannes> The VPD page information might change, so we need to be able to Hannes> update it. This patch implements a VPD page rescan whenever the Hannes> 'rescan' sysfs attribute is triggered.
Applied to 4.5/scsi-queue.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering