scsi: enable reserved commands for LLDDs
Subsystems (9)
v4 cover scsi: enable reserved commands for LLDDs
Hi all,
quite some drivers use internal commands for various purposes, most commonly sending TMFs or querying the HBA status.
While these commands use the same submission mechanism than normal I/O commands, they will not be counted as outstanding commands, requiring those drivers to implement their own mechanism to figure out outstanding commands.
The block layer already has the concept of 'reserved' tags for precisely this purpose, namely non-I/O tags which live off a separate tag pool. That guarantees that these commands can always be sent, and won't be influenced by tag starvation from the I/O tag pool. This patchset enables the use of reserved tags for the SCSI midlayer by allocating a virtual LUN for the HBA itself which just serves as a resource to allocate valid tags from.
This removes quite some hacks which were required for some drivers (eg. fnic or snic), and allows the use of tagset iterators within the drivers.
The entire patchset can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/hare/scsi-devel.git reserved-tags.v4
As usual, comments and reviews are welcome.
Changes to v3:
- Kill gdth
- Only convert fnic, snic, hpsa, and aacraid
- Drop command emulation for pseudo host device
- make 'can_queue' exclude the number or reserved tags
- Drop persistent commands proposal
- Sanitize host device handling
Changes to v2:
- Update patches from John Garry
- Use virtual LUN as suggested by Christoph
- Improve SCSI Host device to present a real SCSI device
- Implement 'persistent' commands for AENs
- Convert Megaraid SAS
Changes to v1:
- Make scsi_{get, put}_reserved_cmd() for Scsi host
- Previously we separate scsi_{get, put}_reserved_cmd() for sdev and scsi_host_get_reserved_cmd() for the host
- Fix how Scsi_Host.can_queue is set in the virtio-scsi change
- Drop Scsi_Host.use_reserved_cmd_q
- Drop scsi_is_reserved_cmd()
- Add support in libsas and associated HBA drivers
- Allocate reserved command in slow task
- Switch hisi_sas to use reserved Scsi command
- Reorder the series a little
- Some tidying
Hannes Reinecke (22):
scsi: drop gdth driver
block: add flag for internal commands
scsi: add scsi_{get,put}_internal_cmd() helper
fnic: use internal commands
fnic: use scsi_host_busy_iter() to traverse commands
fnic: check for started requests in fnic_wq_copy_cleanup_handler()
csiostor: use internal command for LUN reset
scsi: implement reserved command handling
scsi: use real inquiry data when initialising devices
scsi: Use dummy inquiry data for the host device
scsi: revamp host device handling
snic: use reserved commands
snic: use tagset iter for traversing commands
snic: check for started requests in snic_hba_reset_cmpl_handler()
hpsa: move hpsa_hba_inquiry after scsi_add_host()
hpsa: use reserved commands
hpsa: use scsi_host_busy_iter() to traverse outstanding commands
hpsa: drop refcount field from CommandList
aacraid: move scsi_add_host()
aacraid: store target id in host_scribble
aacraid: use scsi_get_internal_cmd()
aacraid: use scsi_host_busy_iter() to traverse outstanding commands
Documentation/kbuild/makefiles.rst | 4 +- Documentation/process/magic-number.rst | 2 - Documentation/scsi/scsi-parameters.rst | 3 - Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - block/blk-exec.c | 5 + drivers/scsi/Kconfig | 14 - drivers/scsi/Makefile | 2 - drivers/scsi/aacraid/aachba.c | 137 +- drivers/scsi/aacraid/aacraid.h | 9 +- drivers/scsi/aacraid/commctrl.c | 25 +- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/commsup.c | 106 +- drivers/scsi/aacraid/dpcsup.c | 2 +- drivers/scsi/aacraid/linit.c | 175 +- drivers/scsi/csiostor/csio_scsi.c | 48 +- drivers/scsi/fnic/fnic_scsi.c | 944 ++--- drivers/scsi/gdth.c | 4323 -------------------- drivers/scsi/gdth.h | 981 ----- drivers/scsi/gdth_ioctl.h | 251 -- drivers/scsi/gdth_proc.c | 586 --- drivers/scsi/gdth_proc.h | 18 - drivers/scsi/hpsa.c | 368 +- drivers/scsi/hpsa.h | 3 +- drivers/scsi/hpsa_cmd.h | 1 - drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/scsi_lib.c | 51 +- drivers/scsi/scsi_scan.c | 96 +- drivers/scsi/scsi_sysfs.c | 3 +- drivers/scsi/snic/snic.h | 4 +- drivers/scsi/snic/snic_main.c | 7 + drivers/scsi/snic/snic_scsi.c | 523 ++- include/linux/blk_types.h | 2 + include/linux/blkdev.h | 5 + include/scsi/scsi_device.h | 3 + include/scsi/scsi_host.h | 25 +- 35 files changed, 1238 insertions(+), 7492 deletions(-) delete mode 100644 drivers/scsi/gdth.c delete mode 100644 drivers/scsi/gdth.h delete mode 100644 drivers/scsi/gdth_ioctl.h delete mode 100644 drivers/scsi/gdth_proc.c delete mode 100644 drivers/scsi/gdth_proc.h
Signature · 1 line
2.16.4
PATCH v4 1/22 scsi: drop gdth driver
The gdth driver refers to a SCSI parallel, PCI-only HBA RAID adapter which was manufactured by the now-defunct ICP Vortex company, later acquired by Adaptec and superseded by the aacraid series of controllers. The driver itself would require a major overhaul before any modifications can be attempted, but seeing that it's unlikely to have any users left it should rather be removed completely.
--- Documentation/kbuild/makefiles.rst | 4 +- Documentation/process/magic-number.rst | 2 - Documentation/scsi/scsi-parameters.rst | 3 - Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - drivers/scsi/Kconfig | 14 - drivers/scsi/Makefile | 2 - drivers/scsi/gdth.c | 4323 -------------------- drivers/scsi/gdth.h | 981 ----- drivers/scsi/gdth_ioctl.h | 251 -- drivers/scsi/gdth_proc.c | 586 --- drivers/scsi/gdth_proc.h | 18 - 11 files changed, 1 insertion(+), 6184 deletions(-) delete mode 100644 drivers/scsi/gdth.c delete mode 100644 drivers/scsi/gdth.h delete mode 100644 drivers/scsi/gdth_ioctl.h delete mode 100644 drivers/scsi/gdth_proc.c delete mode 100644 drivers/scsi/gdth_proc.h
Documentation/kbuild/makefiles.rst +1 -3
@@ -379,10 +379,8 @@ more details, with real examples. # drivers/scsi/Makefile CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF - CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ \ - -DGDTH_STATISTICS - These two lines specify compilation flags for aha152x.o and gdth.o. + This line specify compilation flags for aha152x.o. $(AFLAGS_$@) is a similar feature for source files in assembly languages.
Documentation/process/magic-number.rst +0 -2
@@ -100,7 +100,6 @@ USB_SERIAL_PORT_MAGIC 0x7301 usb_serial_port ``drivers/usb/se CG_MAGIC 0x00090255 ufs_cylinder_group ``include/linux/ufs_fs.h`` RPORT_MAGIC 0x00525001 r_port ``drivers/char/rocket_int.h`` LSEMAGIC 0x05091998 lse ``drivers/fc4/fc.c`` -GDTIOCTL_MAGIC 0x06030f07 gdth_iowr_str ``drivers/scsi/gdth_ioctl.h`` RIEBL_MAGIC 0x09051990 ``drivers/net/atarilance.c`` NBD_REQUEST_MAGIC 0x12560953 nbd_request ``include/linux/nbd.h`` RED_MAGIC2 0x170fc2a5 (any) ``mm/slab.c``
@@ -144,7 +143,6 @@ PWC_MAGIC 0x89DC10AB pwc_device ``drivers/usb/me NBD_REPLY_MAGIC 0x96744668 nbd_reply ``include/linux/nbd.h`` ENI155_MAGIC 0xa54b872d midway_eprom ``drivers/atm/eni.h`` CODA_MAGIC 0xC0DAC0DA coda_file_info ``fs/coda/coda_fs_i.h`` -DPMEM_MAGIC 0xc0ffee11 gdt_pci_sram ``drivers/scsi/gdth.h`` YAM_MAGIC 0xF10A7654 yam_port ``drivers/net/hamradio/yam.c`` CCB_MAGIC 0xf2691ad2 ccb ``drivers/scsi/ncr53c8xx.c`` QUEUE_MAGIC_FREE 0xf7e1c9a3 queue_entry ``drivers/scsi/arm/queue.c``
Documentation/scsi/scsi-parameters.rst +0 -3
@@ -38,9 +38,6 @@ parameters may be changed at runtime by the command See drivers/scsi/BusLogic.c, comment before function BusLogic_ParseDriverOptions(). - gdth= [HW,SCSI] - See header of drivers/scsi/gdth.c. - gvp11= [HW,SCSI] ips= [HW,SCSI] Adaptec / IBM ServeRAID controller
Documentation/userspace-api/ioctl/ioctl-number.rst +0 -1
@@ -157,7 +157,6 @@ Code Seq# Include File Comments 'I' all linux/isdn.h conflict! 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! 'I' 40-4F linux/mISDNif.h conflict! -'J' 00-1F drivers/scsi/gdth_ioctl.h 'K' all linux/kd.h 'L' 00-1F linux/loop.h conflict! 'L' 10-1F drivers/scsi/mpt3sas/mpt3sas_ctl.h conflict!
drivers/scsi/Kconfig +0 -14
@@ -669,20 +669,6 @@ config SCSI_FDOMAIN_ISA To compile this driver as a module, choose M here: the module will be called fdomain_isa. -config SCSI_GDTH - tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support" - depends on PCI && SCSI - help - Formerly called GDT SCSI Disk Array Controller Support. - - This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI) - manufactured by Intel Corporation/ICP vortex GmbH. It is documented - in the kernel source in <file:drivers/scsi/gdth.c> and - <file:drivers/scsi/gdth.h>. - - To compile this driver as a module, choose M here: the - module will be called gdth. - config SCSI_ISCI tristate "Intel(R) C600 Series Chipset SAS Controller" depends on PCI && SCSI
drivers/scsi/Makefile +0 -2
@@ -16,7 +16,6 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF -CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS obj-$(CONFIG_PCMCIA) += pcmcia/
@@ -103,7 +102,6 @@ obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas/ obj-$(CONFIG_SCSI_UFSHCD) += ufs/ obj-$(CONFIG_SCSI_ACARD) += atp870u.o obj-$(CONFIG_SCSI_SUNESP) += esp_scsi.o sun_esp.o -obj-$(CONFIG_SCSI_GDTH) += gdth.o obj-$(CONFIG_SCSI_INITIO) += initio.o obj-$(CONFIG_SCSI_INIA100) += a100u2w.o obj-$(CONFIG_SCSI_QLOGICPTI) += qlogicpti.o
drivers/scsi/gdth.c deleted +0 -4323
2,925 lines not on this page · raw message
drivers/scsi/gdth.h deleted +0 -981
981 lines not on this page · raw message
drivers/scsi/gdth_ioctl.h deleted +0 -251
251 lines not on this page · raw message
drivers/scsi/gdth_proc.c deleted +0 -586
586 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.16.4
Part of the diff is not shown here. View the raw message.
Re: [PATCH 01/22] scsi: drop gdth driver
Quoted 6 lines · Hannes Reinecke
The gdth driver refers to a SCSI parallel, PCI-only HBA RAID adapter which was manufactured by the now-defunct ICP Vortex company, later acquired by Adaptec and superseded by the aacraid series of controllers. The driver itself would require a major overhaul before any modifications can be attempted, but seeing that it's unlikely to have any users left it should rather be removed completely.
PATCH v4 2/22 block: add flag for internal commands
In reply to Hannes ReineckeSome drivers require to allocate requests for internal command submission. These request will never be passed through the block layer, but nevertheless require a valid tag to avoid them clashing with normal I/O commands.
This patch adds a new request flag REQ_INTERNAL to mark such requests and a terminates any such commands in blk_execute_rq_nowait() with a WARN_ON to signal such an invalid usage.
--- block/blk-exec.c | 5 +++++ include/linux/blk_types.h | 2 ++ include/linux/blkdev.h | 5 +++++ 3 files changed, 12 insertions(+)
block/blk-exec.c +5 -0
@@ -55,6 +55,11 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq->rq_disk = bd_disk; rq->end_io = done; +if (WARN_ON (blk_rq_is_internal (rq))) { +blk_mq_end_request (rq,BLK_STS_NOTSUPP ); +return ; + } +blk_account_io_start (rq);/*
include/linux/blk_types.h +2 -0
@@ -360,6 +360,7 @@ enum req_flag_bits {/* for driver use */ __REQ_DRV, __REQ_SWAP,/* swapping request. */ + __REQ_INTERNAL,/* driver-internal command */ __REQ_NR_BITS, /* stops here */ };
@@ -384,6 +385,7 @@ enum req_flag_bits {#define REQ_DRV (1ULL << __REQ_DRV)#define REQ_SWAP (1ULL << __REQ_SWAP) +#define REQ_INTERNAL (1ULL << __REQ_INTERNAL)#define REQ_FAILFAST_MASK \ (REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT | REQ_FAILFAST_DRIVER)
include/linux/blkdev.h +5 -0
@@ -273,6 +273,11 @@ static inline bool blk_rq_is_passthrough(struct request *rq)return blk_rq_is_scsi (rq) ||blk_rq_is_private (rq); } +static inline bool blk_rq_is_internal (struct request *rq) +{ +return rq->cmd_flags &REQ_INTERNAL ; +} +static inline bool bio_is_passthrough (struct bio *bio) {unsigned op =bio_op (bio);
Signature · 1 line
2.16.4
Re: [PATCH 02/22] block: add flag for internal commands
Quoted 5 lines · Hannes Reinecke
block/blk-exec.c +0
-0
block/blk-exec.c void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, · line 63
Quoted 9 lines
block/blk-exec.c +5
-0@@ -55,6 +55,11 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq->rq_disk = bd_disk; rq->end_io = done; +if (WARN_ON (blk_rq_is_internal (rq))) { +blk_mq_end_request (rq,BLK_STS_NOTSUPP ); +return ; + } +blk_account_io_start (rq);
Isn't it recommended to use WARN_ON_ONCE() instead of WARN_ON()?
block/blk-exec.c void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
Quoted 3 lines
block/blk-exec.c +1
-0#define REQ_DRV (1ULL << __REQ_DRV)#define REQ_SWAP (1ULL << __REQ_SWAP) +#define REQ_INTERNAL (1ULL << __REQ_INTERNAL)
How about introducing a __bitwise type for the REQ_ flags such that sparse can check whether the proper type of flags has been passed to a function?
Thanks,
Bart.
Re: [PATCH 02/22] block: add flag for internal commands
Quoted 9 lines · Bart Van Assche
Quoted 8 lines · Hannes Reinecke
block/blk-exec.c +0
-0@@ -55,6 +55,11 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, rq->rq_disk = bd_disk; rq->end_io = done;
Quoted 9 lines
block/blk-exec.c void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, · line 63
Quoted 6 lines
block/blk-exec.c +5
-0+if (WARN_ON (blk_rq_is_internal (rq))) { +blk_mq_end_request (rq,BLK_STS_NOTSUPP ); +return ; + } +blk_account_io_start (rq);Isn't it recommended to use
WARN_ON_ONCE()instead ofWARN_ON()?
Depends on the frequency, but yeah, we could.
Quoted 8 lines
block/blk-exec.c void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
Quoted 3 lines
block/blk-exec.c +1
-0#define REQ_DRV (1ULL << __REQ_DRV)#define REQ_SWAP (1ULL << __REQ_SWAP) +#define REQ_INTERNAL (1ULL << __REQ_INTERNAL)How about introducing a
__bitwisetype for theREQ_flags such that sparse can check whether the proper type of flags has been passed to a function?
Possibly, but that would be a different patchset.
I'd rather not introduce it here as it would convolute this patchset even more.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v4 3/22 scsi: add scsi_{get,put}_internal_cmd() helper
In reply to Hannes ReineckeAdd helper functions to allow LLDDs to allocate and free internal commands.
--- drivers/scsi/scsi_lib.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/scsi/scsi_device.h | 3 +++ 2 files changed, 44 insertions(+)
drivers/scsi/scsi_lib.c +41 -0
@@ -1903,6 +1903,47 @@ void scsi_mq_destroy_tags(struct Scsi_Host *shost)blk_mq_free_tag_set (&shost->tag_set); } +/** +* scsi_get_internal_cmd - allocate an intenral SCSI command +* @sdev: SCSI device from which to allocate the command +* @data_direction: Data direction for the allocated command +* @op_flags: request allocation flags +* +* Allocates a SCSI command for internal LLDD use. +*/ +struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev, +int data_direction,int op_flags) +{ +struct request *rq; +struct scsi_cmnd *scmd; +blk_mq_req_flags_t flags =0 ; +unsigned int op =REQ_INTERNAL | op_flags; + + op |= (data_direction ==DMA_TO_DEVICE ) ? +REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ; + rq =blk_mq_alloc_request (sdev->request_queue, op, flags); +if (IS_ERR (rq)) +return NULL ; + scmd =blk_mq_rq_to_pdu (rq); + scmd->request = rq; + scmd->device = sdev; +return scmd; +} +EXPORT_SYMBOL_GPL (scsi_get_internal_cmd); + +/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ +struct request *rq =blk_mq_rq_from_pdu (scmd); + +if (blk_rq_is_internal (rq)) +blk_mq_free_request (rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd); +/** * scsi_device_from_queue - return sdev associated with a request_queue * @q: The request queue to return the sdev from
include/scsi/scsi_device.h +3 -0
@@ -460,6 +460,9 @@ static inline int scsi_execute_req(struct scsi_device *sdev,return scsi_execute (sdev, cmd, data_direction, buffer, bufflen,NULL , sshdr, timeout, retries,0 ,0 , resid); } +struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev, +int data_direction,int op_flags); +void scsi_put_internal_cmd (struct scsi_cmnd *scmd);extern void sdev_disable_disk_events (struct scsi_device *sdev);extern void sdev_enable_disk_events (struct scsi_device *sdev);extern int scsi_vpd_lun_id (struct scsi_device *,char *,size_t );
Signature · 1 line
2.16.4
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
Quoted 2 lines · Hannes Reinecke
+/**
+ *scsi_get_internal_cmd- allocate an intenral SCSI command
^^^^^^^^
internal?drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1915
Quoted 8 lines
+ * @sdev: SCSI device from which to allocate the command
+ * @data_direction: Data direction for the allocated command
+ * @op_flags: request allocation flags
+ *
+ * Allocates a SCSI command for internal LLDD use.
+ */drivers/scsi/scsi_lib.c +2
-0+struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev, +int data_direction,int op_flags)
How about using enum dma_data_direction for data_direction and unsigned int, or even better, a new __bitwise type for op_flags?
Quoted 7 lines
drivers/scsi/scsi_lib.c +7
-0+{ +struct request *rq; +struct scsi_cmnd *scmd; +blk_mq_req_flags_t flags =0 ; +unsigned int op =REQ_INTERNAL | op_flags; + + op |= (data_direction == DMA_TO_DEVICE) ?
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1932
Quoted 10 lines
drivers/scsi/scsi_lib.c +10
-0+ REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ; + rq =blk_mq_alloc_request (sdev->request_queue, op, flags); +if (IS_ERR (rq)) +return NULL ; + scmd =blk_mq_rq_to_pdu (rq); + scmd->request = rq; + scmd->device = sdev; +return scmd; +} +EXPORT_SYMBOL_GPL (scsi_get_internal_cmd);
Since the 'flags' variable always has the value 0, can it be left out?
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1945
Quoted 12 lines
drivers/scsi/scsi_lib.c +12
-0+/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ +struct request *rq =blk_mq_rq_from_pdu (scmd); + +if (blk_rq_is_internal (rq)) +blk_mq_free_request (rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd);
How about triggering a warning for the !blk_rq_is_internal(rq) case instead of silently ignoring regular SCSI commands?
Thanks,
Bart.
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
Quoted 5 lines · Bart Van Assche
Quoted 2 lines · Hannes Reinecke
+/**
+ *scsi_get_internal_cmd- allocate an intenral SCSI command^^^^^^^^ internal?
Quoted 12 lines
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1915
Quoted 8 lines
+ * @sdev: SCSI device from which to allocate the command
+ * @data_direction: Data direction for the allocated command
+ * @op_flags: request allocation flags
+ *
+ * Allocates a SCSI command for internal LLDD use.
+ */drivers/scsi/scsi_lib.c +2
-0+struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev, +int data_direction,int op_flags)How about using enum
dma_data_directionfordata_directionand unsigned int, or even better, a new__bitwisetype forop_flags?
Okay for data direction, but converting op_flags into __bitwise (or even a new type) should be relegated to a different patchset.
Quoted 11 lines
Quoted 11 lines
drivers/scsi/scsi_lib.c +11
-0+{ +struct request *rq; +struct scsi_cmnd *scmd; +blk_mq_req_flags_t flags =0 ; +unsigned int op =REQ_INTERNAL | op_flags; + + op |= (data_direction ==DMA_TO_DEVICE ) ? +REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ; + rq =blk_mq_alloc_request (sdev->request_queue, op, flags); +if (IS_ERR (rq)) +return NULL ;
Quoted 9 lines
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1932
Quoted 6 lines
drivers/scsi/scsi_lib.c +6
-0+ scmd =blk_mq_rq_to_pdu (rq); + scmd->request = rq; + scmd->device = sdev; +return scmd; +} +EXPORT_SYMBOL_GPL (scsi_get_internal_cmd);Since the 'flags' variable always has the value 0, can it be left out?
Yep, true.
Quoted 7 lines
Quoted 7 lines
drivers/scsi/scsi_lib.c +7
-0+/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ +struct request *rq =blk_mq_rq_from_pdu (scmd);
Quoted 9 lines
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1945
Quoted 5 lines
drivers/scsi/scsi_lib.c +5
-0+ +if (blk_rq_is_internal (rq)) +blk_mq_free_request (rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd);How about triggering a warning for the !blk_rq_is_internal(rq) case instead of silently ignoring regular SCSI commands?
That's by design.
Some drivers have a common routine for freeing up commands, so it'd be quite tricky to separate these two cases out at the driver level. So it's far easier to call the common routine for all commands, and
let this function do the right thing for all commands.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
Quoted 10 lines · Hannes Reinecke
Quoted 7 lines · Bart Van Assche
Quoted 2 lines · Hannes Reinecke
+struct
scsi_cmnd*scsi_get_internal_cmd(structscsi_device*sdev, + intdata_direction, intop_flags)How about using enum
dma_data_directionfordata_directionand unsigned int, or even better, a new__bitwisetype forop_flags?Okay for data direction, but converting
op_flagsinto__bitwise(or even a new type) should be relegated to a different patchset.
OK.
Quoted 16 lines
Quoted 7 lines
Quoted 7 lines
drivers/scsi/scsi_lib.c +7
-0+/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ + struct request *rq = blk_mq_rq_from_pdu(scmd);Quoted 9 lines
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1945
Quoted 5 lines
drivers/scsi/scsi_lib.c +5
-0+ + if (blk_rq_is_internal(rq)) + blk_mq_free_request(rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd);How about triggering a warning for the !blk_rq_is_internal(rq) case instead of silently ignoring regular SCSI commands?
Quoted 5 lines
That's by design.
Some drivers have a common routine for freeing up commands, so it'd be quite tricky to separate these two cases out at the driver level. So it's far easier to call the common routine for all commands, and let this function do the right thing for all commands.
That sounds fair to me, but is an example available in this patch series of a call to scsi_put_internal_cmd() from such a common routine? It seems to me that all calls to scsi_put_internal_cmd() introduced in this patch series happen from code paths that handle internal commands only?
Thanks,
Bart.
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
Quoted 36 lines · Bart Van Assche
Quoted 10 lines · Hannes Reinecke
Quoted 7 lines · Bart Van Assche
Quoted 2 lines · Hannes Reinecke
+struct
scsi_cmnd*scsi_get_internal_cmd(structscsi_device*sdev, + intdata_direction, intop_flags)How about using enum
dma_data_directionfordata_directionand unsigned int, or even better, a new__bitwisetype forop_flags?Okay for data direction, but converting
op_flagsinto__bitwise(or even a new type) should be relegated to a different patchset.OK.
Quoted 16 lines
Quoted 7 lines
Quoted 7 lines
drivers/scsi/scsi_lib.c +7
-0+/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ + struct request *rq = blk_mq_rq_from_pdu(scmd);Quoted 9 lines
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1945
Quoted 5 lines
drivers/scsi/scsi_lib.c +5
-0+ + if (blk_rq_is_internal(rq)) + blk_mq_free_request(rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd);How about triggering a warning for the !blk_rq_is_internal(rq) case instead of silently ignoring regular SCSI commands?
Quoted 5 lines
That's by design.
Some drivers have a common routine for freeing up commands, so it'd be quite tricky to separate these two cases out at the driver level. So it's far easier to call the common routine for all commands, and let this function do the right thing for all commands.
Quoted 5 lines
That sounds fair to me, but is an example available in this patch series of a call to
scsi_put_internal_cmd()from such a common routine? It seems to me that all calls toscsi_put_internal_cmd()introduced in this patch series happen from code paths that handle internal commands only?
aacraid.
The function aac_fib_free() is called unconditionally for every fib, and doesn't have the means to differentiate between 'normal' and 'internal' commands.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
Quoted 31 lines · Hannes Reinecke
Quoted 25 lines · Bart Van Assche
Quoted 18 lines · Hannes Reinecke
Quoted 17 lines · Bart Van Assche
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1945
Quoted 12 lines · Hannes Reinecke
drivers/scsi/scsi_lib.c +12
-0+/** +* scsi_put_internal_cmd - free an internal SCSI command +* @scmd: SCSI command to be freed +*/ +void scsi_put_internal_cmd (struct scsi_cmnd *scmd) +{ + struct request *rq = blk_mq_rq_from_pdu(scmd); + + if (blk_rq_is_internal(rq)) + blk_mq_free_request(rq); +} +EXPORT_SYMBOL_GPL (scsi_put_internal_cmd);How about triggering a warning for the !blk_rq_is_internal(rq) case instead of silently ignoring regular SCSI commands?
Quoted 5 lines
That's by design.
Some drivers have a common routine for freeing up commands, so it'd be quite tricky to separate these two cases out at the driver level. So it's far easier to call the common routine for all commands, and let this function do the right thing for all commands.Quoted 5 lines
That sounds fair to me, but is an example available in this patch series of a call to
scsi_put_internal_cmd()from such a common routine? It seems to me that all calls toscsi_put_internal_cmd()introduced in this patch series happen from code paths that handle internal commands only?
Quoted 4 lines
aacraid.
The functionaac_fib_free()is called unconditionally for every fib, and doesn't have the means to differentiate between 'normal' and 'internal' commands.
Please make scsi_put_internal_cmd() complain if it is invoked for anything else than an internal command and surround the scsi_put_internal_cmd() call in aacraid with if (blk_rq_is_internal(rq)) { ... }.
Thanks,
Bart.
Re: [PATCH 03/22] scsi: add scsi_{get,put}_internal_cmd() helper
In reply to Hannes ReineckeQuoted 6 lines · Hannes Reinecke
Quoted 6 lines
That sounds fair to me, but is an example available in this patch series of a call to
scsi_put_internal_cmd()from such a common routine? It seems to me that all calls toscsi_put_internal_cmd()introduced in this patch series happen from code paths that handle internal commands only?
Ah, I commented on the same thing in your latest series.
Quoted 3 lines
aacraid.
The functionaac_fib_free()is called unconditionally for every fib, and doesn't have the means to differentiate between 'normal' and 'internal' commands.
Surely some fib structure flag could be set in aac_fib_alloc() for this.
Thanks
PATCH v4 4/22 fnic: use internal commands
In reply to Hannes ReineckeRemove hack to get tag for the reset command by using internal commands.
--- drivers/scsi/fnic/fnic_scsi.c | 149 ++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 99 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +50 -99
@@ -101,7 +101,7 @@ static const char *fnic_fcpio_status_to_str(unsigned int status)return fcpio_status_str[status]; } -static void fnic_cleanup_io (struct fnic *fnic,int exclude_id); +static void fnic_cleanup_io (struct fnic *fnic);static inline spinlock_t *fnic_io_lock_hash (struct fnic *fnic,struct scsi_cmnd *sc)
@@ -637,7 +637,7 @@ static int fnic_fcpio_fw_reset_cmpl_handler(struct fnic *fnic,atomic64_inc (&reset_stats->fw_reset_completions);/* Clean up all outstanding io requests */ -fnic_cleanup_io (fnic,SCSI_NO_TAG ); +fnic_cleanup_io (fnic);atomic64_set (&fnic->fnic_stats.fw_stats.active_fw_reqs,0 );atomic64_set (&fnic->fnic_stats.io_stats.active_ios,0 );
@@ -1359,7 +1359,7 @@ int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do)return wq_work_done; } -static void fnic_cleanup_io (struct fnic *fnic,int exclude_id) +static void fnic_cleanup_io (struct fnic *fnic) {int i;struct fnic_io_req *io_req;
@@ -1370,9 +1370,6 @@ static void fnic_cleanup_io(struct fnic *fnic, int exclude_id)struct fnic_stats *fnic_stats = &fnic->fnic_stats;for (i =0 ; i < fnic->fnic_max_tag_id; i++) { -if (i == exclude_id) -continue ; - io_lock =fnic_io_lock_tag (fnic, i);spin_lock_irqsave (io_lock, flags); sc =scsi_host_find_tag (fnic->lport->host, i);
@@ -2125,9 +2122,7 @@ static inline int fnic_queue_dr_io_req(struct fnic *fnic,* successfully aborted, 1 otherwise */ static int fnic_clean_pending_aborts (struct fnic *fnic, -struct scsi_cmnd *lr_sc, -bool new_sc) - +struct scsi_cmnd *lr_sc) {int tag, abt_tag;struct fnic_io_req *io_req;
@@ -2148,7 +2143,7 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,* ignore this lun reset cmd if issued using new SC * or cmds that do not belong to this lun */ -if (!sc || ((sc == lr_sc) && new_sc) || sc->device != lun_dev) { +if (!sc || sc == lr_sc || sc->device != lun_dev) {spin_unlock_irqrestore (io_lock, flags);continue ; }
@@ -2287,38 +2282,6 @@ static int fnic_clean_pending_aborts(struct fnic *fnic,return ret; } -/** -* fnic_scsi_host_start_tag -* Allocates tagid from host's tag list -**/ -static inline int -fnic_scsi_host_start_tag (struct fnic *fnic,struct scsi_cmnd *sc) -{ -struct request_queue *q = sc->request->q; -struct request *dummy; - - dummy =blk_mq_alloc_request (q,REQ_OP_WRITE ,BLK_MQ_REQ_NOWAIT ); -if (IS_ERR (dummy)) -return SCSI_NO_TAG ; - - sc->tag = sc->request->tag = dummy->tag; - sc->host_scribble = (unsigned char *)dummy; - -return dummy->tag; -} - -/** -* fnic_scsi_host_end_tag -* frees tag allocated by fnic_scsi_host_start_tag. -**/ -static inline void -fnic_scsi_host_end_tag (struct fnic *fnic,struct scsi_cmnd *sc) -{ -struct request *dummy = (struct request *)sc->host_scribble; - -blk_mq_free_request (dummy); -} -/* * SCSI Eh thread issues a Lun Reset when one or more commands on a LUN * fail to get aborted. It calls driver's eh_device_reset with a SCSI command
@@ -2335,19 +2298,19 @@ int fnic_device_reset(struct scsi_cmnd *sc)spinlock_t *io_lock;unsigned long flags;unsigned long start_time =0 ; +struct scsi_device *sdev = sc->device;struct scsi_lun fc_lun;struct fnic_stats *fnic_stats;struct reset_stats *reset_stats;int tag =0 ;DECLARE_COMPLETION_ONSTACK (tm_done); -int tag_gen_flag =0 ;/*to track tags allocated by fnic driver*/ -bool new_sc =0 ; +struct scsi_cmnd *reset_sc =NULL ;/* Wait for rport to unblock */ fc_block_scsi_eh (sc);/* Get local-port, check ready and link up */ - lp =shost_priv (sc->device->host); + lp =shost_priv (sdev->host); fnic =lport_priv (lp); fnic_stats = &fnic->fnic_stats;
@@ -2355,10 +2318,10 @@ int fnic_device_reset(struct scsi_cmnd *sc)atomic64_inc (&reset_stats->device_resets); - rport =starget_to_rport (scsi_target (sc->device)); + rport =starget_to_rport (scsi_target (sdev));FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"Device reset called FCID 0x%x, LUN 0x%llx sc 0x%p\n" , - rport->port_id, sc->device->lun, sc); + rport->port_id, sdev->lun, sc);if (lp->state !=LPORT_ST_READY || !(lp->link_up)) goto fnic_device_reset_end;
@@ -2369,42 +2332,30 @@ int fnic_device_reset(struct scsi_cmnd *sc) goto fnic_device_reset_end; } -CMD_FLAGS (sc) =FNIC_DEVICE_RESET ; -/* Allocate tag if not present */ + reset_sc =scsi_get_internal_cmd (sdev,DMA_NONE ,REQ_NOWAIT ); +if (unlikely (!reset_sc)) + goto fnic_device_reset_end; - tag = sc->request->tag; -if (unlikely (tag <0 )) { -/* -* Really should fix the midlayer to pass in a proper -* request for ioctls... -*/ - tag =fnic_scsi_host_start_tag (fnic, sc); -if (unlikely (tag ==SCSI_NO_TAG )) - goto fnic_device_reset_end; - tag_gen_flag =1 ; - new_sc =1 ; - } - io_lock =fnic_io_lock_hash (fnic, sc); +CMD_FLAGS (reset_sc) =FNIC_DEVICE_RESET ; + tag = reset_sc->request->tag; + io_lock =fnic_io_lock_hash (fnic, reset_sc);spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc);/* -* If there is a io_req attached to this command, then use it, -* else allocate a new one. +* Allocate a new io_req. */ + io_req =mempool_alloc (fnic->io_req_pool,GFP_ATOMIC );if (!io_req) { - io_req =mempool_alloc (fnic->io_req_pool,GFP_ATOMIC ); -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); - goto fnic_device_reset_end; - } -memset (io_req,0 ,sizeof (*io_req)); - io_req->port_id = rport->port_id; -CMD_SP (sc) = (char *)io_req; +spin_unlock_irqrestore (io_lock, flags); + goto fnic_device_reset_end; } +memset (io_req,0 ,sizeof (*io_req)); + io_req->port_id = rport->port_id; +CMD_SP (reset_sc) = (char *)io_req; + io_req->dr_done = &tm_done; -CMD_STATE (sc) =FNIC_IOREQ_CMD_PENDING ; -CMD_LR_STATUS (sc) =FCPIO_INVALID_CODE ; +CMD_STATE (reset_sc) =FNIC_IOREQ_CMD_PENDING ; +CMD_LR_STATUS (reset_sc) =FCPIO_INVALID_CODE ;spin_unlock_irqrestore (io_lock, flags);FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"TAG %x\n" , tag);
@@ -2413,15 +2364,15 @@ int fnic_device_reset(struct scsi_cmnd *sc)* issue the device reset, if enqueue failed, clean up the ioreq * and break assoc with scsi cmd */ -if (fnic_queue_dr_io_req (fnic, sc, io_req)) { +if (fnic_queue_dr_io_req (fnic, reset_sc, io_req)) {spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (reset_sc);if (io_req) io_req->dr_done =NULL ; goto fnic_device_reset_clean; }spin_lock_irqsave (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_DEV_RST_ISSUED ; +CMD_FLAGS (reset_sc) |=FNIC_DEV_RST_ISSUED ;spin_unlock_irqrestore (io_lock, flags);/*
@@ -2432,16 +2383,16 @@ int fnic_device_reset(struct scsi_cmnd *sc) msecs_to_jiffies(FNIC_LUN_RESET_TIMEOUT));spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (reset_sc);if (!io_req) {spin_unlock_irqrestore (io_lock, flags);FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"io_req is null tag 0x%x sc 0x%p\n" , tag, sc); +"io_req is null tag 0x%x sc 0x%p\n" , tag, reset_sc); goto fnic_device_reset_end; } io_req->dr_done =NULL ; - status =CMD_LR_STATUS (sc); + status =CMD_LR_STATUS (reset_sc);/* * If lun reset not completed, bail out with failed. io_req
@@ -2451,16 +2402,16 @@ int fnic_device_reset(struct scsi_cmnd *sc)atomic64_inc (&reset_stats->device_reset_timeouts);FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"Device reset timed out\n" ); -CMD_FLAGS (sc) |=FNIC_DEV_RST_TIMED_OUT ; +CMD_FLAGS (reset_sc) |=FNIC_DEV_RST_TIMED_OUT ;spin_unlock_irqrestore (io_lock, flags); -int_to_scsilun (sc->device->lun, &fc_lun); +int_to_scsilun (sdev->lun, &fc_lun);/* * Issue abort and terminate on device reset request. * If q'ing of terminate fails, retry it after a delay. */ while (1 ) {spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEV_RST_TERM_ISSUED ) { +if (CMD_FLAGS (reset_sc) &FNIC_DEV_RST_TERM_ISSUED ) {spin_unlock_irqrestore (io_lock, flags);break ; }
@@ -2473,13 +2424,13 @@ int fnic_device_reset(struct scsi_cmnd *sc) msecs_to_jiffies(FNIC_ABT_TERM_DELAY_TIMEOUT)); }else {spin_lock_irqsave (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +CMD_FLAGS (reset_sc) |=FNIC_DEV_RST_TERM_ISSUED ; +CMD_STATE (reset_sc) =FNIC_IOREQ_ABTS_PENDING ; io_req->abts_done = &tm_done;spin_unlock_irqrestore (io_lock, flags);FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"Abort and terminate issued on Device reset " -"tag 0x%x sc 0x%p\n" , tag, sc); +"tag 0x%x sc 0x%p\n" , tag, reset_sc);break ; } }
@@ -2491,7 +2442,7 @@ int fnic_device_reset(struct scsi_cmnd *sc) msecs_to_jiffies(FNIC_LUN_RESET_TIMEOUT));break ; }else { - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (reset_sc); io_req->abts_done =NULL ; goto fnic_device_reset_clean; }
@@ -2506,7 +2457,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"Device reset completed - failed\n" ); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (reset_sc); goto fnic_device_reset_clean; }
@@ -2517,7 +2468,7 @@ int fnic_device_reset(struct scsi_cmnd *sc)* the lun reset cmd. If all cmds get cleaned, the lun reset * succeeds */ -if (fnic_clean_pending_aborts (fnic, sc, new_sc)) { +if (fnic_clean_pending_aborts (fnic, reset_sc)) {spin_lock_irqsave (io_lock, flags); io_req = (struct fnic_io_req *)CMD_SP (sc); FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
@@ -2528,35 +2479,35 @@ int fnic_device_reset(struct scsi_cmnd *sc)/* Clean lun reset command */ spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (reset_sc);if (io_req)/* Completed, and successful */ ret =SUCCESS ; fnic_device_reset_clean:if (io_req) -CMD_SP (sc) =NULL ; +CMD_SP (reset_sc) =NULL ;spin_unlock_irqrestore (io_lock, flags);if (io_req) { start_time = io_req->start_time; -fnic_release_ioreq_buf (fnic, io_req, sc); +fnic_release_ioreq_buf (fnic, io_req, reset_sc);mempool_free (io_req, fnic->io_req_pool); } fnic_device_reset_end: -FNIC_TRACE (fnic_device_reset, sc->device->host->host_no, - sc->request->tag, sc, +FNIC_TRACE (fnic_device_reset, sdev->host->host_no, + reset_sc->request->tag, reset_sc,jiffies_to_msecs (jiffies - start_time), -0 , ((u64 )sc->cmnd[0 ] <<32 | +0 , ((u64 )reset_sc->cmnd[0 ] <<32 | (u64 )sc->cmnd[2 ] <<24 | (u64 )sc->cmnd[3 ] <<16 | (u64 )sc->cmnd[4 ] <<8 | sc->cmnd[5 ]), (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc))); -/* free tag if it is allocated */ -if (unlikely (tag_gen_flag)) -fnic_scsi_host_end_tag (fnic, sc); +/* free internal command if it is allocated */ +if (reset_sc) +scsi_put_internal_cmd (reset_sc); FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "Returning from device reset %s\n",
Signature · 1 line
2.16.4
PATCH v4 5/22 fnic: use scsi_host_busy_iter() to traverse commands
In reply to Hannes ReineckeUse scsi_host_busy_iter() to traverse commands instead of hand-crafted routines walking the command list.
--- drivers/scsi/fnic/fnic_scsi.c | 801 +++++++++++++++++++----------------------- 1 file changed, 356 insertions(+), 445 deletions(-)
drivers/scsi/fnic/fnic_scsi.c +356 -445
@@ -1359,91 +1359,90 @@ int fnic_wq_copy_cmpl_handler(struct fnic *fnic, int copy_work_to_do)return wq_work_done; } -static void fnic_cleanup_io (struct fnic *fnic) +static bool fnic_cleanup_io_iter (struct scsi_cmnd *sc,void *data, +bool reserved) { -int i; +struct fnic *fnic = data;struct fnic_io_req *io_req;unsigned long flags =0 ; -struct scsi_cmnd *sc;spinlock_t *io_lock;unsigned long start_time =0 ;struct fnic_stats *fnic_stats = &fnic->fnic_stats; -for (i =0 ; i < fnic->fnic_max_tag_id; i++) { - io_lock =fnic_io_lock_tag (fnic, i); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, i); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_lock =fnic_io_lock_tag (fnic, sc->request->tag); +spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - !(CMD_FLAGS (sc) &FNIC_DEV_RST_DONE )) { -/* -* We will be here only when FW completes reset -* without sending completions for outstanding ios. -*/ -CMD_FLAGS (sc) |=FNIC_DEV_RST_DONE ; -if (io_req && io_req->dr_done) -complete (io_req->dr_done); -else if (io_req && io_req->abts_done) -complete (io_req->abts_done); -spin_unlock_irqrestore (io_lock, flags); -continue ; - }else if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); - goto cleanup_scsi_cmd; - } + io_req = (struct fnic_io_req *)CMD_SP (sc); +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + !(CMD_FLAGS (sc) &FNIC_DEV_RST_DONE )) { +/* +* We will be here only when FW completes reset +* without sending completions for outstanding ios. +*/ +CMD_FLAGS (sc) |=FNIC_DEV_RST_DONE ; +if (io_req && io_req->dr_done) +complete (io_req->dr_done); +else if (io_req && io_req->abts_done) +complete (io_req->abts_done); +spin_unlock_irqrestore (io_lock, flags); +return true; + }else if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } +if (!io_req) { +spin_unlock_irqrestore (io_lock, flags); + goto cleanup_scsi_cmd; + } -CMD_SP (sc) =NULL ; +CMD_SP (sc) =NULL ; -spin_unlock_irqrestore (io_lock, flags); +spin_unlock_irqrestore (io_lock, flags); -/* -* If there is a scsi_cmnd associated with this io_req, then -* free the corresponding state -*/ - start_time = io_req->start_time; -fnic_release_ioreq_buf (fnic, io_req, sc); -mempool_free (io_req, fnic->io_req_pool); +/* +* If there is a scsi_cmnd associated with this io_req, then +* free the corresponding state +*/ + start_time = io_req->start_time; +fnic_release_ioreq_buf (fnic, io_req, sc); +mempool_free (io_req, fnic->io_req_pool); cleanup_scsi_cmd: - sc->result =DID_TRANSPORT_DISRUPTED <<16 ; -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"%s: tag:0x%x : sc:0x%p duration = %lu DID_TRANSPORT_DISRUPTED\n" , - __func__, sc->request->tag, sc, - (jiffies - start_time)); - -if (atomic64_read (&fnic->io_cmpl_skip)) -atomic64_dec (&fnic->io_cmpl_skip); -else -atomic64_inc (&fnic_stats->io_stats.io_completions); + sc->result =DID_TRANSPORT_DISRUPTED <<16 ; +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_cleanup_io: tag:0x%x : sc:0x%p duration = %lu DID_TRANSPORT_DISRUPTED\n" , + sc->request->tag, sc, (jiffies - start_time)); -/* Complete the command to SCSI */ -if (sc->scsi_done) { -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) -shost_printk (KERN_ERR , fnic->lport->host, -"Calling done for IO not issued to fw: tag:0x%x sc:0x%p\n" , - sc->request->tag, sc); +if (atomic64_read (&fnic->io_cmpl_skip)) +atomic64_dec (&fnic->io_cmpl_skip); +else +atomic64_inc (&fnic_stats->io_stats.io_completions); -FNIC_TRACE (fnic_cleanup_io, - sc->device->host->host_no, i, sc, -jiffies_to_msecs (jiffies - start_time), -0 , ((u64 )sc->cmnd[0 ] <<32 | - (u64 )sc->cmnd[2 ] <<24 | - (u64 )sc->cmnd[3 ] <<16 | - (u64 )sc->cmnd[4 ] <<8 | sc->cmnd[5 ]), - (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc))); +/* Complete the command to SCSI */ +if (sc->scsi_done) { +if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) +shost_printk (KERN_ERR , fnic->lport->host, +"Calling done for IO not issued to fw: tag:0x%x sc:0x%p\n" , + sc->request->tag, sc); + +FNIC_TRACE (fnic_cleanup_io, + sc->device->host->host_no, sc->request->tag, sc, +jiffies_to_msecs (jiffies - start_time), +0 , ((u64 )sc->cmnd[0 ] <<32 | + (u64 )sc->cmnd[2 ] <<24 | + (u64 )sc->cmnd[3 ] <<16 | + (u64 )sc->cmnd[4 ] <<8 | sc->cmnd[5 ]), + (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc))); - sc->scsi_done (sc); - } + sc->scsi_done (sc); } +return true; +} + +static void fnic_cleanup_io (struct fnic *fnic) +{ +scsi_host_busy_iter (fnic->lport->host, + fnic_cleanup_io_iter, fnic); } void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,
@@ -1554,143 +1553,140 @@ static inline int fnic_queue_abort_io_req(struct fnic *fnic, int tag,return 0 ; } -static void fnic_rport_exch_reset (struct fnic *fnic,u32 port_id) +struct fnic_rport_abort_io_iter_data { +struct fnic *fnic; +u32 port_id; +int term_cnt; +}; + +static bool fnic_rport_abort_io (struct scsi_cmnd *sc,void *data,bool reserved) { -int tag; -int abt_tag; -int term_cnt =0 ; +struct fnic_rport_abort_io_iter_data *iter_data = data; +struct fnic *fnic = iter_data->fnic; +int abt_tag = sc->request->tag;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -struct scsi_cmnd *sc;struct reset_stats *reset_stats = &fnic->fnic_stats.reset_stats;struct terminate_stats *term_stats = &fnic->fnic_stats.term_stats;struct scsi_lun fc_lun;enum fnic_ioreq_state old_ioreq_state; -FNIC_SCSI_DBG (KERN_DEBUG , - fnic->lport->host, -"fnic_rport_exch_reset called portid 0x%06x\n" , - port_id); - -if (fnic->in_remove) -return ; - -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - abt_tag = tag; - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_lock =fnic_io_lock_tag (fnic, abt_tag); +spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); + io_req = (struct fnic_io_req *)CMD_SP (sc); -if (!io_req || io_req->port_id != port_id) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +if (!io_req || io_req->port_id != iter_data->port_id) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host,"fnic_rport_exch_reset dev rst not pending sc 0x%p\n" , sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } +spin_unlock_irqrestore (io_lock, flags); +return true; + } -/* -* Found IO that is still pending with firmware and -* belongs to rport that went away -*/ -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (io_req->abts_done) { -shost_printk (KERN_ERR , fnic->lport->host, +/* +* Found IO that is still pending with firmware and +* belongs to rport that went away +*/ +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } +if (io_req->abts_done) { +shost_printk (KERN_ERR , fnic->lport->host,"fnic_rport_exch_reset: io_req->abts_done is set " "state is %s\n" ,fnic_ioreq_state_to_str (CMD_STATE (sc))); - } + } -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { -shost_printk (KERN_ERR , fnic->lport->host, -"rport_exch_reset " -"IO not yet issued %p tag 0x%x flags " -"%x state %d\n" , - sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); - } - old_ioreq_state =CMD_STATE (sc); -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -atomic64_inc (&reset_stats->device_reset_terminates); - abt_tag = (tag |FNIC_TAG_DEV_RST ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_rport_exch_reset dev rst sc 0x%p\n" , - sc); - } +if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { +shost_printk (KERN_ERR , fnic->lport->host, +"rport_exch_reset " +"IO not yet issued %p tag 0x%x flags " +"%x state %d\n" , + sc, abt_tag,CMD_FLAGS (sc),CMD_STATE (sc)); + } + old_ioreq_state =CMD_STATE (sc); +CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { +atomic64_inc (&reset_stats->device_reset_terminates); + abt_tag |=FNIC_TAG_DEV_RST ; + } +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_rport_exch_reset dev rst sc 0x%p\n" , sc); +BUG_ON (io_req->abts_done); -BUG_ON (io_req->abts_done); +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"fnic_rport_reset_exch: Issuing abts\n" ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_rport_reset_exch: Issuing abts\n" ); +spin_unlock_irqrestore (io_lock, flags); + +/* Now queue the abort command to firmware */ +int_to_scsilun (sc->device->lun, &fc_lun); +if (fnic_queue_abort_io_req (fnic, abt_tag, +FCPIO_ITMF_ABT_TASK_TERM , + fc_lun.scsi_lun, io_req)) { +/* +* Revert the cmd state back to old state, if +* it hasn't changed in between. This cmd will get +* aborted later by scsi_eh, or cleaned up during +* lun reset +*/ +spin_lock_irqsave (io_lock, flags); +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) +CMD_STATE (sc) = old_ioreq_state;spin_unlock_irqrestore (io_lock, flags); + }else { +spin_lock_irqsave (io_lock, flags); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) +CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; +else +CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; +spin_unlock_irqrestore (io_lock, flags); +atomic64_inc (&term_stats->terminates); + iter_data->term_cnt++; + } +return true; +} -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); +static void fnic_rport_exch_reset (struct fnic *fnic,u32 port_id) +{ +struct terminate_stats *term_stats = &fnic->fnic_stats.term_stats; +struct fnic_rport_abort_io_iter_data iter_data = { + .fnic = fnic, + .port_id = port_id, + .term_cnt =0 , + }; -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -/* -* Revert the cmd state back to old state, if -* it hasn't changed in between. This cmd will get -* aborted later by scsi_eh, or cleaned up during -* lun reset -*/ -spin_lock_irqsave (io_lock, flags); -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -else -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); -atomic64_inc (&term_stats->terminates); - term_cnt++; - } - } -if (term_cnt >atomic64_read (&term_stats->max_terminates)) -atomic64_set (&term_stats->max_terminates, term_cnt); +FNIC_SCSI_DBG (KERN_DEBUG , + fnic->lport->host, +"fnic_rport_exch_reset called portid 0x%06x\n" , + port_id); + +if (fnic->in_remove) +return ; + +scsi_host_busy_iter (fnic->lport->host, fnic_rport_abort_io, + &iter_data); +if (iter_data.term_cnt >atomic64_read (&term_stats->max_terminates)) +atomic64_set (&term_stats->max_terminates, iter_data.term_cnt); }void fnic_terminate_rport_io (struct fc_rport *rport) { -int tag; -int abt_tag; -int term_cnt =0 ; -struct fnic_io_req *io_req; -spinlock_t *io_lock; -unsigned long flags; -struct scsi_cmnd *sc; -struct scsi_lun fc_lun;struct fc_rport_libfc_priv *rdata;struct fc_lport *lport;struct fnic *fnic; -struct fc_rport *cmd_rport; -struct reset_stats *reset_stats; -struct terminate_stats *term_stats; -enum fnic_ioreq_state old_ioreq_state;if (!rport) {printk (KERN_ERR "fnic_terminate_rport_io: rport is NULL\n" );
@@ -1718,109 +1714,7 @@ void fnic_terminate_rport_io(struct fc_rport *rport)if (fnic->in_remove)return ; - reset_stats = &fnic->fnic_stats.reset_stats; - term_stats = &fnic->fnic_stats.term_stats; - -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - abt_tag = tag; - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - cmd_rport =starget_to_rport (scsi_target (sc->device)); -if (rport != cmd_rport) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - io_req = (struct fnic_io_req *)CMD_SP (sc); - -if (!io_req || rport != cmd_rport) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_terminate_rport_io dev rst not pending sc 0x%p\n" , - sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -/* -* Found IO that is still pending with firmware and -* belongs to rport that went away -*/ -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if (io_req->abts_done) { -shost_printk (KERN_ERR , fnic->lport->host, -"fnic_terminate_rport_io: io_req->abts_done is set " -"state is %s\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); - } -if (!(CMD_FLAGS (sc) &FNIC_IO_ISSUED )) { -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"fnic_terminate_rport_io " -"IO not yet issued %p tag 0x%x flags " -"%x state %d\n" , - sc, tag,CMD_FLAGS (sc),CMD_STATE (sc)); - } - old_ioreq_state =CMD_STATE (sc); -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { -atomic64_inc (&reset_stats->device_reset_terminates); - abt_tag = (tag |FNIC_TAG_DEV_RST ); -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"fnic_terminate_rport_io dev rst sc 0x%p\n" , sc); - } - -BUG_ON (io_req->abts_done); - -FNIC_SCSI_DBG (KERN_DEBUG , - fnic->lport->host, -"fnic_terminate_rport_io: Issuing abts\n" ); - -spin_unlock_irqrestore (io_lock, flags); - -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); - -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -/* -* Revert the cmd state back to old state, if -* it hasn't changed in between. This cmd will get -* aborted later by scsi_eh, or cleaned up during -* lun reset -*/ -spin_lock_irqsave (io_lock, flags); -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -else -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); -atomic64_inc (&term_stats->terminates); - term_cnt++; - } - } -if (term_cnt >atomic64_read (&term_stats->max_terminates)) -atomic64_set (&term_stats->max_terminates, term_cnt); - +fnic_rport_exch_reset (fnic, rport->port_id); }/*
@@ -2115,163 +2009,174 @@ static inline int fnic_queue_dr_io_req(struct fnic *fnic,return ret; } -/* -* Clean up any pending aborts on the lun -* For each outstanding IO on this lun, whose abort is not completed by fw, -* issue a local abort. Wait for abort to complete. Return 0 if all commands -* successfully aborted, 1 otherwise -*/ -static int fnic_clean_pending_aborts (struct fnic *fnic, -struct scsi_cmnd *lr_sc) +struct fnic_pending_aborts_iter_data { +struct fnic *fnic; +struct scsi_device *lun_dev; +int ret; +}; + +static bool fnic_pending_aborts_iter (struct scsi_cmnd *sc, +void *data,bool reserved) { -int tag, abt_tag; +struct fnic_pending_aborts_iter_data *iter_data = data; +struct fnic *fnic = iter_data->fnic; +struct scsi_device *lun_dev = iter_data->lun_dev; +int abt_tag = sc->request->tag;struct fnic_io_req *io_req;spinlock_t *io_lock;unsigned long flags; -int ret =0 ; -struct scsi_cmnd *sc;struct scsi_lun fc_lun; -struct scsi_device *lun_dev = lr_sc->device;DECLARE_COMPLETION_ONSTACK (tm_done);enum fnic_ioreq_state old_ioreq_state; -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - io_lock =fnic_io_lock_tag (fnic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (fnic->lport->host, tag); -/* -* ignore this lun reset cmd if issued using new SC -* or cmds that do not belong to this lun -*/ -if (!sc || sc == lr_sc || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - - io_req = (struct fnic_io_req *)CMD_SP (sc); - -if (!io_req || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - -/* -* Found IO that is still pending with firmware and -* belongs to the LUN that we are resetting -*/ -FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, -"Found IO in %s on lun\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); +if (sc->device != lun_dev) +return true; +if (reserved) +return true; -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } -if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && - (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"%s dev rst not pending sc 0x%p\n" , __func__, - sc); -spin_unlock_irqrestore (io_lock, flags); -continue ; - } + io_lock =fnic_io_lock_tag (fnic, abt_tag); +spin_lock_irqsave (io_lock, flags); + io_req = (struct fnic_io_req *)CMD_SP (sc); +if (!io_req) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } -if (io_req->abts_done) -shost_printk (KERN_ERR , fnic->lport->host, -"%s: io_req->abts_done is set state is %s\n" , - __func__,fnic_ioreq_state_to_str (CMD_STATE (sc))); - old_ioreq_state =CMD_STATE (sc); -/* -* Any pending IO issued prior to reset is expected to be -* in abts pending state, if not we need to set -* FNIC_IOREQ_ABTS_PENDING to indicate the IO is abort pending. -* When IO is completed, the IO will be handed over and -* handled in this function. -*/ -CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; +/* +* Found IO that is still pending with firmware and +* belongs to the LUN that we are resetting +*/ +FNIC_SCSI_DBG (KERN_DEBUG , fnic->lport->host, +"Found IO in %s on lun\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); -BUG_ON (io_req->abts_done); +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } +if ((CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) && + (!(CMD_FLAGS (sc) &FNIC_DEV_RST_ISSUED ))) { +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"%s dev rst not pending sc 0x%p\n" , __func__, + sc); +spin_unlock_irqrestore (io_lock, flags); +return true; + } - abt_tag = tag; -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { - abt_tag |=FNIC_TAG_DEV_RST ; -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"%s: dev rst sc 0x%p\n" , __func__, sc); - } +if (io_req->abts_done) +shost_printk (KERN_ERR , fnic->lport->host, +"%s: io_req->abts_done is set state is %s\n" , + __func__,fnic_ioreq_state_to_str (CMD_STATE (sc))); + old_ioreq_state =CMD_STATE (sc); +/* +* Any pending IO issued prior to reset is expected to be +* in abts pending state, if not we need to set +* FNIC_IOREQ_ABTS_PENDING to indicate the IO is abort pending. +* When IO is completed, the IO will be handed over and +* handled in this function. +*/ +CMD_STATE (sc) =FNIC_IOREQ_ABTS_PENDING ; -CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; - io_req->abts_done = &tm_done; -spin_unlock_irqrestore (io_lock, flags); +BUG_ON (io_req->abts_done); -/* Now queue the abort command to firmware */ -int_to_scsilun (sc->device->lun, &fc_lun); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) { + abt_tag |=FNIC_TAG_DEV_RST ; +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"%s: dev rst sc 0x%p\n" , __func__, sc); + } -if (fnic_queue_abort_io_req (fnic, abt_tag, -FCPIO_ITMF_ABT_TASK_TERM , - fc_lun.scsi_lun, io_req)) { -spin_lock_irqsave (io_lock, flags); - io_req = (struct fnic_io_req *)CMD_SP (sc); -if (io_req) - io_req->abts_done =NULL ; -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) -CMD_STATE (sc) = old_ioreq_state; -spin_unlock_irqrestore (io_lock, flags); - ret =1 ; - goto clean_pending_aborts_end; - }else { -spin_lock_irqsave (io_lock, flags); -if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) -CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; -spin_unlock_irqrestore (io_lock, flags); - } -CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; +CMD_ABTS_STATUS (sc) =FCPIO_INVALID_CODE ; + io_req->abts_done = &tm_done; +spin_unlock_irqrestore (io_lock, flags); -wait_for_completion_timeout (&tm_done, -msecs_to_jiffies - (fnic->config.ed_tov)); +/* Now queue the abort command to firmware */ +int_to_scsilun (sc->device->lun, &fc_lun); -/* Recheck cmd state to check if it is now aborted */ +if (fnic_queue_abort_io_req (fnic, abt_tag, +FCPIO_ITMF_ABT_TASK_TERM , + fc_lun.scsi_lun, io_req)) {spin_lock_irqsave (io_lock, flags); io_req = (struct fnic_io_req *)CMD_SP (sc); -if (!io_req) { -spin_unlock_irqrestore (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_REQ_NULL ; -continue ; - } +if (io_req) + io_req->abts_done =NULL ; +if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) +CMD_STATE (sc) = old_ioreq_state; +spin_unlock_irqrestore (io_lock, flags); +return false; + }else { +spin_lock_irqsave (io_lock, flags); +if (CMD_FLAGS (sc) &FNIC_DEVICE_RESET ) +CMD_FLAGS (sc) |=FNIC_DEV_RST_TERM_ISSUED ; +spin_unlock_irqrestore (io_lock, flags); + } +CMD_FLAGS (sc) |=FNIC_IO_INTERNAL_TERM_ISSUED ; - io_req->abts_done =NULL ; +wait_for_completion_timeout (&tm_done,msecs_to_jiffies + (fnic->config.ed_tov)); -/* if abort is still pending with fw, fail */ -if (CMD_ABTS_STATUS (sc) ==FCPIO_INVALID_CODE ) { -spin_unlock_irqrestore (io_lock, flags); -CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_DONE ; - ret =1 ; - goto clean_pending_aborts_end; - } -CMD_STATE (sc) =FNIC_IOREQ_ABTS_COMPLETE ; +/* Recheck cmd state to check if it is now aborted */ +spin_lock_irqsave (io_lock, flags); + io_req = (struct fnic_io_req *)CMD_SP (sc); +if (!io_req) { +spin_unlock_irqrestore (io_lock, flags); +CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_REQ_NULL ; +return true; + } -/* original sc used for lr is handled by dev reset code */ -if (sc != lr_sc) -CMD_SP (sc) =NULL ; + io_req->abts_done =NULL ; + +/* if abort is still pending with fw, fail */ +if (CMD_ABTS_STATUS (sc) ==FCPIO_INVALID_CODE ) {spin_unlock_irqrestore (io_lock, flags); +CMD_FLAGS (sc) |=FNIC_IO_ABT_TERM_DONE ; + iter_data->ret =FAILED ; +return false; + } +CMD_STATE (sc) =FNIC_IOREQ_ABTS_COMPLETE ; -/* original sc used for lr is handled by dev reset code */ -if (sc != lr_sc) { -fnic_release_ioreq_buf (fnic, io_req, sc); -mempool_free (io_req, fnic->io_req_pool); - } +/* original sc used for lr is handled by dev reset code */ +CMD_SP (sc) =NULL ; +spin_unlock_irqrestore (io_lock, flags); -/* -* Any IO is returned during reset, it needs to call scsi_done -* to return the scsi_cmnd to upper layer. -*/ -if (sc->scsi_done) { -/* Set result to let upper SCSI layer retry */ - sc->result =DID_RESET <<16 ; - sc->scsi_done (sc); - } +/* original sc used for lr is handled by dev reset code */ +fnic_release_ioreq_buf (fnic, io_req, sc); +mempool_free (io_req, fnic->io_req_pool); + +/* +* Any IO is returned during reset, it needs to call scsi_done +* to return the scsi_cmnd to upper layer. +*/ +if (sc->scsi_done) { +/* Set result to let upper SCSI layer retry */ + sc->result =DID_RESET <<16 ; + sc->scsi_done (sc); } +return true; +} + +/* +* Clean up any pending aborts on the lun +* For each outstanding IO on this lun, whose abort is not completed by fw, +* issue a local abort. Wait for abort to complete. Return 0 if all commands +* successfully aborted, 1 otherwise +*/ +static int fnic_clean_pending_aborts (struct fnic *fnic, +struct scsi_cmnd *lr_sc) +{ +int ret =SUCCESS ; +struct fnic_pending_aborts_iter_data iter_data = { + .fnic = fnic, + .lun_dev = lr_sc->device, + .ret =SUCCESS , + }; + +scsi_host_busy_iter (fnic->lport->host, + fnic_pending_aborts_iter, &iter_data); +if (iter_data.ret ==FAILED ) { + ret = iter_data.ret; + goto clean_pending_aborts_end; + }schedule_timeout (msecs_to_jiffies (2 * fnic->config.ed_tov));/* walk again to check, if IOs are still pending in fw */
@@ -2725,6 +2630,43 @@ void fnic_exch_mgr_reset(struct fc_lport *lp, u32 sid, u32 did) } +static bool fnic_abts_pending_iter (struct scsi_cmnd *sc,void *data, +bool reserved) +{ +struct fnic_pending_aborts_iter_data *iter_data = data; +struct fnic *fnic = iter_data->fnic; +int cmd_state; +struct fnic_io_req *io_req; +spinlock_t *io_lock; +unsigned long flags; + +if (iter_data->lun_dev && sc->device != iter_data->lun_dev) +return true; + + io_lock =fnic_io_lock_hash (fnic, sc); +spin_lock_irqsave (io_lock, flags); + + io_req = (struct fnic_io_req *)CMD_SP (sc); +if (!io_req) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } + +/* +* Found IO that is still pending with firmware and +* belongs to the LUN that we are resetting +*/ +FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, +"Found IO in %s on lun\n" , +fnic_ioreq_state_to_str (CMD_STATE (sc))); + cmd_state =CMD_STATE (sc); +spin_unlock_irqrestore (io_lock, flags); +if (cmd_state ==FNIC_IOREQ_ABTS_PENDING ) + iter_data->ret =1 ; + +return iter_data->ret ? false : true; +} +/* * fnic_is_abts_pending() is a helper function that * walks through tag map to check if there is any IOs pending,if there is one,
@@ -2734,49 +2676,18 @@ void fnic_exch_mgr_reset(struct fc_lport *lp, u32 sid, u32 did)*/ int fnic_is_abts_pending (struct fnic *fnic,struct scsi_cmnd *lr_sc) { -int tag; -struct fnic_io_req *io_req; -spinlock_t *io_lock; -unsigned long flags; -int ret =0 ; -struct scsi_cmnd *sc; -struct scsi_device *lun_dev =NULL ; +struct fnic_pending_aborts_iter_data iter_data = { + .fnic = fnic, + .lun_dev =NULL , + .ret =0 , + };if (lr_sc) - lun_dev = lr_sc->device; + iter_data.lun_dev = lr_sc->device;/* walk again to check, if IOs are still pending in fw */ -for (tag =0 ; tag < fnic->fnic_max_tag_id; tag++) { - sc =scsi_host_find_tag (fnic->lport->host, tag); -/* -* ignore this lun reset cmd or cmds that do not belong to -* this lun -*/ -if (!sc || (lr_sc && (sc->device != lun_dev || sc == lr_sc))) -continue ; - - io_lock =fnic_io_lock_hash (fnic, sc); -spin_lock_irqsave (io_lock, flags); - - io_req = (struct fnic_io_req *)CMD_SP (sc); +scsi_host_busy_iter (fnic->lport->host, + fnic_abts_pending_iter, &iter_data); -if (!io_req || sc->device != lun_dev) { -spin_unlock_irqrestore (io_lock, flags); -continue ; - } - -/* -* Found IO that is still pending with firmware and -* belongs to the LUN that we are resetting -*/ -FNIC_SCSI_DBG (KERN_INFO , fnic->lport->host, -"Found IO in %s on lun\n" , -fnic_ioreq_state_to_str (CMD_STATE (sc))); - -if (CMD_STATE (sc) ==FNIC_IOREQ_ABTS_PENDING ) - ret =1 ; -spin_unlock_irqrestore (io_lock, flags); - } - -return ret; +return iter_data.ret; }
Signature · 1 line
2.16.4
PATCH v4 6/22 fnic: check for started requests in fnic_wq_copy_cleanup_handler()
In reply to Hannes Reineckefnic_wq_copy_cleanup_handler() is using scsi_host_find_tag() to map id to a scsi command. However, as per discussion on the mailinglist scsi_host_find_tag() might return a non-started request, so we need to check the returned command with blk_mq_request_started() to avoid the function tripping over a non-initialized command.
--- drivers/scsi/fnic/fnic_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/fnic/fnic_scsi.c +1 -1
@@ -1464,7 +1464,7 @@ void fnic_wq_copy_cleanup_handler(struct vnic_wq_copy *wq,return ; sc =scsi_host_find_tag (fnic->lport->host, id); -if (!sc) +if (!sc || !blk_mq_request_started (sc->request))return ; io_lock =fnic_io_lock_hash (fnic, sc);
Signature · 1 line
2.16.4
PATCH v4 7/22 csiostor: use internal command for LUN reset
In reply to Hannes ReineckeWhen issuing a LUN reset we should be allocating an internal command to avoid overwriting the original command.
--- drivers/scsi/csiostor/csio_scsi.c | 48 +++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 19 deletions(-)
drivers/scsi/csiostor/csio_scsi.c +29 -19
@@ -2057,10 +2057,12 @@ csio_tm_cbfn(struct csio_hw *hw, struct csio_ioreq *req)static int csio_eh_lun_reset_handler (struct scsi_cmnd *cmnd) { -struct csio_lnode *ln =shost_priv (cmnd->device->host); +struct scsi_cmnd *reset_cmnd; +struct scsi_device *sdev = cmnd->device; +struct csio_lnode *ln =shost_priv (sdev->host);struct csio_hw *hw =csio_lnode_to_hw (ln);struct csio_scsim *scsim =csio_hw_to_scsim (hw); -struct csio_rnode *rn = (struct csio_rnode *)(cmnd->device->hostdata); +struct csio_rnode *rn = (struct csio_rnode *)(sdev->hostdata);struct csio_ioreq *ioreq =NULL ;struct csio_scsi_qset *sqset;unsigned long flags;
@@ -2073,13 +2075,13 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) goto fail;csio_dbg (hw,"Request to reset LUN:%llu (ssni:0x%x tgtid:%d)\n" , - cmnd->device->lun, rn->flowid, rn->scsi_id); + sdev->lun, rn->flowid, rn->scsi_id);if (!csio_is_lnode_ready (ln)) {csio_err (hw,"LUN reset cannot be issued on non-ready" " local node vnpi:0x%x (LUN:%llu)\n" , - ln->vnp_flowid, cmnd->device->lun); + ln->vnp_flowid, sdev->lun); goto fail; }
@@ -2099,17 +2101,22 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)csio_err (hw,"LUN reset cannot be issued on non-ready" " remote node ssni:0x%x (LUN:%llu)\n" , - rn->flowid, cmnd->device->lun); + rn->flowid, sdev->lun); goto fail; } + reset_cmnd =scsi_get_internal_cmd (sdev,DMA_NONE ,REQ_NOWAIT ); +if (!reset_cmnd) { +csio_err (hw,"No free TMF request\n" ); + goto fail; + }/* Get a free ioreq structure - SM is already set to uninit */ ioreq =csio_get_scsi_ioreq_lock (hw, scsim);if (!ioreq) {csio_err (hw,"Out of IO request elements. Active # :%d\n" , scsim->stats.n_active); - goto fail; + goto fail_ret_cmnd; } sqset = &hw->sqset[ln->portid][smp_processor_id ()];
@@ -2119,11 +2126,11 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) ioreq->iq_idx = sqset->iq_idx; ioreq->eq_idx = sqset->eq_idx; -csio_scsi_cmnd (ioreq) = cmnd; - cmnd->host_scribble = (unsigned char *)ioreq; - cmnd->SCp.Status =0 ; +csio_scsi_cmnd (ioreq) = reset_cmnd; + reset_cmnd->host_scribble = (unsigned char *)ioreq; + reset_cmnd->SCp.Status =0 ; - cmnd->SCp.Message =FCP_TMF_LUN_RESET ; + reset_cmnd->SCp.Message =FCP_TMF_LUN_RESET ; ioreq->tmo =CSIO_SCSI_LUNRST_TMO_MS /1000 ;/*
@@ -2140,7 +2147,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) sld.level =CSIO_LEV_LUN ; sld.lnode = ioreq->lnode; sld.rnode = ioreq->rnode; - sld.oslun = cmnd->device->lun; + sld.oslun = sdev->lun;spin_lock_irqsave (&hw->lock, flags);/* Kick off TM SM on the ioreq */
@@ -2156,14 +2163,14 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)csio_dbg (hw,"Waiting max %d secs for LUN reset completion\n" , count * (CSIO_SCSI_TM_POLL_MS /1000 ));/* Wait for completion */ -while ((((struct scsi_cmnd *)csio_scsi_cmnd (ioreq)) == cmnd) +while ((((struct scsi_cmnd *)csio_scsi_cmnd (ioreq)) == reset_cmnd) && count--)msleep (CSIO_SCSI_TM_POLL_MS );/* LUN reset timed-out */ -if (((struct scsi_cmnd *)csio_scsi_cmnd (ioreq)) == cmnd) { +if (((struct scsi_cmnd *)csio_scsi_cmnd (ioreq)) == reset_cmnd) {csio_err (hw,"LUN reset (%d:%llu) timed out\n" , - cmnd->device->id, cmnd->device->lun); + sdev->id, sdev->lun);spin_lock_irq (&hw->lock);csio_scsi_drvcleanup (ioreq);
@@ -2174,11 +2181,12 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) }/* LUN reset returned, check cached status */ -if (cmnd->SCp.Status !=FW_SUCCESS ) { +if (reset_cmnd->SCp.Status !=FW_SUCCESS ) {csio_err (hw,"LUN reset failed (%d:%llu), status: %d\n" , - cmnd->device->id, cmnd->device->lun, cmnd->SCp.Status); - goto fail; + sdev->id, sdev->lun, reset_cmnd->SCp.Status); + goto fail_ret_cmnd; } +scsi_put_internal_cmd (reset_cmnd);/* LUN reset succeeded, Start aborting affected I/Os */ /*
@@ -2196,7 +2204,7 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)if (retval !=0 ) {csio_err (hw,"Attempt to abort I/Os during LUN reset of %llu" -" returned %d\n" , cmnd->device->lun, retval); +" returned %d\n" , sdev->lun, retval);/* Return I/Os back to active_q */ spin_lock_irq (&hw->lock);list_splice_tail_init (&local_q, &scsim->active_q);
@@ -2207,12 +2215,14 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)CSIO_INC_STATS (rn, n_lun_rst);csio_info (hw,"LUN reset occurred (%d:%llu)\n" , - cmnd->device->id, cmnd->device->lun); + sdev->id, sdev->lun);return SUCCESS ; fail_ret_ioreq:csio_put_scsi_ioreq_lock (hw, scsim, ioreq); +fail_ret_cmnd: +scsi_put_internal_cmd (reset_cmnd); fail:CSIO_INC_STATS (rn, n_lun_rst_fail);return FAILED ;
Signature · 1 line
2.16.4
PATCH v4 8/22 scsi: implement reserved command handling
In reply to Hannes ReineckeQuite some drivers are using management commands internally, which typically use the same hardware tag pool (ie they are being allocated from the same hardware resources) as the 'normal' I/O commands. These commands are set aside before allocating the block-mq tag bitmap, so they'll never show up as busy in the tag map.
The block-layer, OTOH, already has 'reserved_tags' to handle precisely this situation.
So this patch adds a new field 'nr_reserved_cmds' to the SCSI host template to instruct the block layer to set aside a tag space for these management commands by using reserved tags.
--- drivers/scsi/scsi_lib.c | 10 +++++++++- include/scsi/scsi_host.h | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +9 -1
@@ -1887,7 +1887,9 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)else tag_set->ops = &scsi_mq_ops_no_commit; tag_set->nr_hw_queues = shost->nr_hw_queues ? :1 ; - tag_set->queue_depth = shost->can_queue; + tag_set->queue_depth = + shost->can_queue + shost->nr_reserved_cmds; + tag_set->reserved_tags = shost->nr_reserved_cmds; tag_set->cmd_size = cmd_size; tag_set->numa_node =NUMA_NO_NODE ; tag_set->flags =BLK_MQ_F_SHOULD_MERGE ;
@@ -1910,6 +1912,9 @@ void scsi_mq_destroy_tags(struct Scsi_Host *shost)* @op_flags: request allocation flags * * Allocates a SCSI command for internal LLDD use. +* If 'nr_reserved_commands' is spectified by the host the +* command will be allocated from the reserved tag pool; +* otherwise the normal tag pool will be used. */ struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev,int data_direction,int op_flags)
@@ -1919,6 +1924,9 @@ struct scsi_cmnd *scsi_get_internal_cmd(struct scsi_device *sdev,blk_mq_req_flags_t flags =0 ;unsigned int op =REQ_INTERNAL | op_flags; +if (sdev->host->nr_reserved_cmds) + flags =BLK_MQ_REQ_RESERVED ; + op |= (data_direction ==DMA_TO_DEVICE ) ?REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ; rq =blk_mq_alloc_request (sdev->request_queue, op, flags);
include/scsi/scsi_host.h +11 -0
@@ -590,6 +590,11 @@ struct Scsi_Host {unsigned short max_cmd_len;int this_id; + +/* +* Number of commands this host can handle at the same time. +* This excludes reserved commands as specified by nr_reserved_cmds. +*/ int can_queue;short cmd_per_lun;short unsigned int sg_tablesize;
@@ -606,6 +611,12 @@ struct Scsi_Host {* is nr_hw_queues * can_queue. */ unsigned nr_hw_queues; + +/* +* Number of reserved commands to allocate, if any. +*/ +unsigned nr_reserved_cmds; + unsigned active_mode:2; unsigned unchecked_isa_dma:1;
Signature · 1 line
2.16.4
Re: [PATCH 08/22] scsi: implement reserved command handling
Quoted 33 lines · Hannes Reinecke
Quite some drivers are using management commands internally, which typically use the same hardware tag pool (ie they are being allocated from the same hardware resources) as the 'normal' I/O commands. These commands are set aside before allocating the block-mq tag bitmap, so they'll never show up as busy in the tag map.
The block-layer, OTOH, already has 'reserved_tags' to handle precisely this situation.
So this patch adds a new field 'nr_reserved_cmds' to the SCSI host template to instruct the block layer to set aside a tag space for these management commands by using reserved tags.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/scsi/scsi_lib.c | 10 +++++++++- include/scsi/scsi_host.h | 11 +++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-)drivers/scsi/scsi_lib.c +3
-1@@ -1887,7 +1887,9 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)else tag_set->ops = &scsi_mq_ops_no_commit; tag_set->nr_hw_queues = shost->nr_hw_queues ? :1 ; - tag_set->queue_depth = shost->can_queue; + tag_set->queue_depth = + shost->can_queue + shost->nr_reserved_cmds; + tag_set->reserved_tags = shost->nr_reserved_cmds; tag_set->cmd_size = cmd_size; tag_set->numa_node =NUMA_NO_NODE ; tag_set->flags =BLK_MQ_F_SHOULD_MERGE ;
drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1915
Quoted 4 lines
drivers/scsi/scsi_lib.c +1
-0@@ -1910,6 +1912,9 @@ void scsi_mq_destroy_tags(struct Scsi_Host *shost)* @op_flags: request allocation flags * * Allocates a SCSI command for internal LLDD use. +* If 'nr_reserved_commands' is spectified by the host the
/s/spectified/specified/
I suppose making this usable by drivers which don't set nr_reserved_commands is helpful (if not slightly strange). In that we can move drivers which don't use rq->tag currently - like pm8001 - to use it, and not have to worry about guessing some nr_reserved_commands to specify.
Quoted 31 lines
drivers/scsi/scsi_lib.c +4
-0+* command will be allocated from the reserved tag pool; +* otherwise the normal tag pool will be used. */ struct scsi_cmnd *scsi_get_internal_cmd (struct scsi_device *sdev,int data_direction,int op_flags)@@ -1919,6 +1924,9 @@ struct scsi_cmnd *scsi_get_internal_cmd(struct scsi_device *sdev,blk_mq_req_flags_t flags =0 ;unsigned int op =REQ_INTERNAL | op_flags; +if (sdev->host->nr_reserved_cmds) + flags = BLK_MQ_REQ_RESERVED; > + op |= (data_direction ==DMA_TO_DEVICE ) ?REQ_OP_SCSI_OUT :REQ_OP_SCSI_IN ; rq =blk_mq_alloc_request (sdev->request_queue, op, flags);include/scsi/scsi_host.h +5
-0@@ -590,6 +590,11 @@ struct Scsi_Host {unsigned short max_cmd_len;int this_id; + +/* +* Number of commands this host can handle at the same time. +* This excludes reserved commands as specified by nr_reserved_cmds. +*/ int can_queue;short cmd_per_lun;short unsigned int sg_tablesize;
include/scsi/scsi_host.h struct Scsi_Host { · line 611
Quoted 1 line
include/scsi/scsi_host.h +0
-0@@ -606,6 +611,12 @@ struct Scsi_Host {* is nr_hw_queues * can_queue.
If we are going to go this way, then could you update the comment on Scsi_Host.nr_hw_queues here? Currently we have "it is assumed that each hardware queue has a depth of can_queue..."
Thanks,
John
Quoted 8 lines
include/scsi/scsi_host.h +6
-0*/ unsigned nr_hw_queues; + +/* +* Number of reserved commands to allocate, if any. +*/ +unsigned nr_reserved_cmds; +
Re: [PATCH 08/22] scsi: implement reserved command handling
Quoted 41 lines · John Garry
Quoted 33 lines · Hannes Reinecke
Quite some drivers are using management commands internally, which typically use the same hardware tag pool (ie they are being allocated from the same hardware resources) as the 'normal' I/O commands. These commands are set aside before allocating the block-mq tag bitmap, so they'll never show up as busy in the tag map.
The block-layer, OTOH, already has 'reserved_tags' to handle precisely this situation.
So this patch adds a new field 'nr_reserved_cmds' to the SCSI host template to instruct the block layer to set aside a tag space for these management commands by using reserved tags.Signed-off-by Hannes Reinecke <[email protected]>---
drivers/scsi/scsi_lib.c | 10 +++++++++-
include/scsi/scsi_host.h| 11 +++++++++++2 files changed, 20 insertions(+), 1 deletion(-)drivers/scsi/scsi_lib.c +0
-0@@ -1887,7 +1887,9 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)else
tag_set->ops=&scsi_mq_ops_no_commit;tag_set->nr_hw_queues=shost->nr_hw_queues? : 1; -tag_set->queue_depth=shost->can_queue;
+tag_set->queue_depth=
+shost->can_queue+shost->nr_reserved_cmds; +tag_set->reserved_tags=shost->nr_reserved_cmds;tag_set->cmd_size=cmd_size;tag_set->numa_node=NUMA_NO_NODE;tag_set->flags=BLK_MQ_F_SHOULD_MERGE;drivers/scsi/scsi_lib.c void scsi_mq_destroy_tags(struct Scsi_Host *shost) · line 1915
Quoted 4 lines
drivers/scsi/scsi_lib.c +1
-0@@ -1910,6 +1912,9 @@ void scsi_mq_destroy_tags(struct Scsi_Host *shost) * @op_flags: request allocation flags * * Allocates a SCSI command for internal LLDD use. + * If 'nr_reserved_commands' is spectified by the host the/s/spectified/specified/
Quoted 2 lines
I suppose making this usable by drivers which don't set
nr_reserved_commandsis helpful (if not slightly strange). In that we can move drivers which don't userq->tagcurrently - like pm8001 - to use it, and not have to worry about guessing somenr_reserved_commandsto specify.
That's what I plan to do, and in fact have patches queued for that. I've just posted the initial patchset here to agree on the interface and provide drivers which benefit from it with very little churn.
In a later patchset I'll be converting other drivers and subsystems like megaraid_sas and libsas etc; those I had in the v3 version but that was deemed to complex for the initial submission.
Hence I've left them out in this round.
Quoted 25 lines
Quoted 25 lines
drivers/scsi/scsi_lib.c +4
-0+* command will be allocated from the reserved tag pool; +* otherwise the normal tag pool will be used. */ struct scsi_cmnd *scsi_get_internal_cmd(struct scsi_device *sdev, int data_direction, int op_flags)@@ -1919,6 +1924,9 @@ struct scsi_cmnd *scsi_get_internal_cmd(structscsi_device *sdev, blk_mq_req_flags_t flags = 0; unsigned int op = REQ_INTERNAL | op_flags; + if (sdev->host->nr_reserved_cmds) + flags = BLK_MQ_REQ_RESERVED; > +op |= (
data_direction==DMA_TO_DEVICE) ?REQ_OP_SCSI_OUT:REQ_OP_SCSI_IN;
rq =blk_mq_alloc_request(sdev->request_queue, op, flags);include/scsi/scsi_host.h +4
-0@@ -590,6 +590,11 @@ struct Scsi_Host { unsigned short max_cmd_len; int this_id; + + /* +* Number of commands this host can handle at the same time. +* This excludes reserved commands as specified by nr_reserved_cmds.
Quoted 9 lines
include/scsi/scsi_host.h struct Scsi_Host { · line 611
Quoted 6 lines
include/scsi/scsi_host.h +1
-0+*/ int can_queue; short cmd_per_lun; short unsigned int sg_tablesize;@@ -606,6 +611,12 @@ struct Scsi_Host { * is nr_hw_queues * can_queue.If we are going to go this way, then could you update the comment on Scsi_Host.nr_hw_queues here? Currently we have "it is assumed that each hardware queue has a depth of
can_queue..."
Ah. Right. Yes, will do.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
PATCH v4 9/22 scsi: use real inquiry data when initialising devices
In reply to Hannes ReineckeUse dummy inquiry data when initialising devices and not just some 'nullnullnull' string.
--- drivers/scsi/scsi_scan.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-)
drivers/scsi/scsi_scan.c +25 -9
@@ -81,7 +81,27 @@#define SCSI_SCAN_TARGET_PRESENT 1#define SCSI_SCAN_LUN_PRESENT 2 -static const char *scsi_null_device_strs ="nullnullnullnull" ; +/* +* Dummy inquiry for virtual LUNs: +* +* standard INQUIRY: [qualifier indicates no connected LU] +* PQual=1 Device_type=31 RMB=0 LU_CONG=0 version=0x05 [SPC-3] +* [AERC=0] [TrmTsk=0] NormACA=0 HiSUP=0 Resp_data_format=2 +* SCCS=0 ACC=0 TPGS=0 3PC=0 Protect=0 [BQue=0] +* EncServ=0 MultiP=0 [MChngr=0] [ACKREQQ=0] Addr16=0 +* [RelAdr=0] WBus16=0 Sync=0 [Linked=0] [TranDis=0] CmdQue=0 +* length=36 (0x24) Peripheral device type: no physical device on this lu +* Vendor identification: LINUX +* Product identification: VIRTUALLUN +* Product revision level: 1.0 +*/ +static const unsigned char scsi_null_inquiry[36 ] = { +0x3f ,0x00 ,0x05 ,0x02 ,0x1f ,0x00 ,0x00 ,0x00 , +0x4c ,0x49 ,0x4e ,0x55 ,0x58 ,0x20 ,0x20 ,0x20 , +0x56 ,0x49 ,0x52 ,0x54 ,0x55 ,0x41 ,0x4c ,0x4c , +0x55 ,0x4e ,0x20 ,0x20 ,0x20 ,0x20 ,0x20 ,0x20 , +0x31 ,0x2e ,0x30 ,0x20 +};#define MAX_SCSI_LUNS 512
@@ -224,9 +244,10 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,if (!sdev) goto out; - sdev->vendor = scsi_null_device_strs; - sdev->model = scsi_null_device_strs; - sdev->rev = scsi_null_device_strs; + sdev->type = scsi_null_inquiry[0 ] &0x1f ; + sdev->vendor = scsi_null_inquiry +8 ; + sdev->model = scsi_null_inquiry +16 ; + sdev->rev = scsi_null_inquiry +32 ; sdev->host = shost; sdev->queue_ramp_up_period =SCSI_DEFAULT_RAMP_UP_PERIOD ; sdev->id = starget->id;
@@ -253,11 +274,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget,* slave_configure function */ sdev->max_device_blocked =SCSI_DEFAULT_DEVICE_BLOCKED ; -/* -* Some low level driver could use device->type -*/ - sdev->type =-1 ; -/* * Assume that the device will have handshaking problems, * and then fix this field later if it turns out it
Signature · 1 line
2.16.4
PATCH v4 10/22 scsi: Use dummy inquiry data for the host device
In reply to Hannes ReineckeAttach the dummy inquiry data to the scsi host device and use it to check if any given device is a scsi host device.
--- drivers/scsi/scsi_scan.c | 17 +++++++++++++++-- drivers/scsi/scsi_sysfs.c | 3 ++- include/scsi/scsi_host.h | 7 ++++--- 3 files changed, 21 insertions(+), 6 deletions(-)
drivers/scsi/scsi_scan.c +15 -2
@@ -1920,9 +1920,11 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost) goto out; sdev =scsi_alloc_sdev (starget,0 ,NULL ); -if (sdev) +if (sdev) { sdev->borken =0 ; -else + sdev->inquiry = (unsigned char *)scsi_null_inquiry; + sdev->inquiry_len =sizeof (scsi_null_inquiry); + }else scsi_target_reap (starget);put_device (&starget->dev); out:
@@ -1947,3 +1949,14 @@ void scsi_free_host_dev(struct scsi_device *sdev) }EXPORT_SYMBOL (scsi_free_host_dev); +/** +* scsi_device_is_host_dev - Check if a scsi device is a host device +* @sdev: SCSI device to test +* +* Returns: true if @sdev is a host device, false otherwise +*/ +bool scsi_device_is_host_dev (struct scsi_device *sdev) +{ +return ((const unsigned char *)sdev->inquiry == scsi_null_inquiry); +} +EXPORT_SYMBOL_GPL (scsi_device_is_host_dev);
drivers/scsi/scsi_sysfs.c +2 -1
@@ -485,7 +485,8 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)kfree_rcu (vpd_pg80, rcu);if (vpd_pg89)kfree_rcu (vpd_pg89, rcu); -kfree (sdev->inquiry); +if (!scsi_device_is_host_dev (sdev)) +kfree (sdev->inquiry);kfree (sdev);if (parent)
include/scsi/scsi_host.h +4 -3
@@ -786,14 +786,15 @@ void scsi_host_busy_iter(struct Scsi_Host *,struct class_container ;/* -* These two functions are used to allocate and free a pseudo device -* which will connect to the host adapter itself rather than any -* physical device. You must deallocate when you are done with the +* These three functions are used to allocate, free, and test for +* a pseudo device which will connect to the host adapter itself rather +* than any physical device. You must deallocate when you are done with the * thing. This physical pseudo-device isn't real and won't be available * from any high-level drivers. */ extern void scsi_free_host_dev (struct scsi_device *);extern struct scsi_device *scsi_get_host_dev (struct Scsi_Host *); +bool scsi_device_is_host_dev (struct scsi_device *);/* * DIF defines the exchange of protection information between
Signature · 1 line
2.16.4
PATCH v4 11/22 scsi: revamp host device handling
In reply to Hannes ReineckeEnsure that the host device is excluded from scanning by setting the BLIST_NOLUN flag, and avoid it being presented in sysfs. Also move the device id from using the ->this_id value as target id (which is a bit odd as it's typically is set to -1 anyway) to using ->max_channel + 1 as the channel number and '0' as the target id.
With that the host device is now handled like any other scsi device, which means we can drop the scsi_put_host_dev() function and let scsi_forget_host() etc handle the deallocation.
We only need to ensure that the host device is deallocated last is the driver might need it to send commands during teardown.
--- drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/scsi_scan.c | 55 ++++++++++++++++++++++++--------------------- include/scsi/scsi_host.h | 13 ++++++----- 3 files changed, 37 insertions(+), 32 deletions(-)
drivers/scsi/scsi_devinfo.c +1 -0
@@ -195,6 +195,7 @@ static struct { {"Intel", "Multi-Flex", NULL, BLIST_NO_RSOC}, {"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36}, {"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN}, + {"LINUX", "VIRTUALLUN", NULL, BLIST_NOLUN}, {"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES}, {"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES}, {"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
drivers/scsi/scsi_scan.c +29 -26
105 lines not on this page · raw message
include/scsi/scsi_host.h +7 -6
@@ -786,14 +786,15 @@ void scsi_host_busy_iter(struct Scsi_Host *,struct class_container ;/* -* These three functions are used to allocate, free, and test for -* a pseudo device which will connect to the host adapter itself rather -* than any physical device. You must deallocate when you are done with the -* thing. This physical pseudo-device isn't real and won't be available +* These functions are used to allocate and test a pseudo device +* which will refer to the host adapter itself rather than any +* physical device. The device will be deallocated together with +* all other scsi devices, so there is no need to have a separate +* function to free it. +* This device will not show up in sysfs and won't be available * from any high-level drivers. */ -extern void scsi_free_host_dev (struct scsi_device *); -extern struct scsi_device *scsi_get_host_dev (struct Scsi_Host *); +struct scsi_device *scsi_get_host_dev (struct Scsi_Host *);bool scsi_device_is_host_dev (struct scsi_device *);/*
Signature · 1 line
2.16.4
PATCH v4 12/22 snic: use reserved commands
In reply to Hannes ReineckeAllocate a host device and use internal commands for host and device reset.
This allows us to remove the special handling of host and bus reset commands.
--- drivers/scsi/snic/snic.h | 4 +- drivers/scsi/snic/snic_main.c | 7 ++ drivers/scsi/snic/snic_scsi.c | 159 +++++++++++++++++------------------------- 3 files changed, 73 insertions(+), 97 deletions(-)
drivers/scsi/snic/snic.h +2 -2
@@ -59,7 +59,6 @@*/ #define SNIC_TAG_ABORT BIT(30)/* Tag indicating abort */ #define SNIC_TAG_DEV_RST BIT(29)/* Tag for device reset */ -#define SNIC_TAG_IOCTL_DEV_RST BIT(28)/* Tag for User Device Reset */ #define SNIC_TAG_MASK (BIT(24) - 1)/* Mask for lookup */ #define SNIC_NO_TAG -1
@@ -278,6 +277,7 @@ struct snic {/* Scsi Host info */ struct Scsi_Host *shost; +struct scsi_device *shost_dev;/* vnic related structures */ struct vnic_dev_bar bar0;
@@ -380,7 +380,7 @@ int snic_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);int snic_abort_cmd (struct scsi_cmnd *);int snic_device_reset (struct scsi_cmnd *);int snic_host_reset (struct scsi_cmnd *); -int snic_reset (struct Scsi_Host *,struct scsi_cmnd *); +int snic_reset (struct Scsi_Host *);void snic_shutdown_scsi_cleanup (struct snic *);
drivers/scsi/snic/snic_main.c +7 -0
@@ -303,6 +303,7 @@ static int snic_add_host(struct Scsi_Host *shost, struct pci_dev *pdev) { int ret = 0; +struct snic *snic =shost_priv (shost); ret =scsi_add_host (shost, &pdev->dev);if (ret) {
@@ -313,6 +314,12 @@ snic_add_host(struct Scsi_Host *shost, struct pci_dev *pdev)return ret; } + snic->shost_dev =scsi_get_host_dev (shost); +if (!snic->shost_dev) { +SNIC_HOST_ERR (shost, +"snic: scsi_get_virtual_dev failed\n" ); +return -ENOMEM ; + }SNIC_BUG_ON (shost->work_q !=NULL );snprintf (shost->work_q_name,sizeof (shost->work_q_name),"scsi_wq_%d" , shost->host_no);
drivers/scsi/snic/snic_scsi.c +64 -95
362 lines not on this page · raw message
Signature · 1 line
2.16.4
PATCH v4 13/22 snic: use tagset iter for traversing commands
In reply to Hannes ReineckeUse the tagset iter to traverse active commands during device and hba reset.
--- drivers/scsi/snic/snic_scsi.c | 364 +++++++++++++++++++++--------------------- 1 file changed, 186 insertions(+), 178 deletions(-)
drivers/scsi/snic/snic_scsi.c +186 -178
@@ -1645,90 +1645,97 @@ snic_abort_cmd(struct scsi_cmnd *sc)return ret; } +struct snic_cmd_pending_iter_data { +struct snic *snic; +struct scsi_device *sdev; +int ret; +}; - -static int -snic_is_abts_pending (struct snic *snic,struct scsi_cmnd *lr_sc) +static bool +snic_is_abts_pending_iter (struct scsi_cmnd *sc,void *data,bool reserved) { +struct snic_cmd_pending_iter_data *iter_data = data;struct snic_req_info *rqi =NULL ; -struct scsi_cmnd *sc =NULL ; -struct scsi_device *lr_sdev =NULL ;spinlock_t *io_lock =NULL ; -u32 tag;unsigned long flags; -if (lr_sc) - lr_sdev = lr_sc->device; +if (reserved) +return true; -/* walk through the tag map, an dcheck if IOs are still pending in fw*/ -for (tag =0 ; tag < snic->max_tag_id; tag++) { - io_lock =snic_io_lock_tag (snic, tag); - -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (snic->shost, tag); - -if (!sc || (lr_sc && (sc->device != lr_sdev || sc == lr_sc))) { -spin_unlock_irqrestore (io_lock, flags); +if (iter_data->sdev && iter_data->sdev != sc->device) +return true; -continue ; - } + io_lock =snic_io_lock_tag (iter_data->snic, sc->request->tag); +spin_lock_irqsave (io_lock, flags); - rqi = (struct snic_req_info *)CMD_SP (sc); -if (!rqi) { -spin_unlock_irqrestore (io_lock, flags); + rqi = (struct snic_req_info *)CMD_SP (sc); +if (!rqi) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } -continue ; - } +/* +* Found IO that is still pending w/ firmware and belongs to +* the LUN that is under reset, if lr_sc != NULL +*/ +SNIC_SCSI_DBG (iter_data->snic->shost,"Found IO in %s on LUN\n" , +snic_ioreq_state_to_str (CMD_STATE (sc))); -/* -* Found IO that is still pending w/ firmware and belongs to -* the LUN that is under reset, if lr_sc != NULL -*/ -SNIC_SCSI_DBG (snic->shost,"Found IO in %s on LUN\n" , -snic_ioreq_state_to_str (CMD_STATE (sc))); +if (CMD_STATE (sc) ==SNIC_IOREQ_ABTS_PENDING ) + iter_data->ret =1 ; +spin_unlock_irqrestore (io_lock, flags); -if (CMD_STATE (sc) ==SNIC_IOREQ_ABTS_PENDING ) { -spin_unlock_irqrestore (io_lock, flags); +return true; +} -return 1 ; - } +static int +snic_is_abts_pending (struct snic *snic,struct scsi_device *lr_sdev) +{ +struct snic_cmd_pending_iter_data iter_data = { + .snic = snic, + .sdev = lr_sdev, + .ret =0 , + }; -spin_unlock_irqrestore (io_lock, flags); - } +/* walk through the tag map, an dcheck if IOs are still pending in fw*/ +scsi_host_busy_iter (snic->shost, + snic_is_abts_pending_iter, &iter_data); -return 0 ; +return iter_data.ret; }/* end of snic_is_abts_pending */ -static int -snic_dr_clean_single_req (struct snic *snic, -u32 tag, -struct scsi_device *lr_sdev) +static bool +snic_dr_clean_single_req (struct scsi_cmnd *sc,void *data,bool reserved) {struct snic_req_info *rqi =NULL ;struct snic_tgt *tgt =NULL ; -struct scsi_cmnd *sc =NULL ;spinlock_t *io_lock =NULL ;u32 sv_state =0 , tmf =0 ;DECLARE_COMPLETION_ONSTACK (tm_done);unsigned long flags;int ret =0 ; +struct snic_cmd_pending_iter_data *iter_data = data; +struct snic *snic = iter_data->snic; - io_lock =snic_io_lock_tag (snic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (snic->shost, tag); +if (reserved) +return true; -/* Ignore Cmd that don't belong to Lun Reset device */ -if (!sc || sc->device != lr_sdev) - goto skip_clean; +if (sc->device != iter_data->sdev) +return true; + io_lock =snic_io_lock_tag (snic, sc->request->tag); +spin_lock_irqsave (io_lock, flags); rqi = (struct snic_req_info *)CMD_SP (sc); - -if (!rqi) - goto skip_clean; +if (!rqi) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } -if (CMD_STATE (sc) ==SNIC_IOREQ_ABTS_PENDING ) - goto skip_clean; +if (CMD_STATE (sc) ==SNIC_IOREQ_ABTS_PENDING ) { +spin_unlock_irqrestore (io_lock, flags); +return true; + } if ((CMD_FLAGS(sc) & SNIC_DEVICE_RESET) &&
@@ -1737,8 +1744,8 @@ snic_dr_clean_single_req(struct snic *snic,SNIC_SCSI_DBG (snic->shost,"clean_single_req: devrst is not pending sc 0x%p\n" , sc); - - goto skip_clean; +spin_unlock_irqrestore (io_lock, flags); +return true; } SNIC_SCSI_DBG(snic->shost,
@@ -1781,7 +1788,7 @@ snic_dr_clean_single_req(struct snic *snic,if (ret) {SNIC_HOST_ERR (snic->shost,"clean_single_req_err:sc %p, tag %d abt failed. tm_tag %d flags 0x%llx\n" , - sc, tag, rqi->tm_tag,CMD_FLAGS (sc)); + sc, sc->request->tag, rqi->tm_tag,CMD_FLAGS (sc));spin_lock_irqsave (io_lock, flags); rqi = (struct snic_req_info *)CMD_SP (sc);
@@ -1792,8 +1799,9 @@ snic_dr_clean_single_req(struct snic *snic,if (CMD_STATE (sc) ==SNIC_IOREQ_ABTS_PENDING )CMD_STATE (sc) = sv_state; - ret =1 ; - goto skip_clean; + iter_data->ret =1 ; +spin_unlock_irqrestore (io_lock, flags); +return false; }spin_lock_irqsave (io_lock, flags);
@@ -1810,7 +1818,8 @@ snic_dr_clean_single_req(struct snic *snic, rqi = (struct snic_req_info *)CMD_SP (sc);if (!rqi) {CMD_FLAGS (sc) |=SNIC_IO_ABTS_TERM_REQ_NULL ; - goto skip_clean; +spin_unlock_irqrestore (io_lock, flags); +return true;; } rqi->abts_done =NULL ;
@@ -1818,14 +1827,13 @@ snic_dr_clean_single_req(struct snic *snic,if (CMD_ABTS_STATUS (sc) ==SNIC_INVALID_CODE ) {SNIC_HOST_ERR (snic->shost,"clean_single_req_err:sc %p tag %d abt still pending w/ fw, tm_tag %d flags 0x%llx\n" , - sc, tag, rqi->tm_tag,CMD_FLAGS (sc)); + sc, sc->request->tag, rqi->tm_tag,CMD_FLAGS (sc));CMD_FLAGS (sc) |=SNIC_IO_ABTS_TERM_DONE ; - ret =1 ; - - goto skip_clean; + iter_data->ret =1 ; +spin_unlock_irqrestore (io_lock, flags); +return false; } -CMD_STATE (sc) =SNIC_IOREQ_ABTS_COMPLETE ;CMD_SP (sc) =NULL ;spin_unlock_irqrestore (io_lock, flags);
@@ -1835,39 +1843,31 @@ snic_dr_clean_single_req(struct snic *snic, sc->result = (DID_ERROR <<16 ); sc->scsi_done (sc); - ret =0 ; - -return ret; - -skip_clean: -spin_unlock_irqrestore (io_lock, flags); - -return ret; +return true; }/* end of snic_dr_clean_single_req */ static int -snic_dr_clean_pending_req (struct snic *snic,struct scsi_cmnd *lr_sc) +snic_dr_clean_pending_req (struct snic *snic,struct scsi_device *lr_sdev) { -struct scsi_device *lr_sdev = lr_sc->device; -u32 tag =0 ;int ret =FAILED ; +struct snic_cmd_pending_iter_data iter_data = { + .snic = snic, + .sdev = lr_sdev, + .ret =0 , + }; -for (tag =0 ; tag < snic->max_tag_id; tag++) { -if (tag ==snic_cmd_tag (lr_sc)) -continue ; +scsi_host_busy_iter (snic->shost, + snic_dr_clean_single_req, &iter_data); +if (iter_data.ret) { +SNIC_HOST_ERR (snic->shost,"clean_err = %d\n" , iter_data.ret); - ret =snic_dr_clean_single_req (snic, tag, lr_sdev); -if (ret) { -SNIC_HOST_ERR (snic->shost,"clean_err:tag = %d\n" , tag); - - goto clean_err; - } + goto clean_err; }schedule_timeout (msecs_to_jiffies (100 ));/* Walk through all the cmds and check abts status. */ -if (snic_is_abts_pending (snic, lr_sc)) { +if (snic_is_abts_pending (snic, lr_sdev)) { ret =FAILED ; goto clean_err;
@@ -1954,7 +1954,7 @@ snic_dr_finish(struct snic *snic, struct scsi_cmnd *sc)* succeeds. */ - ret =snic_dr_clean_pending_req (snic, sc); + ret =snic_dr_clean_pending_req (snic, sc->device);if (ret) {spin_lock_irqsave (io_lock, flags); SNIC_SCSI_DBG(snic->shost,
@@ -2411,77 +2411,79 @@ snic_cmpl_pending_tmreq(struct snic *snic, struct scsi_cmnd *sc)complete (rqi->abts_done); } -/* -* snic_scsi_cleanup: Walks through tag map and releases the reqs -*/ -static void -snic_scsi_cleanup (struct snic *snic) +static bool +snic_scsi_cleanup_iter (struct scsi_cmnd *sc,void *data,bool rsvd) { +struct snic *snic = data;struct snic_req_info *rqi =NULL ; -struct scsi_cmnd *sc =NULL ;spinlock_t *io_lock =NULL ;unsigned long flags;int tag;u64 st_time =0 ; -SNIC_SCSI_DBG (snic->shost,"sc_clean: scsi cleanup.\n" ); - -for (tag =0 ; tag < snic->max_tag_id; tag++) { - io_lock =snic_io_lock_tag (snic, tag); -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (snic->shost, tag); -if (unlikely (snic_tmreq_pending (sc))) { -/* -* When FW Completes reset w/o sending completions -* for outstanding ios. -*/ -snic_cmpl_pending_tmreq (snic, sc); -spin_unlock_irqrestore (io_lock, flags); - -continue ; - } - - rqi = (struct snic_req_info *)CMD_SP (sc); -if (!rqi) { -spin_unlock_irqrestore (io_lock, flags); + io_lock =snic_io_lock_tag (snic, sc->request->tag); +spin_lock_irqsave (io_lock, flags); +if (unlikely (snic_tmreq_pending (sc))) { +/* +* When FW Completes reset w/o sending completions +* for outstanding ios. +*/ +snic_cmpl_pending_tmreq (snic, sc); +spin_unlock_irqrestore (io_lock, flags); - goto cleanup; - } +return true; + } + rqi = (struct snic_req_info *)CMD_SP (sc); +if (!rqi) { +spin_unlock_irqrestore (io_lock, flags); + goto cleanup; + } -SNIC_SCSI_DBG (snic->shost, -"sc_clean: sc %p, rqi %p, tag %d flags 0x%llx\n" , - sc, rqi, tag,CMD_FLAGS (sc)); +SNIC_SCSI_DBG (snic->shost, +"sc_clean: sc %p, rqi %p, tag %d flags 0x%llx\n" , + sc, rqi, tag,CMD_FLAGS (sc)); -CMD_SP (sc) =NULL ; -CMD_FLAGS (sc) |=SNIC_SCSI_CLEANUP ; -spin_unlock_irqrestore (io_lock, flags); - st_time = rqi->start_time; +CMD_SP (sc) =NULL ; +CMD_FLAGS (sc) |=SNIC_SCSI_CLEANUP ; +spin_unlock_irqrestore (io_lock, flags); + st_time = rqi->start_time; -SNIC_HOST_INFO (snic->shost, -"sc_clean: Releasing rqi %p : flags 0x%llx\n" , - rqi,CMD_FLAGS (sc)); +SNIC_HOST_INFO (snic->shost, +"sc_clean: Releasing rqi %p : flags 0x%llx\n" , + rqi,CMD_FLAGS (sc)); -snic_release_req_buf (snic, rqi, sc); +snic_release_req_buf (snic, rqi, sc); cleanup: - sc->result =DID_TRANSPORT_DISRUPTED <<16 ; -SNIC_HOST_INFO (snic->shost, -"sc_clean: DID_TRANSPORT_DISRUPTED for sc %p, Tag %d flags 0x%llx rqi %p duration %u msecs\n" , - sc, sc->request->tag,CMD_FLAGS (sc), rqi, -jiffies_to_msecs (jiffies - st_time)); + sc->result =DID_TRANSPORT_DISRUPTED <<16 ; +SNIC_HOST_INFO (snic->shost, +"sc_clean: DID_TRANSPORT_DISRUPTED for sc %p, Tag %d flags 0x%llx rqi %p duration %u msecs\n" , + sc, sc->request->tag,CMD_FLAGS (sc), rqi, +jiffies_to_msecs (jiffies - st_time)); -/* Update IO stats */ -snic_stats_update_io_cmpl (&snic->s_stats); +/* Update IO stats */ +snic_stats_update_io_cmpl (&snic->s_stats); -if (sc->scsi_done) { -SNIC_TRC (snic->shost->host_no, tag, (ulong ) sc, -jiffies_to_msecs (jiffies - st_time),0 , -SNIC_TRC_CMD (sc), -SNIC_TRC_CMD_STATE_FLAGS (sc)); +if (sc->scsi_done) { +SNIC_TRC (snic->shost->host_no, tag, (ulong ) sc, +jiffies_to_msecs (jiffies - st_time),0 , +SNIC_TRC_CMD (sc), +SNIC_TRC_CMD_STATE_FLAGS (sc)); - sc->scsi_done (sc); - } + sc->scsi_done (sc); } +return true; +} + +/* +* snic_scsi_cleanup: Walks through tag map and releases the reqs +*/ +static void +snic_scsi_cleanup (struct snic *snic) +{ +SNIC_SCSI_DBG (snic->shost,"sc_clean: scsi cleanup.\n" ); + +scsi_host_busy_iter (snic->shost, snic_scsi_cleanup_iter, snic); }/* end of snic_scsi_cleanup */ void
@@ -2578,6 +2580,40 @@ snic_internal_abort_io(struct snic *snic, struct scsi_cmnd *sc, int tmf)return ret; }/* end of snic_internal_abort_io */ +struct snic_tgt_scsi_abort_io_iter_data { +struct snic *snic; +struct snic_tgt *tgt; +int tmf; +int abt_cnt; +}; + +static bool +snic_tgt_scsi_abort_io_iter (struct scsi_cmnd *sc,void *data,bool reserved) +{ +struct snic_tgt_scsi_abort_io_iter_data *iter_data = data; +struct snic_tgt *sc_tgt =NULL ; +int ret; + +if (reserved) +return true; + + sc_tgt =starget_to_tgt (scsi_target (sc->device)); +if (sc_tgt != iter_data->tgt) +return true; + + ret =snic_internal_abort_io (iter_data->snic, sc, iter_data->tmf); +if (ret <0 ) { +SNIC_HOST_ERR (iter_data->snic->shost, +"tgt_abt_io: Tag %x, Failed w err = %d\n" , +snic_cmd_tag (sc), ret); +return true; + } + +if (ret ==SUCCESS ) + iter_data->abt_cnt++; +return true; +} +/* * snic_tgt_scsi_abort_io : called by snic_tgt_del */
@@ -2585,11 +2621,10 @@ int snic_tgt_scsi_abort_io(struct snic_tgt *tgt) {struct snic *snic =NULL ; -struct scsi_cmnd *sc =NULL ; -struct snic_tgt *sc_tgt =NULL ; -spinlock_t *io_lock =NULL ; -unsigned long flags; -int ret =0 , tag, abt_cnt =0 , tmf =0 ; +struct snic_tgt_scsi_abort_io_iter_data iter_data = { + .tgt = tgt, + .abt_cnt =0 , + };if (!tgt)return -1 ;
@@ -2598,43 +2633,16 @@ snic_tgt_scsi_abort_io(struct snic_tgt *tgt)SNIC_SCSI_DBG (snic->shost,"tgt_abt_io: Cleaning Pending IOs.\n" );if (tgt->tdata.typ ==SNIC_TGT_DAS ) - tmf =SNIC_ITMF_ABTS_TASK ; + iter_data.tmf =SNIC_ITMF_ABTS_TASK ;else - tmf =SNIC_ITMF_ABTS_TASK_TERM ; - -for (tag =0 ; tag < snic->max_tag_id; tag++) { - io_lock =snic_io_lock_tag (snic, tag); - -spin_lock_irqsave (io_lock, flags); - sc =scsi_host_find_tag (snic->shost, tag); -if (!sc) { -spin_unlock_irqrestore (io_lock, flags); - -continue ; - } + iter_data.tmf =SNIC_ITMF_ABTS_TASK_TERM ; + iter_data.snic = snic; - sc_tgt =starget_to_tgt (scsi_target (sc->device)); -if (sc_tgt != tgt) { -spin_unlock_irqrestore (io_lock, flags); - -continue ; - } -spin_unlock_irqrestore (io_lock, flags); - - ret =snic_internal_abort_io (snic, sc, tmf); -if (ret <0 ) { -SNIC_HOST_ERR (snic->shost, -"tgt_abt_io: Tag %x, Failed w err = %d\n" , - tag, ret); - -continue ; - } - -if (ret ==SUCCESS ) - abt_cnt++; - } +scsi_host_busy_iter (snic->shost, + snic_tgt_scsi_abort_io_iter, &iter_data); -SNIC_SCSI_DBG (snic->shost,"tgt_abt_io: abt_cnt = %d\n" , abt_cnt); +SNIC_SCSI_DBG (snic->shost,"tgt_abt_io: abt_cnt = %d\n" , + iter_data.abt_cnt);return 0 ; }/* end of snic_tgt_scsi_abort_io */
Signature · 1 line
2.16.4
kernel test robot
build botRe: [PATCH 13/22] snic: use tagset iter for traversing commands
I love your patch! Perhaps something to improve:
Hi Hannes,
I love your patch! Perhaps something to improve:
[auto build test WARNING on mkp-scsi/for-next]
[also build test WARNING on scsi/for-next block/for-next linus/master v5.8-rc2 next-20200625] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Hannes-Reinecke/scsi-enable-reserved-commands-for-LLDDs/20200625-220401 base: https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git for-next config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 8911a35180c6777188fefe0954a2451a2b91deaf)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/scsi/snic/snic_scsi.c:2444:18: warning: variable 'tag' is uninitialized when used here [-Wuninitialized]
sc, rqi, tag, CMD_FLAGS(sc));
^~~
drivers/scsi/snic/snic.h:149:40: note: expanded from macro 'SNIC_SCSI_DBG'
shost_printk(KERN_INFO, host, fmt, ##args);)
^~~~
include/scsi/scsi_host.h:712:52: note: expanded from macro 'shost_printk'
dev_printk(prefix, &(shost)->shost_gendev, fmt, ##a)
^
drivers/scsi/snic/snic.h:139:4: note: expanded from macro 'SNIC_CHECK_LOGGING'
CMD; \
^~~
drivers/scsi/snic/snic_scsi.c:2421:9: note: initialize the variable 'tag' to silence this warning
int tag;
^
= 01 warning generated.
vim +/tag +2444 drivers/scsi/snic/snic_scsi.c
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2413
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2414 static bool
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2415 snic_scsi_cleanup_iter(struct scsi_cmnd *sc, void *data, bool rsvd)
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2416 {
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2417 struct snic *snic = data;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2418 struct snic_req_info *rqi = NULL;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2419 spinlock_t *io_lock = NULL;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2420 unsigned long flags;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2421 int tag;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2422 u64 st_time = 0;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2423
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2424 io_lock = snic_io_lock_tag(snic, sc->request->tag);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2425 spin_lock_irqsave(io_lock, flags);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2426 if (unlikely(snic_tmreq_pending(sc))) {
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2427 /*
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2428 * When FW Completes reset w/o sending completions
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2429 * for outstanding ios.
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2430 */
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2431 snic_cmpl_pending_tmreq(snic, sc);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2432 spin_unlock_irqrestore(io_lock, flags);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2433
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2434 return true;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2435 }
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2436 rqi = (struct snic_req_info *) CMD_SP(sc);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2437 if (!rqi) {
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2438 spin_unlock_irqrestore(io_lock, flags);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2439 goto cleanup;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2440 }
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2441
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2442 SNIC_SCSI_DBG(snic->shost,
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2443 "sc_clean: sc %p, rqi %p, tag %d flags 0x%llx\n",
c8806b6c9e824f Narsimhulu Musini 2015-05-29 @2444 sc, rqi, tag, CMD_FLAGS(sc));
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2445
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2446 CMD_SP(sc) = NULL;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2447 CMD_FLAGS(sc) |= SNIC_SCSI_CLEANUP;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2448 spin_unlock_irqrestore(io_lock, flags);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2449 st_time = rqi->start_time;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2450
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2451 SNIC_HOST_INFO(snic->shost,
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2452 "sc_clean: Releasing rqi %p : flags 0x%llx\n",
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2453 rqi, CMD_FLAGS(sc));
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2454
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2455 snic_release_req_buf(snic, rqi, sc);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2456
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2457 cleanup:
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2458 sc->result = DID_TRANSPORT_DISRUPTED << 16;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2459 SNIC_HOST_INFO(snic->shost,
3f5c11a463fd87 Narsimhulu Musini 2016-03-17 2460 "sc_clean: DID_TRANSPORT_DISRUPTED for sc %p, Tag %d flags 0x%llx rqi %p duration %u msecs\n",
3f5c11a463fd87 Narsimhulu Musini 2016-03-17 2461 sc, sc->request->tag, CMD_FLAGS(sc), rqi,
3f5c11a463fd87 Narsimhulu Musini 2016-03-17 2462 jiffies_to_msecs(jiffies - st_time));
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2463
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2464 /* Update IO stats */
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2465 snic_stats_update_io_cmpl(&snic->s_stats);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2466
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2467 if (sc->scsi_done) {
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2468 SNIC_TRC(snic->shost->host_no, tag, (ulong) sc,
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2469 jiffies_to_msecs(jiffies - st_time), 0,
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2470 SNIC_TRC_CMD(sc),
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2471 SNIC_TRC_CMD_STATE_FLAGS(sc));
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2472
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2473 sc->scsi_done(sc);
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2474 }
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2475 return true;
c8806b6c9e824f Narsimhulu Musini 2015-05-29 2476 }
43d12ab32f0fb6 Hannes Reinecke 2020-06-25 2477 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v4 14/22 snic: check for started requests in snic_hba_reset_cmpl_handler()
In reply to Hannes Reineckesnic_hba_reset_cmpl_handler() is using scsi_host_find_tag() to map id to a scsi command. However, as per discussion on the mailinglist scsi_host_find_tag() might return a non-started request, so we need to check the returned command with blk_mq_request_started() to avoid the function tripping over a non-initialized command.
--- drivers/scsi/snic/snic_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/snic/snic_scsi.c +1 -1
@@ -1020,7 +1020,7 @@ snic_hba_reset_cmpl_handler(struct snic *snic, struct snic_fw_req *fwreq) } sc =scsi_host_find_tag (snic->shost, cmnd_id); -if (!sc) { +if (!sc || !blk_mq_request_started (sc->request)) {atomic64_inc (&snic->s_stats.io.sc_null); SNIC_HOST_ERR(snic->shost, "reset_cmpl: sc is NULL - Hdr Stat %s Tag 0x%x\n",
Signature · 1 line
2.16.4
PATCH v4 15/22 hpsa: move hpsa_hba_inquiry after scsi_add_host()
In reply to Hannes ReineckeMove hpsa_hba_inquiry to after scsi_add_host() so that the host is fully initialized.
--- drivers/scsi/hpsa.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
drivers/scsi/hpsa.c +19 -18
@@ -5839,6 +5839,22 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h)return 0 ; } +static void hpsa_hba_inquiry (struct ctlr_info *h) +{ +int rc; + +#define HBA_INQUIRY_BYTE_COUNT 64 + h->hba_inquiry_data =kmalloc (HBA_INQUIRY_BYTE_COUNT ,GFP_KERNEL ); +if (!h->hba_inquiry_data) +return ; + rc =hpsa_scsi_do_inquiry (h,RAID_CTLR_LUNID ,0 , + h->hba_inquiry_data,HBA_INQUIRY_BYTE_COUNT ); +if (rc !=0 ) { +kfree (h->hba_inquiry_data); + h->hba_inquiry_data =NULL ; + } +} +static int hpsa_scsi_add_host (struct ctlr_info *h) {int rv;
@@ -5848,6 +5864,9 @@ static int hpsa_scsi_add_host(struct ctlr_info *h)dev_err (&h->pdev->dev,"scsi_add_host failed\n" );return rv; } + +hpsa_hba_inquiry (h); +scsi_scan_host (h->scsi_host);return 0 ; }
@@ -7901,22 +7920,6 @@ static int hpsa_pci_init(struct ctlr_info *h)return err; } -static void hpsa_hba_inquiry (struct ctlr_info *h) -{ -int rc; - -#define HBA_INQUIRY_BYTE_COUNT 64 - h->hba_inquiry_data =kmalloc (HBA_INQUIRY_BYTE_COUNT ,GFP_KERNEL ); -if (!h->hba_inquiry_data) -return ; - rc =hpsa_scsi_do_inquiry (h,RAID_CTLR_LUNID ,0 , - h->hba_inquiry_data,HBA_INQUIRY_BYTE_COUNT ); -if (rc !=0 ) { -kfree (h->hba_inquiry_data); - h->hba_inquiry_data =NULL ; - } -} -static int hpsa_init_reset_devices (struct pci_dev *pdev,u32 board_id) {int rc, i;
@@ -8825,8 +8828,6 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)/* Turn the interrupts on so we can service requests */ h->access.set_intr_mask (h,HPSA_INTR_ON ); -hpsa_hba_inquiry (h); - h->lastlogicals =kzalloc (sizeof (*(h->lastlogicals)),GFP_KERNEL );if (!h->lastlogicals) dev_info(&h->pdev->dev,
Signature · 1 line
2.16.4
PATCH v4 16/22 hpsa: use reserved commands
In reply to Hannes ReineckeEnable the use of reserved commands, and drop the hand-crafted command allocation.
--- drivers/scsi/hpsa.c | 204 ++++++++++++++++++++-------------------------------- drivers/scsi/hpsa.h | 3 +- 2 files changed, 78 insertions(+), 129 deletions(-)
drivers/scsi/hpsa.c +76 -128
@@ -244,10 +244,6 @@ static struct hpsa_scsi_dev_t *hpsa_find_device_by_sas_rphy(struct ctlr_info *h, struct sas_rphy *rphy); -#define SCSI_CMD_BUSY ((struct scsi_cmnd *)&hpsa_cmd_busy) -static const struct scsi_cmnd hpsa_cmd_busy; -#define SCSI_CMD_IDLE ((struct scsi_cmnd *)&hpsa_cmd_idle) -static const struct scsi_cmnd hpsa_cmd_idle;static int number_of_controllers;static irqreturn_t do_hpsa_intr_intx (int irq,void *dev_id);
@@ -265,7 +261,7 @@ static int hpsa_compat_ioctl(struct scsi_device *dev, unsigned int cmd,#endif static void cmd_free (struct ctlr_info *h,struct CommandList *c); -static struct CommandList *cmd_alloc (struct ctlr_info *h); +static struct CommandList *cmd_alloc (struct ctlr_info *h,u8 direction);static void cmd_tagged_free (struct ctlr_info *h,struct CommandList *c);static struct CommandList *cmd_tagged_alloc (struct ctlr_info *h,struct scsi_cmnd *scmd);
@@ -346,7 +342,7 @@ static inline struct ctlr_info *shost_to_hba(struct Scsi_Host *sh)static inline bool hpsa_is_cmd_idle (struct CommandList *c) { -return c->scsi_cmd ==SCSI_CMD_IDLE ; +return c->scsi_cmd ==NULL ; }/* extract sense key, asc, and ascq from sense data. -1 means invalid. */
@@ -2454,7 +2450,12 @@ static void hpsa_cmd_resolve_events(struct ctlr_info *h,* this command has completed. Then, check to see if the handler is * waiting for this command, and, if so, wake it. */ - c->scsi_cmd =SCSI_CMD_IDLE ; +if (c->scsi_cmd && c->cmd_type ==CMD_IOCTL_PEND ) { +struct scsi_cmnd *scmd = c->scsi_cmd; + +scsi_put_internal_cmd (scmd); + } + c->scsi_cmd =NULL ;mb ();/* Declare command idle before checking for pending events. */ if (dev) {atomic_dec (&dev->commands_outstanding);
@@ -2997,7 +2998,7 @@ static int hpsa_do_receive_diagnostic(struct ctlr_info *h, u8 *scsi3addr,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ );if (fill_cmd (c,RECEIVE_DIAGNOSTIC , h, buf, bufsize, page, scsi3addr,TYPE_CMD )) { rc =-1 ;
@@ -3049,7 +3050,7 @@ static int hpsa_scsi_do_inquiry(struct ctlr_info *h, unsigned char *scsi3addr,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ );if (fill_cmd (c,HPSA_INQUIRY , h, buf, bufsize, page, scsi3addr,TYPE_CMD )) {
@@ -3077,7 +3078,7 @@ static int hpsa_send_reset(struct ctlr_info *h, struct hpsa_scsi_dev_t *dev,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_NONE ); c->device = dev;/* fill_cmd can't fail here, no data buffer to map. */
@@ -3303,7 +3304,7 @@ static int hpsa_get_raid_map(struct ctlr_info *h,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ ); if (fill_cmd(c, HPSA_GET_RAID_MAP, h, &this_device->raid_map, sizeof(this_device->raid_map), 0,
@@ -3345,7 +3346,7 @@ static int hpsa_bmic_sense_subsystem_information(struct ctlr_info *h,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ ); rc =fill_cmd (c,BMIC_SENSE_SUBSYSTEM_INFORMATION , h, buf, bufsize,0 ,RAID_CTLR_LUNID ,TYPE_CMD );
@@ -3376,7 +3377,7 @@ static int hpsa_bmic_id_controller(struct ctlr_info *h,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ ); rc =fill_cmd (c,BMIC_IDENTIFY_CONTROLLER , h, buf, bufsize,0 ,RAID_CTLR_LUNID ,TYPE_CMD );
@@ -3405,7 +3406,7 @@ static int hpsa_bmic_id_physical_device(struct ctlr_info *h,struct CommandList *c;struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ ); rc =fill_cmd (c,BMIC_IDENTIFY_PHYSICAL_DEVICE , h, buf, bufsize,0 ,RAID_CTLR_LUNID ,TYPE_CMD );if (rc)
@@ -3477,7 +3478,7 @@ static void hpsa_get_enclosure_info(struct ctlr_info *h, goto out; } - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ ); rc =fill_cmd (c,BMIC_SENSE_STORAGE_BOX_PARAMS , h, bssbp,sizeof (*bssbp),0 ,RAID_CTLR_LUNID ,TYPE_CMD );
@@ -3733,7 +3734,7 @@ static int hpsa_scsi_do_report_luns(struct ctlr_info *h, int logical,unsigned char scsi3addr[8 ];struct ErrorInfo *ei; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ );/* address the controller */ memset (scsi3addr,0 ,sizeof (scsi3addr));
@@ -3876,7 +3877,7 @@ static unsigned char hpsa_volume_offline(struct ctlr_info *h,#define ASCQ_LUN_NOT_READY_FORMAT_IN_PROGRESS 0x04#define ASCQ_LUN_NOT_READY_INITIALIZING_CMD_REQ 0x02 - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_NONE ); (void )fill_cmd (c,TEST_UNIT_READY , h,NULL ,0 ,0 , scsi3addr,TYPE_CMD ); rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE,
@@ -5527,7 +5528,6 @@ static void hpsa_cmd_init(struct ctlr_info *h, int index, c->ErrDesc.Addr =cpu_to_le64 ((u64 ) err_dma_handle); c->ErrDesc.Len =cpu_to_le32 ((u32 )sizeof (*c->err_info)); c->h = h; - c->scsi_cmd =SCSI_CMD_IDLE ; }static void hpsa_preinitialize_commands (struct ctlr_info *h)
@@ -5822,12 +5822,12 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h) sh->io_port =0 ; sh->n_io_port =0 ; - sh->this_id =-1 ; sh->max_channel =3 ; sh->max_cmd_len =MAX_COMMAND_SIZE ; sh->max_lun =HPSA_MAX_LUN ; sh->max_id =HPSA_MAX_LUN ; sh->can_queue = h->nr_cmds -HPSA_NRESERVED_CMDS ; + sh->nr_reserved_cmds =HPSA_NRESERVED_CMDS ; sh->cmd_per_lun = sh->can_queue; sh->sg_tablesize = h->maxsgentries; sh->transportt = hpsa_sas_transport_template;
@@ -5864,30 +5864,18 @@ static int hpsa_scsi_add_host(struct ctlr_info *h)dev_err (&h->pdev->dev,"scsi_add_host failed\n" );return rv; } - + h->raid_ctrl_sdev =scsi_get_host_dev (h->scsi_host); +if (!h->raid_ctrl_sdev) { +dev_err (&h->pdev->dev, +"allocate raid controller device failed\n" ); +return -ENOMEM ; + }hpsa_hba_inquiry (h);scsi_scan_host (h->scsi_host);return 0 ; } -/* -* The block layer has already gone to the trouble of picking out a unique, -* small-integer tag for this request. We use an offset from that value as -* an index to select our command block. (The offset allows us to reserve the -* low-numbered entries for our own uses.) -*/ -static int hpsa_get_cmd_index (struct scsi_cmnd *scmd) -{ -int idx = scmd->request->tag; - -if (idx <0 ) -return idx; - -/* Offset to leave space for internal cmds. */ -return idx +=HPSA_NRESERVED_CMDS ; -} -/* * Send a TEST_UNIT_READY command to the specified LUN using the specified * reply queue; returns zero if the unit is ready, and non-zero otherwise.
@@ -5971,7 +5959,7 @@ static int wait_for_device_to_become_ready(struct ctlr_info *h,int rc =0 ;struct CommandList *c; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_NONE );/* * If no specific reply queue was requested, then send the TUR
@@ -6044,7 +6032,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)if (lockup_detected (h)) {snprintf (msg,sizeof (msg),"cmd %d RESET FAILED, lockup detected" , -hpsa_get_cmd_index (scsicmd)); + scsicmd->request->tag);hpsa_show_dev_msg (KERN_WARNING , h, dev, msg); rc =FAILED ; goto return_reset_status;
@@ -6054,7 +6042,7 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)if (detect_controller_lockup (h)) {snprintf (msg,sizeof (msg),"cmd %d RESET FAILED, new lockup detected" , -hpsa_get_cmd_index (scsicmd)); + scsicmd->request->tag);hpsa_show_dev_msg (KERN_WARNING , h, dev, msg); rc =FAILED ; goto return_reset_status;
@@ -6116,12 +6104,12 @@ static int hpsa_eh_device_reset_handler(struct scsi_cmnd *scsicmd)static struct CommandList *cmd_tagged_alloc (struct ctlr_info *h,struct scsi_cmnd *scmd) { -int idx =hpsa_get_cmd_index (scmd); +int idx = scmd->request->tag;struct CommandList *c = h->cmd_pool + idx; -if (idx <HPSA_NRESERVED_CMDS || idx >= h->nr_cmds) { +if (idx <0 || idx >= h->nr_cmds) {dev_err (&h->pdev->dev,"Bad block tag: %d not in [%d..%d]\n" , - idx,HPSA_NRESERVED_CMDS , h->nr_cmds -1 ); + idx,0 , h->nr_cmds -1 );/* The index value comes from the block layer, so if it's out of * bounds, it's probably not our bug. */
@@ -6158,80 +6146,52 @@ static void cmd_tagged_free(struct ctlr_info *h, struct CommandList *c)* else to free it, because it is accessed by index. */ (void )atomic_dec (&c->refcount); + c->scsi_cmd =NULL ; } -/* -* For operations that cannot sleep, a command block is allocated at init, -* and managed by cmd_alloc() and cmd_free() using a simple bitmap to track -* which ones are free or in use. Lock must be held when calling this. -* cmd_free() is the complement. -* This function never gives up and returns NULL. If it hangs, -* another thread must call cmd_free() to free some tags. -*/ - -static struct CommandList *cmd_alloc (struct ctlr_info *h) +static struct CommandList *cmd_alloc (struct ctlr_info *h,u8 direction) { +struct scsi_cmnd *scmd;struct CommandList *c; -int refcount, i; -int offset =0 ; - -/* -* There is some *extremely* small but non-zero chance that that -* multiple threads could get in here, and one thread could -* be scanning through the list of bits looking for a free -* one, but the free ones are always behind him, and other -* threads sneak in behind him and eat them before he can -* get to them, so that while there is always a free one, a -* very unlucky thread might be starved anyway, never able to -* beat the other threads. In reality, this happens so -* infrequently as to be indistinguishable from never. -* -* Note that we start allocating commands before the SCSI host structure -* is initialized. Since the search starts at bit zero, this -* all works, since we have at least one command structure available; -* however, it means that the structures with the low indexes have to be -* reserved for driver-initiated requests, while requests from the block -* layer will use the higher indexes. -*/ - -for (;;) { - i =find_next_zero_bit (h->cmd_pool_bits, -HPSA_NRESERVED_CMDS , - offset); -if (unlikely (i >=HPSA_NRESERVED_CMDS )) { - offset =0 ; -continue ; - } - c = h->cmd_pool + i; - refcount =atomic_inc_return (&c->refcount); -if (unlikely (refcount >1 )) { -cmd_free (h, c);/* already in use */ - offset = (i +1 ) %HPSA_NRESERVED_CMDS ; -continue ; - } -set_bit (i & (BITS_PER_LONG -1 ), - h->cmd_pool_bits + (i /BITS_PER_LONG )); -break ;/* it's ours now. */ +int idx; + + scmd =scsi_get_internal_cmd (h->raid_ctrl_sdev, + (direction &XFER_WRITE ) ? +DMA_TO_DEVICE :DMA_FROM_DEVICE , +REQ_NOWAIT ); +if (!scmd) { +dev_warn (&h->pdev->dev,"failed to allocate reserved cmd\n" ); +return NULL ; + } + idx = scmd->request->tag; + c =cmd_tagged_alloc (h, scmd); +if (!c) { +dev_warn (&h->pdev->dev,"failed to allocate reserved cmd %u\n" , + idx); +scsi_put_internal_cmd (scmd); +return NULL ; } -hpsa_cmd_partial_init (h, i, c); +hpsa_cmd_partial_init (h, idx, c); + c->scsi_cmd = scmd; c->device =NULL ; + c->cmd_type =CMD_IOCTL_PEND ; +dev_dbg (&h->pdev->dev,"using reserved cmd %u\n" , idx);return c; } -/* -* This is the complementary operation to cmd_alloc(). Note, however, in some -* corner cases it may also be used to free blocks allocated by -* cmd_tagged_alloc() in which case the ref-count decrement does the trick and -* the clear-bit is harmless. -*/ static void cmd_free (struct ctlr_info *h,struct CommandList *c) { -if (atomic_dec_and_test (&c->refcount)) { -int i; +struct scsi_cmnd *scmd = c->scsi_cmd; - i = c - h->cmd_pool; -clear_bit (i & (BITS_PER_LONG -1 ), - h->cmd_pool_bits + (i /BITS_PER_LONG )); +if (!scmd) { +dev_warn (&h->pdev->dev,"freeing idle cmd\n" ); +return ; + } +cmd_tagged_free (h, c); +if (c->cmd_type ==CMD_IOCTL_PEND ) { +dev_dbg (&h->pdev->dev,"returning reserved cmd %u\n" , + scmd->request->tag); +scsi_put_internal_cmd (scmd); } }
@@ -6398,11 +6358,8 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h,memset (buff,0 , iocommand->buf_size); } } - c =cmd_alloc (h); + c =cmd_alloc (h, iocommand->Request.Type.Direction); -/* Fill in the command type */ - c->cmd_type =CMD_IOCTL_PEND ; - c->scsi_cmd =SCSI_CMD_BUSY ;/* Fill in Command Header */ c->Header.ReplyQueue =0 ;/* unused in simple mode */ if (iocommand->buf_size >0 ) {/* buffer to fill */
@@ -6515,10 +6472,8 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, data_ptr += sz; sg_used++; } - c =cmd_alloc (h); + c =cmd_alloc (h, ioc->Request.Type.Direction); - c->cmd_type =CMD_IOCTL_PEND ; - c->scsi_cmd =SCSI_CMD_BUSY ; c->Header.ReplyQueue =0 ; c->Header.SGList = (u8 ) sg_used; c->Header.SGTotal =cpu_to_le16 (sg_used);
@@ -6649,7 +6604,7 @@ static void hpsa_send_host_reset(struct ctlr_info *h, u8 reset_type) {struct CommandList *c; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_NONE );/* fill_cmd can't fail here, no data buffer to map */ (void) fill_cmd(c, HPSA_DEVICE_RESET_MSG, h, NULL, 0, 0,
@@ -6670,8 +6625,6 @@ static int fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h, {enum dma_data_direction dir =DMA_NONE ; - c->cmd_type =CMD_IOCTL_PEND ; - c->scsi_cmd =SCSI_CMD_BUSY ; c->Header.ReplyQueue =0 ;if (buff !=NULL && size >0 ) { c->Header.SGList =1 ;
@@ -7984,8 +7937,6 @@ static int hpsa_init_reset_devices(struct pci_dev *pdev, u32 board_id)static void hpsa_free_cmd_pool (struct ctlr_info *h) { -kfree (h->cmd_pool_bits); - h->cmd_pool_bits =NULL ;if (h->cmd_pool) { dma_free_coherent(&h->pdev->dev, h->nr_cmds * sizeof(struct CommandList),
@@ -8006,17 +7957,13 @@ static void hpsa_free_cmd_pool(struct ctlr_info *h)static int hpsa_alloc_cmd_pool (struct ctlr_info *h) { - h->cmd_pool_bits =kcalloc (DIV_ROUND_UP (h->nr_cmds,BITS_PER_LONG ), -sizeof (unsigned long ), -GFP_KERNEL ); h->cmd_pool =dma_alloc_coherent (&h->pdev->dev, h->nr_cmds *sizeof (*h->cmd_pool), &h->cmd_pool_dhandle,GFP_KERNEL ); h->errinfo_pool =dma_alloc_coherent (&h->pdev->dev, h->nr_cmds *sizeof (*h->errinfo_pool), &h->errinfo_pool_dhandle,GFP_KERNEL ); -if ((h->cmd_pool_bits ==NULL ) - || (h->cmd_pool ==NULL ) +if ((h->cmd_pool ==NULL ) || (h->errinfo_pool ==NULL )) {dev_err (&h->pdev->dev,"out of memory in %s" , __func__); goto clean_up;
@@ -8899,7 +8846,7 @@ static void hpsa_flush_cache(struct ctlr_info *h)if (!flush_buf)return ; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_NONE );if (fill_cmd (c,HPSA_CACHE_FLUSH , h, flush_buf,4 ,0 ,RAID_CTLR_LUNID ,TYPE_CMD )) {
@@ -8934,7 +8881,7 @@ static void hpsa_disable_rld_caching(struct ctlr_info *h)if (!options)return ; - c =cmd_alloc (h); + c =cmd_alloc (h,XFER_READ );/* first, get the current diag options settings */ if (fill_cmd(c, BMIC_SENSE_DIAG_OPTIONS, h, options, 4, 0,
@@ -8984,11 +8931,10 @@ static void __hpsa_shutdown(struct pci_dev *pdev)struct ctlr_info *h; h =pci_get_drvdata (pdev); -/* Turn board interrupts off and send the flush cache command -* sendcmd will turn off interrupt, and send the flush... -* To write all data in the battery backed cache to disks +/* +* Turn board interrupts off; +* flush cache command has already been sent. */ -hpsa_flush_cache (h); h->access.set_intr_mask (h,HPSA_INTR_OFF );hpsa_free_irqs (h);/* init_one 4 */ hpsa_disable_interrupt_mode (h);/* pci_init 2 */
@@ -8996,6 +8942,7 @@ static void __hpsa_shutdown(struct pci_dev *pdev)static void hpsa_shutdown (struct pci_dev *pdev) { +hpsa_flush_cache (pci_get_drvdata (pdev));__hpsa_shutdown (pdev);pci_disable_device (pdev); }
@@ -9040,6 +8987,7 @@ static void hpsa_remove_one(struct pci_dev *pdev)* when multipath is enabled. There can be SYNCHRONIZE CACHE * operations which cannot complete and will hang the system. */ +hpsa_flush_cache (h);if (h->scsi_host)scsi_remove_host (h->scsi_host);/* init_one 8 */ /* includes hpsa_free_irqs - init_one 4 */
drivers/scsi/hpsa.h +2 -1
@@ -205,7 +205,6 @@ struct ctlr_info {dma_addr_t ioaccel2_cmd_pool_dhandle;struct ErrorInfo *errinfo_pool;dma_addr_t errinfo_pool_dhandle; -unsigned long *cmd_pool_bits;int scan_finished; u8 scan_waiting : 1;spinlock_t scan_lock;
@@ -215,6 +214,8 @@ struct ctlr_info {spinlock_t devlock;/* to protect hba[ctlr]->dev[]; */ int ndevices;/* number of used elements in .dev[] array. */ struct hpsa_scsi_dev_t *dev[HPSA_MAX_DEVICES ]; +struct scsi_device *raid_ctrl_sdev; +/* * Performant mode tables. */
Signature · 1 line
2.16.4
PATCH v4 17/22 hpsa: use scsi_host_busy_iter() to traverse outstanding commands
In reply to Hannes ReineckeReplace all hand-crafted command iterations withscsi_host_busy_iter() calls.
--- drivers/scsi/hpsa.c | 117 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 50 deletions(-)
drivers/scsi/hpsa.c +67 -50
@@ -1816,30 +1816,26 @@ static int hpsa_add_device(struct ctlr_info *h, struct hpsa_scsi_dev_t *device)return rc; } -static int hpsa_find_outstanding_commands_for_dev (struct ctlr_info *h, -struct hpsa_scsi_dev_t *dev) -{ -int i; -int count =0 ; - -for (i =0 ; i < h->nr_cmds; i++) { -struct CommandList *c = h->cmd_pool + i; -int refcount =atomic_inc_return (&c->refcount); - -if (refcount >1 &&hpsa_cmd_dev_match (h, c, dev, - dev->scsi3addr)) { -unsigned long flags; +struct hpsa_command_iter_data { +struct ctlr_info *h; +struct hpsa_scsi_dev_t *dev; +unsigned char *scsi3addr; +int count; +}; -spin_lock_irqsave (&h->lock, flags);/* Implied MB */ -if (!hpsa_is_cmd_idle (c)) - ++count; -spin_unlock_irqrestore (&h->lock, flags); - } +static bool hpsa_find_outstanding_commands_iter (struct scsi_cmnd *sc, +void *data,bool reserved) +{ +struct hpsa_command_iter_data *iter_data = data; +struct ctlr_info *h = iter_data->h; +struct hpsa_scsi_dev_t *dev = iter_data->dev; +struct CommandList *c = h->cmd_pool + sc->request->tag; -cmd_free (h, c); +if (hpsa_cmd_dev_match (h, c, dev, dev->scsi3addr)) { + iter_data->count++; +return false; } - -return count; +return true; }#define NUM_WAIT 20
@@ -1849,13 +1845,20 @@ static void hpsa_wait_for_outstanding_commands_for_dev(struct ctlr_info *h,int cmds =0 ;int waits =0 ;int num_wait =NUM_WAIT ; +struct hpsa_command_iter_data iter_data = { + .h = h, + .dev = device, + };if (device->external) num_wait =HPSA_EH_PTRAID_TIMEOUT ;while (1 ) { - cmds =hpsa_find_outstanding_commands_for_dev (h, device); -if (cmds ==0 ) + iter_data.count =0 ; +scsi_host_busy_iter (h->scsi_host, + hpsa_find_outstanding_commands_iter, + &iter_data); +if (iter_data.count ==0 )break ;if (++waits > num_wait)break ;
@@ -8134,27 +8137,34 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)kfree (h);/* init_one 1 */ } +static bool fail_all_outstanding_cmds_iter (struct scsi_cmnd *sc,void *data, +bool reserved) +{ +struct hpsa_command_iter_data *iter_data = data; +struct ctlr_info *h = iter_data->h; +struct CommandList *c = h->cmd_pool + sc->request->tag; + + c->err_info->CommandStatus =CMD_CTLR_LOCKUP ; +finish_cmd (c); +atomic_dec (&h->commands_outstanding); + iter_data->count++; + +return true; +} +/* Called when controller lockup detected. */ static void fail_all_outstanding_cmds (struct ctlr_info *h) { -int i, refcount; -struct CommandList *c; -int failcount =0 ; +struct hpsa_command_iter_data iter_data = { + .h = h, + .count =0 , + };flush_workqueue (h->resubmit_wq);/* ensure all cmds are fully built */ -for (i =0 ; i < h->nr_cmds; i++) { - c = h->cmd_pool + i; - refcount =atomic_inc_return (&c->refcount); -if (refcount >1 ) { - c->err_info->CommandStatus =CMD_CTLR_LOCKUP ; -finish_cmd (c); -atomic_dec (&h->commands_outstanding); - failcount++; - } -cmd_free (h, c); - } +scsi_host_busy_iter (h->scsi_host, + fail_all_outstanding_cmds_iter, &iter_data);dev_warn (&h->pdev->dev, -"failed %d commands in fail_all\n" , failcount); +"failed %d commands in fail_all\n" , iter_data.count); }static void set_lockup_detected_for_all_cpus (struct ctlr_info *h,u32 value)
@@ -9454,22 +9464,29 @@ static int is_accelerated_cmd(struct CommandList *c)return c->cmd_type ==CMD_IOACCEL1 || c->cmd_type ==CMD_IOACCEL2 ; } +static bool hpsa_drain_accel_commands_iter (struct scsi_cmnd *sc,void *data, +bool reserved) +{ +struct hpsa_command_iter_data *iter_data = data; +struct ctlr_info *h = iter_data->h; +struct CommandList *c = h->cmd_pool + sc->request->tag; + + iter_data->count +=is_accelerated_cmd (c); +return true; +} +static void hpsa_drain_accel_commands (struct ctlr_info *h) { -struct CommandList *c =NULL ; -int i, accel_cmds_out; -int refcount; +struct hpsa_command_iter_data iter_data = { + .h = h, + };do {/* wait for all outstanding ioaccel commands to drain out */ - accel_cmds_out =0 ; -for (i =0 ; i < h->nr_cmds; i++) { - c = h->cmd_pool + i; - refcount =atomic_inc_return (&c->refcount); -if (refcount >1 )/* Command is allocated */ - accel_cmds_out +=is_accelerated_cmd (c); -cmd_free (h, c); - } -if (accel_cmds_out <=0 ) + iter_data.count =0 ; +scsi_host_busy_iter (h->scsi_host, + hpsa_drain_accel_commands_iter, + &iter_data); +if (iter_data.count <=0 )break ;msleep (100 ); }while (1 );
Signature · 1 line
2.16.4
PATCH v4 18/22 hpsa: drop refcount field from CommandList
In reply to Hannes ReineckeField is now unused, so drop it.
--- drivers/scsi/hpsa.c | 12 ++---------- drivers/scsi/hpsa_cmd.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-)
drivers/scsi/hpsa.c +2 -10
@@ -5518,8 +5518,8 @@ static void hpsa_cmd_init(struct ctlr_info *h, int index, {dma_addr_t cmd_dma_handle, err_dma_handle; -/* Zero out all of commandlist except the last field, refcount */ -memset (c,0 , offsetof(struct CommandList , refcount)); +/* Zero out all of commandlist */ +memset (c,0 ,sizeof (struct CommandList )); c->Header.tag =cpu_to_le64 ((u64) (index <<DIRECT_LOOKUP_SHIFT )); cmd_dma_handle = h->cmd_pool_dhandle + index *sizeof (*c); c->err_info = h->errinfo_pool + index;
@@ -5541,7 +5541,6 @@ static void hpsa_preinitialize_commands(struct ctlr_info *h)struct CommandList *c = h->cmd_pool + i;hpsa_cmd_init (h, i, c); -atomic_set (&c->refcount,0 ); } }
@@ -6136,19 +6135,12 @@ static struct CommandList *cmd_tagged_alloc(struct ctlr_info *h,return NULL ; } -atomic_inc (&c->refcount); -hpsa_cmd_partial_init (h, idx, c);return c; }static void cmd_tagged_free (struct ctlr_info *h,struct CommandList *c) { -/* -* Release our reference to the block. We don't need to do anything -* else to free it, because it is accessed by index. -*/ - (void )atomic_dec (&c->refcount); c->scsi_cmd =NULL ; }
drivers/scsi/hpsa_cmd.h +0 -1
@@ -449,7 +449,6 @@ struct CommandList {int abort_pending;struct hpsa_scsi_dev_t *device; -atomic_t refcount;/* Must be last to avoid memset in hpsa_cmd_init() */ }__aligned(COMMANDLIST_ALIGNMENT) ;/* Max S/G elements in I/O accelerator command */
Signature · 1 line
2.16.4
PATCH v4 19/22 aacraid: move scsi_add_host()
In reply to Hannes ReineckeMove the call to scsi_add_host() so that the Scsi_Host structure is initialized before any I/O is sent.
--- drivers/scsi/aacraid/linit.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-)
drivers/scsi/aacraid/linit.c +15 -16
@@ -1696,6 +1696,9 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) shost->irq = pdev->irq; shost->unique_id = unique_id; shost->max_cmd_len =16 ; + shost->max_id =MAXIMUM_NUM_CONTAINERS ; + shost->max_lun =AAC_MAX_LUN ; + shost->sg_tablesize =HBA_MAX_SG_SEPARATE ;if (aac_cfg_major ==AAC_CHARDEV_NEEDS_REINIT )aac_init_char ();
@@ -1734,7 +1737,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) aac->base_size =AAC_MIN_FOOTPRINT_SIZE ;if ((*aac_drivers[index].init)(aac)) { error = -ENODEV ; - goto out_unmap; + goto out_free_fibs; }if (aac->sync_mode) {
@@ -1760,9 +1763,15 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)printk (KERN_ERR "aacraid: Unable to create command thread.\n" ); error =PTR_ERR (aac->thread); aac->thread =NULL ; - goto out_deinit; + goto out_unmap; } +pci_set_drvdata (pdev, shost); + + error =scsi_add_host (shost, &pdev->dev); +if (error) + goto out_deinit; + aac->maximum_num_channels = aac_drivers[index].channels; error =aac_get_adapter_info (aac);if (error <0 )
@@ -1821,18 +1830,6 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (!aac->sa_firmware && aac_drivers[index].quirks &AAC_QUIRK_SRC )aac_intr_normal (aac,0 ,2 ,0 ,NULL ); -/* -* dmb - we may need to move the setting of these parms somewhere else once -* we get a fib that can report the actual numbers -*/ - shost->max_lun =AAC_MAX_LUN ; - -pci_set_drvdata (pdev, shost); - - error =scsi_add_host (shost, &pdev->dev); -if (error) - goto out_deinit; -aac_scan_host (aac);pci_enable_pcie_error_reporting (pdev);
@@ -1849,10 +1846,12 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) aac->comm_addr, aac->comm_phys);kfree (aac->queues);aac_adapter_ioremap (aac,0 ); -kfree (aac->fibs);kfree (aac->fsa_dev); + out_free_fibs: +kfree (aac->fibs); out_free_host:scsi_host_put (shost); +pci_set_drvdata (pdev,NULL ); out_disable_pdev:pci_disable_device (pdev); out:
@@ -1979,9 +1978,9 @@ static void aac_remove_one(struct pci_dev *pdev)struct aac_dev *aac = (struct aac_dev *)shost->hostdata;aac_cancel_rescan_worker (aac); -scsi_remove_host (shost);__aac_shutdown (aac); +scsi_remove_host (shost);aac_fib_map_free (aac);dma_free_coherent (&aac->pdev->dev, aac->comm_size, aac->comm_addr, aac->comm_phys);
Signature · 1 line
2.16.4
PATCH v4 20/22 aacraid: store target id in host_scribble
In reply to Hannes ReineckeThe probe_container mechanism requires a target id to be present, even if the device itself isn't present (yet).
As we're now allocating internal commands the target id of the device is immutable, so store the requested target id in the host_scribble field.
--- drivers/scsi/aacraid/aachba.c | 53 +++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 15 deletions(-)
drivers/scsi/aacraid/aachba.c +38 -15
@@ -608,9 +608,11 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)static int aac_probe_container_callback2 (struct scsi_cmnd * scsicmd) { -struct fsa_dev_info *fsa_dev_ptr = ((struct aac_dev *)(scsicmd->device->host->hostdata))->fsa_dev; +struct aac_dev *dev = (struct aac_dev *)(scsicmd->device->host->hostdata); +struct fsa_dev_info *fsa_dev_ptr = dev->fsa_dev; -if ((fsa_dev_ptr[scmd_id (scsicmd)].valid &1 )) +if (scmd_id (scsicmd) < dev->maximum_num_containers && + (fsa_dev_ptr[scmd_id (scsicmd)].valid &1 ))return aac_scsi_cmd (scsicmd); scsicmd->result =DID_NO_CONNECT <<16 ;
@@ -623,6 +625,7 @@ static void _aac_probe_container2(void * context, struct fib * fibptr)struct fsa_dev_info *fsa_dev_ptr;int (*callback)(struct scsi_cmnd *);struct scsi_cmnd * scsicmd = (struct scsi_cmnd *)context; +int cid =scmd_id (scsicmd);int i;
@@ -630,12 +633,15 @@ static void _aac_probe_container2(void * context, struct fib * fibptr)return ; scsicmd->SCp.Status =0 ; +if (scsicmd->host_scribble) + cid = *(int *)scsicmd->host_scribble; + fsa_dev_ptr = fibptr->dev->fsa_dev; -if (fsa_dev_ptr) { +if (fsa_dev_ptr && cid < fibptr->dev->maximum_num_containers) {struct aac_mount * dresp = (struct aac_mount *)fib_data (fibptr);__le32 sup_options2; - fsa_dev_ptr +=scmd_id (scsicmd); + fsa_dev_ptr += cid; sup_options2 = fibptr->dev->supplement_adapter_info.supported_options2;
@@ -670,7 +676,6 @@ static void _aac_probe_container2(void * context, struct fib * fibptr) scsicmd->SCp.Status =le32_to_cpu (dresp->count); }aac_fib_complete (fibptr); -aac_fib_free (fibptr); callback = (int (*)(struct scsi_cmnd *))(scsicmd->SCp.ptr); scsicmd->SCp.ptr =NULL ; (*callback)(scsicmd);
@@ -682,6 +687,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)struct scsi_cmnd * scsicmd;struct aac_mount * dresp;struct aac_query_mount *dinfo; +int cid;int status; dresp = (struct aac_mount *)fib_data (fibptr);
@@ -694,10 +700,15 @@ static void _aac_probe_container1(void * context, struct fib * fibptr) } } scsicmd = (struct scsi_cmnd *) context; -if (!aac_valid_context (scsicmd, fibptr))return ; - + cid =scmd_id (scsicmd); +if (scsicmd->host_scribble) + cid = *(int *)scsicmd->host_scribble; +if (cid >= fibptr->dev->maximum_num_containers) { +_aac_probe_container2 (context, fibptr); +return ; + }aac_fib_init (fibptr); dinfo = (struct aac_query_mount *)fib_data (fibptr);
@@ -708,7 +719,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)else dinfo->command =cpu_to_le32 (VM_NameServe64); - dinfo->count =cpu_to_le32 (scmd_id (scsicmd)); + dinfo->count =cpu_to_le32 (cid); dinfo->type =cpu_to_le32 (FT_FILESYS ); scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ;
@@ -731,10 +742,20 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)static int _aac_probe_container (struct scsi_cmnd * scsicmd,int (*callback)(struct scsi_cmnd *)) { +struct aac_dev * dev;struct fib * fibptr;int status = -ENOMEM ; +int cid =scmd_id (scsicmd); -if ((fibptr =aac_fib_alloc ((struct aac_dev *)scsicmd->device->host->hostdata))) { + dev = (struct aac_dev *)scsicmd->device->host->hostdata; +if (scsicmd->host_scribble) { + cid = *(int *)scsicmd->host_scribble; +if (cid > dev->maximum_num_containers) { + status = -ENODEV ; + goto out_status; + } + } +if ((fibptr =aac_fib_alloc (dev))) {struct aac_query_mount *dinfo;aac_fib_init (fibptr);
@@ -747,7 +768,7 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(struelse dinfo->command =cpu_to_le32 (VM_NameServe); - dinfo->count =cpu_to_le32 (scmd_id (scsicmd)); + dinfo->count =cpu_to_le32 (cid); dinfo->type =cpu_to_le32 (FT_FILESYS ); scsicmd->SCp.ptr = (char *)callback; scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ;
@@ -771,10 +792,11 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(struaac_fib_free (fibptr); } } +out_status:if (status <0 ) { -struct fsa_dev_info *fsa_dev_ptr = ((struct aac_dev *)(scsicmd->device->host->hostdata))->fsa_dev; -if (fsa_dev_ptr) { - fsa_dev_ptr +=scmd_id (scsicmd); +struct fsa_dev_info *fsa_dev_ptr = dev->fsa_dev; +if (fsa_dev_ptr && cid < dev->maximum_num_containers) { + fsa_dev_ptr += cid;if ((fsa_dev_ptr->valid &1 ) ==0 ) { fsa_dev_ptr->valid =0 ;return (*callback)(scsicmd);
@@ -794,7 +816,7 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(stru*/ static int aac_probe_container_callback1 (struct scsi_cmnd * scsicmd) { - scsicmd->device =NULL ; + scsicmd->host_scribble =NULL ;return 0 ; }
@@ -815,6 +837,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)return -ENOMEM ; } scsicmd->scsi_done = aac_probe_container_scsi_done; + scsicmd->host_scribble = (unsigned char *)&cid; scsicmd->device = scsidev; scsidev->sdev_state =0 ;
@@ -822,7 +845,7 @@ int aac_probe_container(struct aac_dev *dev, int cid) scsidev->host = dev->scsi_host_ptr;if (_aac_probe_container (scsicmd, aac_probe_container_callback1) ==0 ) -while (scsicmd->device == scsidev) +while (scsicmd->host_scribble == (unsigned char *)&cid)schedule ();kfree (scsidev); status = scsicmd->SCp.Status;
Signature · 1 line
2.16.4
PATCH v4 21/22 aacraid: use scsi_get_internal_cmd()
In reply to Hannes ReineckeFrom: Hannes Reinecke <[email protected]>
Use scsi_get_internal_cmd() to allocate internal commands. And move scsi_add_host() such that it's allocated early enough to provide tags for the initialisation commands.
--- drivers/scsi/aacraid/aachba.c | 92 +++++++++++++++++++---------------------- drivers/scsi/aacraid/aacraid.h | 9 ++-- drivers/scsi/aacraid/commctrl.c | 25 ++++++----- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/commsup.c | 57 ++++++++++--------------- drivers/scsi/aacraid/dpcsup.c | 2 +- drivers/scsi/aacraid/linit.c | 13 ++++-- 7 files changed, 97 insertions(+), 103 deletions(-)
drivers/scsi/aacraid/aachba.c +42 -50
@@ -359,7 +359,7 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)int status =0 ;struct fib * fibptr; -if (!(fibptr =aac_fib_alloc (dev))) +if (!(fibptr =aac_fib_alloc (dev,DMA_FROM_DEVICE )))return -ENOMEM ;aac_fib_init (fibptr);
@@ -456,7 +456,7 @@ int aac_get_containers(struct aac_dev *dev)struct aac_get_container_count_resp *dresp;int maximum_num_containers =MAXIMUM_NUM_CONTAINERS ; -if (!(fibptr =aac_fib_alloc (dev))) +if (!(fibptr =aac_fib_alloc (dev,DMA_FROM_DEVICE )))return -ENOMEM ;aac_fib_init (fibptr);
@@ -740,61 +740,56 @@ static void _aac_probe_container1(void * context, struct fib * fibptr) } } -static int _aac_probe_container (struct scsi_cmnd * scsicmd,int (*callback)(struct scsi_cmnd *)) +static int _aac_probe_container (struct fib * fibptr,int (*callback)(struct scsi_cmnd *)) { +struct scsi_cmnd *scsicmd = fibptr->scmd;struct aac_dev * dev; -struct fib * fibptr;int status = -ENOMEM ; +struct aac_query_mount *dinfo;int cid =scmd_id (scsicmd); dev = (struct aac_dev *)scsicmd->device->host->hostdata;if (scsicmd->host_scribble) { - cid = *(int *)scsicmd->host_scribble; -if (cid > dev->maximum_num_containers) { + cid = *(unsigned int *)scsicmd->host_scribble; +if (cid >= dev->maximum_num_containers) { status = -ENODEV ; goto out_status; } } -if ((fibptr =aac_fib_alloc (dev))) { -struct aac_query_mount *dinfo; -aac_fib_init (fibptr); +aac_fib_init (fibptr); - dinfo = (struct aac_query_mount *)fib_data (fibptr); + dinfo = (struct aac_query_mount *)fib_data (fibptr); -if (fibptr->dev->supplement_adapter_info.supported_options2 & -AAC_OPTION_VARIABLE_BLOCK_SIZE ) - dinfo->command =cpu_to_le32 (VM_NameServeAllBlk); -else - dinfo->command =cpu_to_le32 (VM_NameServe); +if (fibptr->dev->supplement_adapter_info.supported_options2 & +AAC_OPTION_VARIABLE_BLOCK_SIZE ) + dinfo->command =cpu_to_le32 (VM_NameServeAllBlk); +else + dinfo->command =cpu_to_le32 (VM_NameServe); - dinfo->count =cpu_to_le32 (cid); - dinfo->type =cpu_to_le32 (FT_FILESYS ); - scsicmd->SCp.ptr = (char *)callback; - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; + dinfo->count =cpu_to_le32 (cid); + dinfo->type =cpu_to_le32 (FT_FILESYS ); + scsicmd->SCp.ptr = (char *)callback; + scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; - status =aac_fib_send (ContainerCommand, + status =aac_fib_send (ContainerCommand, fibptr,sizeof (struct aac_query_mount ), FsaNormal,0 ,1 , _aac_probe_container1, (void *) scsicmd); -/* -* Check that the command queued to the controller -*/ -if (status == -EINPROGRESS ) -return 0 ; - -if (status <0 ) { - scsicmd->SCp.ptr =NULL ; -aac_fib_complete (fibptr); -aac_fib_free (fibptr); - } - } +/* +* Check that the command queued to the controller +*/ +if (status == -EINPROGRESS ) +return 0 ; out_status:if (status <0 ) {struct fsa_dev_info *fsa_dev_ptr = dev->fsa_dev; + + scsicmd->SCp.ptr =NULL ; +aac_fib_complete (fibptr);if (fsa_dev_ptr && cid < dev->maximum_num_containers) { fsa_dev_ptr += cid;if ((fsa_dev_ptr->valid &1 ) ==0 ) {
@@ -827,29 +822,23 @@ static void aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)int aac_probe_container (struct aac_dev *dev,int cid) { -struct scsi_cmnd *scsicmd =kmalloc (sizeof (*scsicmd),GFP_KERNEL ); -struct scsi_device *scsidev =kmalloc (sizeof (*scsidev),GFP_KERNEL ); +struct fib *fibptr; +struct scsi_cmnd *scsicmd;int status; -if (!scsicmd || !scsidev) { -kfree (scsicmd); -kfree (scsidev); + fibptr =aac_fib_alloc (dev,DMA_FROM_DEVICE ); +if (!fibptr)return -ENOMEM ; - } + + scsicmd = fibptr->scmd; scsicmd->scsi_done = aac_probe_container_scsi_done; scsicmd->host_scribble = (unsigned char *)&cid; - scsicmd->device = scsidev; - scsidev->sdev_state =0 ; - scsidev->id = cid; - scsidev->host = dev->scsi_host_ptr; - -if (_aac_probe_container (scsicmd, aac_probe_container_callback1) ==0 ) +if (_aac_probe_container (fibptr, aac_probe_container_callback1) ==0 )while (scsicmd->host_scribble == (unsigned char *)&cid)schedule (); -kfree (scsidev); status = scsicmd->SCp.Status; -kfree (scsicmd); +aac_fib_free (fibptr);return status; }
@@ -1695,7 +1684,7 @@ static int aac_send_safw_bmic_cmd(struct aac_dev *dev,return 0 ;/* allocate FIB */ - fibptr =aac_fib_alloc (dev); + fibptr =aac_fib_alloc (dev,DMA_BIDIRECTIONAL );if (!fibptr)return -ENOMEM ;
@@ -2062,7 +2051,7 @@ int aac_get_adapter_info(struct aac_dev* dev)struct aac_bus_info *command;struct aac_bus_info_response *bus_info; -if (!(fibptr =aac_fib_alloc (dev))) +if (!(fibptr =aac_fib_alloc (dev,DMA_FROM_DEVICE )))return -ENOMEM ;aac_fib_init (fibptr);
@@ -2109,7 +2098,7 @@ int aac_get_adapter_info(struct aac_dev* dev)if (rcode >=0 )memcpy (&dev->supplement_adapter_info, sinfo,sizeof (*sinfo));if (rcode == -ERESTARTSYS ) { - fibptr =aac_fib_alloc (dev); + fibptr =aac_fib_alloc (dev,DMA_FROM_DEVICE );if (!fibptr)return -ENOMEM ; }
@@ -2828,6 +2817,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)if (((fsa_dev_ptr[cid].valid &1 ) ==0 ) || (fsa_dev_ptr[cid].sense_data.sense_key ==NOT_READY )) { +struct fib * fibptr; +switch (scsicmd->cmnd[0 ]) {case SERVICE_ACTION_IN_16 : if (!(dev->raw_io_interface) ||
@@ -2840,7 +2831,8 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)case TEST_UNIT_READY :if (dev->in_reset)return -1 ; -return _aac_probe_container (scsicmd, + fibptr =aac_fib_alloc_tag (dev, scsicmd); +return _aac_probe_container (fibptr, aac_probe_container_callback2);default :break ;
drivers/scsi/aacraid/aacraid.h +6 -3
@@ -1291,13 +1291,16 @@ struct fsa_dev_info { };struct fib { -void *next;/* this is used by the allocator */ s16 type;s16 size;/* * The Adapter that this I/O is destined for. */ struct aac_dev *dev; +/* +* The associated scsi command +*/ +struct scsi_cmnd *scmd;/* * This is the event the sendfib routine will wait on if the * caller did not pass one and this is synch io.
@@ -1552,7 +1555,6 @@ struct aac_dev*/ struct fib *fibs; -struct fib *free_fib;spinlock_t fib_lock;struct mutex ioctl_mutex;
@@ -1597,6 +1599,7 @@ struct aac_devsize_t comm_size;struct Scsi_Host *scsi_host_ptr; +struct scsi_device *scsi_host_dev;int maximum_num_containers;int maximum_num_physicals;int maximum_num_channels;
@@ -2686,7 +2689,7 @@ void aac_free_irq(struct aac_dev *dev);int aac_setup_safw_adapter (struct aac_dev *dev);const char *aac_driverinfo (struct Scsi_Host *);void aac_fib_vector_assign (struct aac_dev *dev); -struct fib *aac_fib_alloc (struct aac_dev *dev); +struct fib *aac_fib_alloc (struct aac_dev *dev,int direction);struct fib *aac_fib_alloc_tag (struct aac_dev *dev,struct scsi_cmnd *scmd);int aac_fib_setup (struct aac_dev *dev);void aac_fib_map_free (struct aac_dev *dev);
drivers/scsi/aacraid/commctrl.c +15 -10
@@ -55,7 +55,7 @@ static int ioctl_send_fib(struct aac_dev * dev, void __user *arg)if (dev->in_reset) {return -EBUSY ; } - fibptr =aac_fib_alloc (dev); + fibptr =aac_fib_alloc (dev,DMA_BIDIRECTIONAL );if (fibptr ==NULL ) {return -ENOMEM ; }
@@ -462,7 +462,7 @@ static int check_revision(struct aac_dev *dev, void __user *arg)static int aac_send_raw_srb (struct aac_dev * dev,void __user * arg) { -struct fib * srbfib; +struct fib * srbfib =NULL ;int status;struct aac_srb *srbcmd =NULL ;struct aac_hba_cmd_req *hbacmd =NULL ;
@@ -493,12 +493,6 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)dprintk ((KERN_DEBUG "aacraid: No permission to send raw srb\n" ));return -EPERM ; } -/* -* Allocate and initialize a Fib then setup a SRB command -*/ -if (!(srbfib =aac_fib_alloc (dev))) { -return -ENOMEM ; - }memset (sg_list,0 ,sizeof (sg_list));/* cleanup may take issue */ if (copy_from_user (&fibsize, &user_srb->count,sizeof (u32))){
@@ -545,6 +539,15 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) rcode = -EINVAL ; goto cleanup; } + +/* +* Allocate and initialize a Fib +*/ +if (!(srbfib =aac_fib_alloc (dev, data_dir))) { + rcode = -ENOMEM ; + goto cleanup; + } + actual_fibsize =sizeof (struct aac_srb ) -sizeof (struct sgentry ) + ((user_srbcmd->sg.count &0xff ) *sizeof (struct sgentry )); actual_fibsize64 = actual_fibsize + (user_srbcmd->sg.count & 0xff) *
@@ -970,8 +973,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)if (rcode != -ERESTARTSYS ) {for (i =0 ; i <= sg_indx; i++)kfree (sg_list[i]); -aac_fib_complete (srbfib); -aac_fib_free (srbfib); +if (srbfib) { +aac_fib_complete (srbfib); +aac_fib_free (srbfib); + } }return rcode;
drivers/scsi/aacraid/comminit.c +1 -1
@@ -327,7 +327,7 @@ int aac_send_shutdown(struct aac_dev * dev)aac_wait_for_io_completion (dev); - fibctx =aac_fib_alloc (dev); + fibctx =aac_fib_alloc (dev,DMA_NONE );if (!fibctx)return -ENOMEM ;aac_fib_init (fibctx);
drivers/scsi/aacraid/commsup.c +22 -35
115 lines not on this page · raw message
drivers/scsi/aacraid/dpcsup.c +1 -1
@@ -315,7 +315,7 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index, int isAif,struct fib *fibctx;struct aac_aifcmd *cmd; - fibctx =aac_fib_alloc (dev); + fibctx =aac_fib_alloc (dev,DMA_FROM_DEVICE );if (!fibctx)return 1 ;aac_fib_init (fibctx);
drivers/scsi/aacraid/linit.c +10 -3
@@ -713,7 +713,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd)return ret;/* start a HBA_TMF_ABORT_TASK TMF request */ - fib =aac_fib_alloc (aac); + fib =aac_fib_alloc (aac,DMA_NONE );if (!fib)return ret;
@@ -924,7 +924,7 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd)pr_err ("%s: Host device reset request. SCSI hang ?\n" ,AAC_DRIVERNAME ); - fib =aac_fib_alloc (aac); + fib =aac_fib_alloc (aac,DMA_NONE );if (!fib)return ret;
@@ -987,7 +987,7 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd)pr_err ("%s: Host target reset request. SCSI hang ?\n" ,AAC_DRIVERNAME ); - fib =aac_fib_alloc (aac); + fib =aac_fib_alloc (aac,DMA_NONE );if (!fib)return ret;
@@ -1698,6 +1698,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_cmd_len =16 ; shost->max_id =MAXIMUM_NUM_CONTAINERS ; shost->max_lun =AAC_MAX_LUN ; + shost->nr_reserved_cmds =AAC_NUM_MGT_FIB ; shost->sg_tablesize =HBA_MAX_SG_SEPARATE ;if (aac_cfg_major ==AAC_CHARDEV_NEEDS_REINIT )
@@ -1772,6 +1773,10 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)if (error) goto out_deinit; + aac->scsi_host_dev =scsi_get_host_dev (shost); +if (!aac->scsi_host_dev) + goto out_remove_host; + aac->maximum_num_channels = aac_drivers[index].channels; error =aac_get_adapter_info (aac);if (error <0 )
@@ -1847,6 +1852,8 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)kfree (aac->queues);aac_adapter_ioremap (aac,0 );kfree (aac->fsa_dev); + out_remove_host: +scsi_remove_host (shost); out_free_fibs:kfree (aac->fibs); out_free_host:
Signature · 1 line
2.16.4
PATCH v4 22/22 aacraid: use scsi_host_busy_iter() to traverse outstanding commands
In reply to Hannes ReineckeInstead of walking the array of potential commands and trying to figure out which one might be pending the driver should be using scsi_host_busy_iter() to traverse all outstanding commands.
And for command abort we can now lookup the fibs directly as we now have a 1:1 mapping between request tags and fibs.
--- drivers/scsi/aacraid/commsup.c | 49 ++++++++------- drivers/scsi/aacraid/linit.c | 131 ++++++++++++++++++----------------------- 2 files changed, 84 insertions(+), 96 deletions(-)
drivers/scsi/aacraid/commsup.c +27 -22
@@ -1459,6 +1459,32 @@ static void aac_schedule_bus_scan(struct aac_dev *aac)aac_schedule_src_reinit_aif_worker (aac); } +static bool aac_close_sync_fib_iter (struct scsi_cmnd *command,void *data, +bool reserved) +{ +struct Scsi_Host *host = command->device->host; +struct aac_dev *aac = (struct aac_dev *)host->hostdata; +struct fib *fib = &aac->fibs[command->request->tag]; +int *retval = data; +__le32 XferState = fib->hw_fib_va->header.XferState; +bool is_response_expected = false; + +if (!(XferState &cpu_to_le32 (NoResponseExpected | Async)) && + (XferState &cpu_to_le32 (ResponseExpected))) + is_response_expected = true; + +if (is_response_expected + || fib->flags &FIB_CONTEXT_FLAG_WAIT ) { +unsigned long flagv; +spin_lock_irqsave (&fib->event_lock, flagv); +complete (&fib->event_wait); +spin_unlock_irqrestore (&fib->event_lock, flagv); +schedule (); + *retval =0 ; + } +return true; +} +static int _aac_reset_adapter (struct aac_dev *aac,int forced,u8 reset_type) {int index, quirks;
@@ -1467,7 +1493,6 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)int jafo =0 ;int bled;u64 dmamask; -int num_of_fibs =0 ;/* * Assumptions:
@@ -1501,27 +1526,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)* Loop through the fibs, close the synchronous FIBS */ retval =1 ; - num_of_fibs = aac->scsi_host_ptr->can_queue +AAC_NUM_MGT_FIB ; -for (index =0 ; index < num_of_fibs; index++) { - -struct fib *fib = &aac->fibs[index]; -__le32 XferState = fib->hw_fib_va->header.XferState; -bool is_response_expected = false; - -if (!(XferState &cpu_to_le32 (NoResponseExpected | Async)) && - (XferState &cpu_to_le32 (ResponseExpected))) - is_response_expected = true; - -if (is_response_expected - || fib->flags &FIB_CONTEXT_FLAG_WAIT ) { -unsigned long flagv; -spin_lock_irqsave (&fib->event_lock, flagv); -complete (&fib->event_wait); -spin_unlock_irqrestore (&fib->event_lock, flagv); -schedule (); - retval =0 ; - } - } +scsi_host_busy_iter (host, aac_close_sync_fib_iter, &retval);/* Give some extra time for ioctls to complete. */ if (retval ==0 )ssleep (2 );
drivers/scsi/aacraid/linit.c +57 -74
172 lines not on this page · raw message
Signature · 1 line
2.16.4