[PATCHv2 0/4]
Subsystems (2)
v2 cover [PATCHv2 0/4]
Hi all,
based on the ideas from Doug Gilbert here's now my take on using xarrays for devices and targets.
It revolves around two ideas:
- The scsi target 'channel' and 'id' numbers are never ever used to the full 32 bit range; channels are well below 10, and no driver is using more than 16 bits for the id. So we can reduce the type of 'channel' and 'id' to 16 bits, and use the 32 bit value 'channel << 16 | id' as the index into the target xarray.
- Most SCSI LUNs are below 256 (to ensure compability with older systems). So there we can use the LUN number as the index into the xarray; for larger LUN numbers we'll allocate a separate index.
With these changes we can implement an efficient lookup mechanism, devolving into direct lookup for most cases.
And iteration should be as efficient as the current, list-based, approach.
This patchset now survives basic testing, hence I've removed the 'RFC' tag from the initial patchset.
Changes to v1:
- Fixup __scsi_iterate_devices()
- Include reviews from Johannes
- Minor fixes
- Include comments from Doug
Hannes Reinecke (4):
scsi: convert target lookup to xarray
target_core_pscsi: use __scsi_device_lookup()
scsi: move target device list to xarray
scsi: remove direct device lookup per host
drivers/scsi/hosts.c | 3 +- drivers/scsi/scsi.c | 131 ++++++++++++++++++++++++++++--------- drivers/scsi/scsi_lib.c | 9 ++- drivers/scsi/scsi_scan.c | 66 ++++++++----------- drivers/scsi/scsi_sysfs.c | 42 ++++++++---- drivers/target/target_core_pscsi.c | 8 +-- include/scsi/scsi_device.h | 21 +++--- include/scsi/scsi_host.h | 5 +- 8 files changed, 179 insertions(+), 106 deletions(-)
Signature · 1 line
2.16.4
PATCH v2 1/4 scsi: convert target lookup to xarray
Use an xarray instead of lists for holding the scsi targets. I've also shortened the 'channel' and 'id' values to 16 bit as none of the drivers requires a full 32bit range for either of them, and by shortening them we can use them as the index into the xarray for storing the scsi_target pointer.
--- drivers/scsi/hosts.c | 2 +- drivers/scsi/scsi.c | 33 +++++++++++++++++++++++---------- drivers/scsi/scsi_scan.c | 43 ++++++++++++++++--------------------------- drivers/scsi/scsi_sysfs.c | 15 +++++++++++---- include/scsi/scsi_device.h | 4 ++-- include/scsi/scsi_host.h | 2 +- 6 files changed, 54 insertions(+), 45 deletions(-)
drivers/scsi/hosts.c +1 -1
@@ -383,7 +383,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)spin_lock_init (shost->host_lock); shost->shost_state =SHOST_CREATED ;INIT_LIST_HEAD (&shost->__devices); -INIT_LIST_HEAD (&shost->__targets); +xa_init (&shost->__targets);INIT_LIST_HEAD (&shost->eh_cmd_q);INIT_LIST_HEAD (&shost->starved_list);init_waitqueue_head (&shost->host_wait);
drivers/scsi/scsi.c +23 -10
@@ -575,6 +575,19 @@ struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *shost, }EXPORT_SYMBOL (__scsi_iterate_devices); +/** +* __scsi_target_lookup - find a target based on channel and target id +* @shost: SCSI host pointer +* @channel: channel number of the target +* @id: ID of the target +* +*/ +static struct scsi_target *__scsi_target_lookup (struct Scsi_Host *shost, +u16 channel,u16 id) +{ +return xa_load (&shost->__targets, (channel <<16 ) | id); +} +/** * starget_for_each_device - helper to walk all devices of a target * @starget: target whose devices we want to iterate over.
@@ -701,19 +714,19 @@ EXPORT_SYMBOL(scsi_device_lookup_by_target);* really want to use scsi_device_lookup instead. **/ struct scsi_device *__scsi_device_lookup (struct Scsi_Host *shost, -uint channel,uint id,u64 lun) +u16 channel,u16 id,u64 lun) { +struct scsi_target *starget;struct scsi_device *sdev; -list_for_each_entry (sdev, &shost->__devices, siblings) { -if (sdev->sdev_state ==SDEV_DEL ) -continue ; -if (sdev->channel == channel && sdev->id == id && - sdev->lun ==lun) -return sdev; - } + starget =__scsi_target_lookup (shost, channel, id); +if (!starget) +return NULL ; + sdev =__scsi_device_lookup_by_target (starget, lun); +if (sdev && sdev->sdev_state ==SDEV_DEL ) + sdev =NULL ; -return NULL ; +return sdev; }EXPORT_SYMBOL (__scsi_device_lookup);
@@ -729,7 +742,7 @@ EXPORT_SYMBOL(__scsi_device_lookup);* needs to be released with scsi_device_put once you're done with it. **/ struct scsi_device *scsi_device_lookup (struct Scsi_Host *shost, -uint channel,uint id,u64 lun) +u16 channel,u16 id,u64 lun) {struct scsi_device *sdev;unsigned long flags;
drivers/scsi/scsi_scan.c +16 -27
86 lines not on this page · raw message
drivers/scsi/scsi_sysfs.c +11 -4
@@ -1512,15 +1512,19 @@ void scsi_remove_target(struct device *dev) {struct Scsi_Host *shost =dev_to_shost (dev->parent);struct scsi_target *starget; +unsigned long tid =0 ;unsigned long flags; -restart:spin_lock_irqsave (shost->host_lock, flags); -list_for_each_entry (starget, &shost->__targets, siblings) { + starget =xa_find (&shost->__targets, &tid,ULONG_MAX ,XA_PRESENT ); +while (starget) {if (starget->state ==STARGET_DEL || starget->state ==STARGET_REMOVE || - starget->state ==STARGET_CREATED_REMOVE ) + starget->state ==STARGET_CREATED_REMOVE ) { + starget =xa_find_after (&shost->__targets, &tid, +ULONG_MAX ,XA_PRESENT );continue ; + }if (starget->dev.parent == dev || &starget->dev == dev) {kref_get (&starget->reap_ref);if (starget->state ==STARGET_CREATED )
@@ -1530,7 +1534,10 @@ void scsi_remove_target(struct device *dev)spin_unlock_irqrestore (shost->host_lock, flags);__scsi_remove_target (starget);scsi_target_reap (starget); - goto restart; +spin_lock_irqsave (shost->host_lock, flags); + starget =xa_find_after (&shost->__targets, &tid, +ULONG_MAX ,XA_PRESENT ); +continue ; } }spin_unlock_irqrestore (shost->host_lock, flags);
include/scsi/scsi_device.h +2 -2
@@ -345,9 +345,9 @@ extern struct scsi_device *scsi_device_from_queue(struct request_queue *q);extern int __must_check scsi_device_get (struct scsi_device *);extern void scsi_device_put (struct scsi_device *);extern struct scsi_device *scsi_device_lookup (struct Scsi_Host *, -uint ,uint ,u64 ); +u16 ,u16 ,u64 );extern struct scsi_device *__scsi_device_lookup (struct Scsi_Host *, -uint ,uint ,u64 ); +u16 ,u16 ,u64 );extern struct scsi_device *scsi_device_lookup_by_target (struct scsi_target *,u64 ); extern struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *,
include/scsi/scsi_host.h +1 -1
@@ -521,7 +521,7 @@ struct Scsi_Host {* access this list directly from a driver. */ struct list_head __devices; -struct list_head __targets; +struct xarray __targets;struct list_head starved_list;
Signature · 1 line
2.16.4
Re: [PATCH 1/4] scsi: convert target lookup to xarray
drivers/scsi/scsi.c EXPORT_SYMBOL(scsi_device_lookup_by_target); · line 727
Quoted 3 lines · Hannes Reinecke
drivers/scsi/scsi.c +3
-0+ sdev =__scsi_device_lookup_by_target (starget, lun); +if (sdev && sdev->sdev_state ==SDEV_DEL ) + sdev =NULL ;
Nope, still there.
PATCH v2 2/4 target_core_pscsi: use __scsi_device_lookup()
In reply to Hannes ReineckeInstead of walking the list of devices manually use the helper function to return the device directly.
--- drivers/target/target_core_pscsi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/target/target_core_pscsi.c +3 -5
@@ -496,11 +496,9 @@ static int pscsi_configure_device(struct se_device *dev) }spin_lock_irq (sh->host_lock); -list_for_each_entry (sd, &sh->__devices, siblings) { -if ((pdv->pdv_channel_id != sd->channel) || - (pdv->pdv_target_id != sd->id) || - (pdv->pdv_lun_id != sd->lun)) -continue ; + sd =__scsi_device_lookup (sh, pdv->pdv_channel_id, + pdv->pdv_target_id, pdv->pdv_lun_id); +if (sd) {/* * Functions will release the held struct scsi_host->host_lock * before calling calling pscsi_add_device_to_list() to register
Signature · 1 line
2.16.4
PATCH v2 3/4 scsi: move target device list to xarray
In reply to Hannes ReineckeUse xarray for device lookup by target. LUNs below 256 are linear, and can be used directly as the index into the xarray. LUNs above 256 have a distinct LUN format, and are not necessarily linear. They'll be stored in indices above 256 in the xarray, with the next free index in the xarray.
--- drivers/scsi/scsi.c | 39 ++++++++++++++++++++------------------- drivers/scsi/scsi_lib.c | 9 ++++----- drivers/scsi/scsi_scan.c | 3 +-- drivers/scsi/scsi_sysfs.c | 17 +++++++++++++++-- include/scsi/scsi_device.h | 4 ++-- 5 files changed, 42 insertions(+), 30 deletions(-)
drivers/scsi/scsi.c +20 -19
@@ -601,13 +601,14 @@ static struct scsi_target *__scsi_target_lookup(struct Scsi_Host *shost,void starget_for_each_device (struct scsi_target *starget,void *data,void (*fn)(struct scsi_device *,void *)) { -struct Scsi_Host *shost =dev_to_shost (starget->dev.parent);struct scsi_device *sdev; +unsigned long lun_id =0 ; -shost_for_each_device (sdev, shost) { -if ((sdev->channel == starget->channel) && - (sdev->id == starget->id)) -fn (sdev, data); +xa_for_each (&starget->devices, lun_id, sdev) { +if (scsi_device_get (sdev)) +continue ; +fn (sdev, data); +scsi_device_put (sdev); } }EXPORT_SYMBOL (starget_for_each_device);
@@ -629,14 +630,11 @@ EXPORT_SYMBOL(starget_for_each_device);void __starget_for_each_device (struct scsi_target *starget,void *data,void (*fn)(struct scsi_device *,void *)) { -struct Scsi_Host *shost =dev_to_shost (starget->dev.parent);struct scsi_device *sdev; +unsigned long lun_id =0 ; -__shost_for_each_device (sdev, shost) { -if ((sdev->channel == starget->channel) && - (sdev->id == starget->id)) -fn (sdev, data); - } +xa_for_each (&starget->devices, lun_id, sdev) +fn (sdev, data); }EXPORT_SYMBOL (__starget_for_each_device);
@@ -659,11 +657,19 @@ struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *starget, u64 lun) {struct scsi_device *sdev; +unsigned long lun_idx =256 ; + +if (lun < lun_idx) { + sdev =xa_load (&starget->devices, lun); +if (sdev && sdev->sdev_state ==SDEV_DEL ) + sdev =NULL ; +return sdev; + } -list_for_each_entry (sdev, &starget->devices, same_target_siblings) { +xa_for_each (&starget->devices, lun_idx, sdev) {if (sdev->sdev_state ==SDEV_DEL )continue ; -if (sdev->lun ==lun) +if (sdev->lun == lun)return sdev; }
@@ -717,16 +723,11 @@ struct scsi_device *__scsi_device_lookup(struct Scsi_Host *shost, u16 channel, u16 id, u64 lun) {struct scsi_target *starget; -struct scsi_device *sdev; starget =__scsi_target_lookup (shost, channel, id);if (!starget)return NULL ; - sdev =__scsi_device_lookup_by_target (starget, lun); -if (sdev && sdev->sdev_state ==SDEV_DEL ) - sdev =NULL ; - -return sdev; +return __scsi_device_lookup_by_target (starget, lun); }EXPORT_SYMBOL (__scsi_device_lookup);
drivers/scsi/scsi_lib.c +4 -5
@@ -361,9 +361,9 @@ static void scsi_kick_queue(struct request_queue *q)static void scsi_single_lun_run (struct scsi_device *current_sdev) {struct Scsi_Host *shost = current_sdev->host; -struct scsi_device *sdev, *tmp; +struct scsi_device *sdev;struct scsi_target *starget =scsi_target (current_sdev); -unsigned long flags; +unsigned long flags, lun_id =0 ;spin_lock_irqsave (shost->host_lock, flags); starget->starget_sdev_user =NULL ;
@@ -380,8 +380,7 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)spin_lock_irqsave (shost->host_lock, flags);if (starget->starget_sdev_user) goto out; -list_for_each_entry_safe (sdev, tmp, &starget->devices, - same_target_siblings) { +xa_for_each (&starget->devices, lun_id, sdev) {if (sdev == current_sdev)continue ;if (scsi_device_get (sdev))
@@ -390,9 +389,9 @@ static void scsi_single_lun_run(struct scsi_device *current_sdev)spin_unlock_irqrestore (shost->host_lock, flags);scsi_kick_queue (sdev->request_queue);spin_lock_irqsave (shost->host_lock, flags); -scsi_device_put (sdev); } + out:spin_unlock_irqrestore (shost->host_lock, flags); }
drivers/scsi/scsi_scan.c +1 -2
@@ -235,7 +235,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,mutex_init (&sdev->state_mutex); sdev->sdev_state =SDEV_CREATED ;INIT_LIST_HEAD (&sdev->siblings); -INIT_LIST_HEAD (&sdev->same_target_siblings);INIT_LIST_HEAD (&sdev->starved_entry);INIT_LIST_HEAD (&sdev->event_list);spin_lock_init (&sdev->list_lock);
@@ -417,7 +416,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, starget->id = id; starget->channel = channel; starget->can_queue =0 ; -INIT_LIST_HEAD (&starget->devices); +xa_init (&starget->devices); starget->state =STARGET_CREATED ; starget->scsi_level =SCSI_2 ; starget->max_target_blocked =SCSI_DEFAULT_TARGET_BLOCKED ;
drivers/scsi/scsi_sysfs.c +15 -2
@@ -434,6 +434,7 @@ static void scsi_device_cls_release(struct device *class_dev)static void scsi_device_dev_release_usercontext (struct work_struct *work) {struct scsi_device *sdev; +struct scsi_target *starget;struct device *parent;struct list_head *this, *tmp;struct scsi_vpd *vpd_pg80 =NULL , *vpd_pg83 =NULL ;
@@ -441,6 +442,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)unsigned long flags; sdev = container_of(work, struct scsi_device, ew.work); + starget = sdev->sdev_target;scsi_dh_release_device (sdev);
@@ -448,7 +450,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)spin_lock_irqsave (sdev->host->host_lock, flags);list_del (&sdev->siblings); -list_del (&sdev->same_target_siblings); +xa_erase (&starget->devices, sdev->lun_idx);list_del (&sdev->starved_entry);spin_unlock_irqrestore (sdev->host->host_lock, flags);
@@ -1621,7 +1623,18 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)transport_setup_device (&sdev->sdev_gendev);spin_lock_irqsave (shost->host_lock, flags); -list_add_tail (&sdev->same_target_siblings, &starget->devices); +if (sdev->lun <256 ) { + sdev->lun_idx = sdev->lun; +WARN_ON (xa_insert (&starget->devices, sdev->lun_idx, + sdev,GFP_KERNEL ) <0 ); + }else { +struct xa_limit scsi_lun_limit = { + .min =256 , + .max =UINT_MAX , + }; +WARN_ON (xa_alloc (&starget->devices, &sdev->lun_idx, + sdev, scsi_lun_limit,GFP_KERNEL ) <0 ); + }list_add_tail (&sdev->siblings, &shost->__devices);spin_unlock_irqrestore (shost->host_lock, flags);/*
include/scsi/scsi_device.h +2 -2
@@ -104,7 +104,6 @@ struct scsi_device {/* the next two are protected by the host->host_lock */ struct list_head siblings;/* list of all devices on this host */ -struct list_head same_target_siblings;/* just the devices sharing same target id */ atomic_t device_busy;/* commands actually active on LLDD */ atomic_t device_blocked;/* Device returned QUEUE_FULL. */
@@ -123,6 +122,7 @@ struct scsi_device {unsigned int id, channel;u64 lun; +unsigned int lun_idx;/* Index into target device xarray */ unsigned int manufacturer;/* Manufacturer of device, for using * vendor-specific cmd's */ unsigned sector_size;/* size in bytes */
@@ -285,7 +285,7 @@ enum scsi_target_state {struct scsi_target {struct scsi_device *starget_sdev_user;struct list_head siblings; -struct list_head devices; +struct xarray devices;struct device dev;struct kref reap_ref;/* last put renders target invisible */ unsigned int channel;
Signature · 1 line
2.16.4
PATCH v2 4/4 scsi: remove direct device lookup per host
In reply to Hannes ReineckeDrop the per-host device list for direct lookup and iterate over the targets and devices xarrays instead.
As both are now using xarrays the lookup is more efficient as we can use the provided indices based on the HCTL id to do a direct lookup instead of traversing lists.
--- drivers/scsi/hosts.c | 1 - drivers/scsi/scsi.c | 67 +++++++++++++++++++++++++++++++++++++++++----- drivers/scsi/scsi_scan.c | 20 ++++++++------ drivers/scsi/scsi_sysfs.c | 10 ++----- include/scsi/scsi_device.h | 13 +++++---- include/scsi/scsi_host.h | 3 +-- 6 files changed, 84 insertions(+), 30 deletions(-)
drivers/scsi/hosts.c +0 -1
@@ -382,7 +382,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) shost->host_lock = &shost->default_lock;spin_lock_init (shost->host_lock); shost->shost_state =SHOST_CREATED ; -INIT_LIST_HEAD (&shost->__devices);xa_init (&shost->__targets);INIT_LIST_HEAD (&shost->eh_cmd_q);INIT_LIST_HEAD (&shost->starved_list);
drivers/scsi/scsi.c +61 -6
85 lines not on this page · raw message
drivers/scsi/scsi_scan.c +12 -8
@@ -234,7 +234,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, sdev->channel = starget->channel;mutex_init (&sdev->state_mutex); sdev->sdev_state =SDEV_CREATED ; -INIT_LIST_HEAD (&sdev->siblings);INIT_LIST_HEAD (&sdev->starved_entry);INIT_LIST_HEAD (&sdev->event_list);spin_lock_init (&sdev->list_lock);
@@ -1847,17 +1846,22 @@ EXPORT_SYMBOL(scsi_scan_host);void scsi_forget_host (struct Scsi_Host *shost) { +struct scsi_target *starget;struct scsi_device *sdev;unsigned long flags; +unsigned long tid =0 ; - restart:spin_lock_irqsave (shost->host_lock, flags); -list_for_each_entry (sdev, &shost->__devices, siblings) { -if (sdev->sdev_state ==SDEV_DEL ) -continue ; -spin_unlock_irqrestore (shost->host_lock, flags); -__scsi_remove_device (sdev); - goto restart; +xa_for_each (&shost->__targets, tid, starget) { +unsigned long lun_id =0 ; + +xa_for_each (&starget->devices, lun_id, sdev) { +if (sdev->sdev_state ==SDEV_DEL ) +continue ; +spin_unlock_irqrestore (shost->host_lock, flags); +__scsi_remove_device (sdev); +spin_lock_irqsave (shost->host_lock, flags); + } }spin_unlock_irqrestore (shost->host_lock, flags); }
drivers/scsi/scsi_sysfs.c +2 -8
@@ -449,7 +449,6 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) parent = sdev->sdev_gendev.parent;spin_lock_irqsave (sdev->host->host_lock, flags); -list_del (&sdev->siblings);xa_erase (&starget->devices, sdev->lun_idx);list_del (&sdev->starved_entry);spin_unlock_irqrestore (sdev->host->host_lock, flags);
@@ -1476,19 +1475,16 @@ static void __scsi_remove_target(struct scsi_target *starget)struct Scsi_Host *shost =dev_to_shost (starget->dev.parent);unsigned long flags;struct scsi_device *sdev; +unsigned long lun_idx =0 ;spin_lock_irqsave (shost->host_lock, flags); - restart: -list_for_each_entry (sdev, &shost->__devices, siblings) { +xa_for_each (&starget->devices, lun_idx, sdev) {/* * We cannot call scsi_device_get() here, as * we might've been called from rmmod() causing * scsi_device_get() to fail the module_is_live() * check. */ -if (sdev->channel != starget->channel || - sdev->id != starget->id) -continue ;if (sdev->sdev_state ==SDEV_DEL || sdev->sdev_state ==SDEV_CANCEL || !get_device (&sdev->sdev_gendev))
@@ -1497,7 +1493,6 @@ static void __scsi_remove_target(struct scsi_target *starget)scsi_remove_device (sdev);put_device (&sdev->sdev_gendev);spin_lock_irqsave (shost->host_lock, flags); - goto restart; }spin_unlock_irqrestore (shost->host_lock, flags); }
@@ -1635,7 +1630,6 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)WARN_ON (xa_alloc (&starget->devices, &sdev->lun_idx, sdev, scsi_lun_limit,GFP_KERNEL ) <0 ); } -list_add_tail (&sdev->siblings, &shost->__devices);spin_unlock_irqrestore (shost->host_lock, flags);/* * device can now only be removed via __scsi_remove_device() so hold
include/scsi/scsi_device.h +8 -5
@@ -102,9 +102,6 @@ struct scsi_device {struct Scsi_Host *host;struct request_queue *request_queue; -/* the next two are protected by the host->host_lock */ -struct list_head siblings;/* list of all devices on this host */ -atomic_t device_busy;/* commands actually active on LLDD */ atomic_t device_blocked;/* Device returned QUEUE_FULL. */
@@ -376,6 +373,10 @@ extern struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *, (sdev); \ (sdev) = __scsi_iterate_devices((shost), (sdev))) +/* only exposed to implement shost_for_each_device */ +struct scsi_device *__scsi_iterate_devices_unlocked (struct Scsi_Host *, +struct scsi_device *); +/** * __shost_for_each_device - iterate over all devices of a host (UNLOCKED) * @sdev: the &struct scsi_device to use as a cursor
@@ -389,8 +390,10 @@ extern struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *,* device list in interrupt context. Otherwise you really want to use * shost_for_each_device instead. */ -#define __shost_for_each_device (sdev, shost) \ - list_for_each_entry((sdev), &((shost)->__devices), siblings) +#define __shost_for_each_device (sdev, shost) \ + for((sdev) = __scsi_iterate_devices_unlocked((shost), NULL); \ + (sdev); \ + (sdev) = __scsi_iterate_devices_unlocked((shost),(sdev)))extern int scsi_change_queue_depth (struct scsi_device *,int );extern int scsi_track_queue_full (struct scsi_device *,int );
include/scsi/scsi_host.h +1 -2
@@ -520,9 +520,8 @@ struct Scsi_Host {* their __ prefixed variants with the lock held. NEVER * access this list directly from a driver. */ -struct list_head __devices;struct xarray __targets; - +struct list_head starved_list;spinlock_t default_lock;
Signature · 1 line
2.16.4