gmane.linux.scsi

[PATCH] [Target_Core_Mod]: Convert to se_task_t->task_sg usage incore and subsystem plugins

Nicholas A. Bellinger — 2008-12-03T02:44:36

From: Nicholas Bellinger linux-iscsi.org> Date: Tue, 2 Dec 2008 18:06:54 -0800 Subject: [PATCH] [Target_Core_Mod]: Convert to se_task_t->task_sg usage in core and subsystem plugins This patch adds makes the existing se_task_t->task_buf become se_task_t->task_sg of type struct scatterlist. Changes to target_core_transport.c in transport_calc_sg_num() and transport_free_dev_tasks() are simple, along with a one-liner change in target_core_seobj.c:dev_obj_do_se_mem_map(). Signed-off-by: Nicholas A. Bellinger linux-iscsi.org> --- drivers/lio-core/target_core_base.h | 2 +- drivers/lio-core/target_core_seobj.c | 11 ++++++----- drivers/lio-core/target_core_transport.c | 9 ++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/lio-core/target_core_base.h b/drivers/lio-core/target_core_base.h index 5ee04d3..b866613 100644 --- a/drivers/lio-core/target_core_base.h +++ b/drivers/lio-core/target_core_base.h < at >< at > -249,7 +249,7 < at >< at > typedef struct se_transport_task_s { typedef struct se_task_s { unsigned char task_sense; - unsigned char *task_buf; +struct scatterlist *task_sg; void *transport_req; u8 task_scsi_status; u8 task_flags; diff --git a/drivers/lio-core/target_core_seobj.c b/drivers/lio-core/target_core_seobj.c index 8e8c951..d013f2c 100644 --- a/drivers/lio-core/target_core_seobj.c +++ b/drivers/lio-core/target_core_seobj.c < at >< at > -348,8 +348,9 < at >< at > extern int dev_obj_do_se_mem_map ( * been done by the transport plugin. */ if (TRANSPORT(dev)->do_se_mem_map) { -if ((ret = TRANSPORT(dev)->do_se_mem_map(task, se_mem_list, in_mem, in_se_mem, -out_se_mem, se_mem_cnt, task_offset)) == 0) +if ((ret = TRANSPORT(dev)->do_se_mem_map(task, se_mem_list, +in_mem, in_se_mem, out_se_mem, se_mem_cnt, +task_offset)) == 0) T_TASK(task->iscsi_cmd)->t_task_se_num += *se_mem_cnt; return(ret); < at >< at > -362,10 +363,10 < at >< at > extern int dev_obj_do_se_mem_map ( return(-1); /* - * se_task_t->task_buf now contains the struct scatterlist array. + * se_task_t->task_sg now contains the struct scatterlist array. */ -return(transport_map_mem_to_sg(task, se_mem_list, task->task_buf, in_se_mem, out_se_mem, -se_mem_cnt, task_offset)); +return(transport_map_mem_to_sg(task, se_mem_list, task->task_sg, +in_se_mem, out_se_mem, se_mem_cnt, task_offset)); } extern int dev_obj_get_mem_buf (void *p, iscsi_cmd_t *cmd) diff --git a/drivers/lio-core/target_core_transport.c b/drivers/lio-core/target_core_transport.c index d92814c..b8e8294 100644 --- a/drivers/lio-core/target_core_transport.c +++ b/drivers/lio-core/target_core_transport.c < at >< at > -4643,7 +4643,7 < at >< at > extern void transport_free_dev_tasks (iscsi_cmd_t *cmd) if (!task->transport_req) continue; -kfree(task->task_buf); +kfree(task->task_sg); spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags); if (task->iscsi_dev) < at >< at > -5097,13 +5097,12 < at >< at > extern u32 transport_calc_sg_num ( break; } -if (!(task->task_buf = kmalloc(task->task_sg_num * sizeof(struct scatterlist), GFP_KERNEL))) { -TRACE_ERROR("Unable to allocate memory for task->task_buf\n"); +if (!(task->task_sg = kzalloc(task->task_sg_num * sizeof(struct scatterlist), GFP_KERNEL))) { +TRACE_ERROR("Unable to allocate memory for task->task_sg\n"); return(0); } -memset(task->task_buf, 0, task->task_sg_num * sizeof(struct scatterlist)); -sg_init_table((struct scatterlist *)&task->task_buf[0], task->task_sg_num); +sg_init_table(&task->task_sg[0], task->task_sg_num); DEBUG_SC("Successfully allocated task->task_sg_num: %u\n", task->task_sg_num);

[PATCH] [Target_Core_Mod]: Update PSCSI, IBLOCK, FILEIO andRAMDISK for se_task_t->task_sg

Nicholas A. Bellinger — 2008-12-03T02:15:16

From: Nicholas Bellinger linux-iscsi.org> Date: Tue, 2 Dec 2008 18:07:40 -0800 Subject: [PATCH] [Target_Core_Mod]: Update PSCSI, IBLOCK, FILEIO and RAMDISK for se_task_t->task_sg This patch changes the generic target core subsystem plugins to use se_task_t->task_sg and gets rid of a handful of casts from the original se_task_t->task_buf, which if present, will always contain a contigious array of struct scatterlist memory. Signed-off-by: Nicholas A. Bellinger linux-iscsi.org> --- drivers/lio-core/target_core_file.c | 12 ++++++------ drivers/lio-core/target_core_iblock.c | 4 ++-- drivers/lio-core/target_core_pscsi.c | 11 ++++------- drivers/lio-core/target_core_rd.c | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/lio-core/target_core_file.c b/drivers/lio-core/target_core_file.c index 5b9b5dd..be1314d 100644 --- a/drivers/lio-core/target_core_file.c +++ b/drivers/lio-core/target_core_file.c < at >< at > -586,7 +586,7 < at >< at > static int fd_do_readv (fd_request_t *req, se_task_t *task) u32 i; mm_segment_t old_fs; struct file *fd = req->fd_dev->fd_file; -struct scatterlist *sg = (struct scatterlist *) req->fd_buf; +struct scatterlist *sg = task->task_sg; struct iovec iov[req->fd_sg_count]; memset(iov, 0, sizeof(struct iovec) + req->fd_sg_count); < at >< at > -638,7 +638,7 < at >< at > static int fd_do_aio_read (fd_request_t *req, se_task_t *task) unsigned long long offset, lba = req->fd_lba;; mm_segment_t old_fs; struct file *fd = req->fd_dev->fd_file; -struct scatterlist *sg = (struct scatterlist *) req->fd_buf; +struct scatterlist *sg = task->task_sg; struct iovec *iov; struct kiocb*iocb; < at >< at > -716,7 +716,7 < at >< at > static int fd_sendactor (read_descriptor_t * desc, struct page *page, unsigned l unsigned long count = desc->count; se_task_t *task = desc->arg.data; fd_request_t *req = (fd_request_t *) task->transport_req; -struct scatterlist *sg = (struct scatterlist *) req->fd_buf; +struct scatterlist *sg = task->task_sg; //PYXPRINT("page: %p offset: %lu size: %lu\n", page, offset, size); < at >< at > -767,7 +767,7 < at >< at > static int fd_do_writev (fd_request_t *req, se_task_t *task) int ret = 0; u32 i; struct file *fd = req->fd_dev->fd_file; -struct scatterlist *sg = (struct scatterlist *) req->fd_buf; +struct scatterlist *sg = task->task_sg; mm_segment_t old_fs; struct iovec iov[req->fd_sg_count]; < at >< at > -803,7 +803,7 < at >< at > static int fd_do_aio_write (fd_request_t *req, se_task_t *task) unsigned long long offset, lba = req->fd_lba; mm_segment_t old_fs; struct file *fd = req->fd_dev->fd_file; -struct scatterlist *sg = (struct scatterlist *) req->fd_buf; +struct scatterlist *sg = task->task_sg; struct iovec *iov; struct kiocb *iocb; < at >< at > -1065,7 +1065,7 < at >< at > extern void fd_map_task_SG (se_task_t *task) fd_request_t *req = (fd_request_t *) task->transport_req; req->fd_bufflen= task->task_size; -req->fd_buf= (void *)task->task_buf; +req->fd_buf= NULL; req->fd_sg_count= task->task_sg_num; return; diff --git a/drivers/lio-core/target_core_iblock.c b/drivers/lio-core/target_core_iblock.c index 50e2a2a..962dc35 100644 --- a/drivers/lio-core/target_core_iblock.c +++ b/drivers/lio-core/target_core_iblock.c < at >< at > -755,7 +755,7 < at >< at > extern int iblock_map_task_SG (se_task_t *task) iblock_dev_t *ib_dev = (iblock_dev_t *) task->iscsi_dev->dev_ptr; iblock_req_t *ib_req = (iblock_req_t *) task->transport_req; struct bio *bio = NULL, *hbio = NULL, *tbio = NULL; -struct scatterlist *sg = (struct scatterlist *)task->task_buf; +struct scatterlist *sg = task->task_sg; int ret = 0; u32 i, sg_num = task->task_sg_num; u64 lba = task->task_lba; < at >< at > -769,7 +769,7 < at >< at > extern int iblock_map_task_SG (se_task_t *task) hbio = tbio = bio; /* * Use fs/bio.c:bio_add_pages() to setup the bio_vec maplist - * from LIO-SE se_mem_t -> task->task_buf -> struct scatterlist memory. + * from LIO-SE se_mem_t -> task->task_sg -> struct scatterlist memory. */ for (i = 0; i < task->task_sg_num; i++) { DEBUG_IBLOCK("task: %p bio: %p Calling bio_add_page(): page: %p len:" diff --git a/drivers/lio-core/target_core_pscsi.c b/drivers/lio-core/target_core_pscsi.c index 862ad26..0ce57e6 100644 --- a/drivers/lio-core/target_core_pscsi.c +++ b/drivers/lio-core/target_core_pscsi.c < at >< at > -1165,22 +1165,19 < at >< at > extern int pscsi_map_task_SG (se_task_t *task) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; int ret = 0; -pt->pscsi_buf = (void *)task->task_buf; +pt->pscsi_buf = (void *)task->task_sg; if (!task->task_size) return(0); #if 0 if ((ret = blk_rq_map_sg(pdv->pdv_sd->request_queue, -pt->pscsi_req, -(struct scatterlist *)pt->pscsi_buf)) < 0) { +pt->pscsi_req, task->task_sg)) < 0) { printk(KERN_ERR "PSCSI: blk_rq_map_sg() returned %d\n", ret); return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); } #else -if ((ret = scsi_req_map_sg(pt->pscsi_req, -(struct scatterlist *)pt->pscsi_buf, -task->task_sg_num, task->task_size, -GFP_KERNEL)) < 0) { +if ((ret = scsi_req_map_sg(pt->pscsi_req, task->task_sg, +task->task_sg_num, task->task_size, GFP_KERNEL)) < 0) { printk(KERN_ERR "PSCSI: scsi_req_map_sg() failed: %d\n", ret); return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); } diff --git a/drivers/lio-core/target_core_rd.c b/drivers/lio-core/target_core_rd.c index 3bc0d77..ac32e4b 100644 --- a/drivers/lio-core/target_core_rd.c +++ b/drivers/lio-core/target_core_rd.c < at >< at > -1195,7 +1195,7 < at >< at > extern void rd_map_task_SG (se_task_t *task) rd_request_t *req = (rd_request_t *) task->transport_req; req->rd_bufflen= task->task_size; -req->rd_buf= (void *)task->task_buf; +req->rd_buf= task->task_sg; req->rd_sg_count= task->task_sg_num; return;

[PATCH] remove ide-scsi

FUJITA Tomonori — 2008-12-03T01:38:54

This is for 2.6.29 (not 2.6.28) as feature-removal-schedule.txt says. It's against linux-next (which seems to has some changes to ide-scsi for 2.6.29 from the ide tree). = From: FUJITA Tomonori lab.ntt.co.jp> Subject: [PATCH] remove ide-scsi As planed, this removes ide-scsi. The 2.6 kernel supports direct writing to ide CD drives, which eliminates the need for ide-scsi. ide-scsi has been unmaintained and marked as deprecated. Signed-off-by: FUJITA Tomonori lab.ntt.co.jp> --- Documentation/feature-removal-schedule.txt | 9 - MAINTAINERS | 5 - drivers/ide/Kconfig | 17 - drivers/scsi/Kconfig | 8 +- drivers/scsi/Makefile | 1 - drivers/scsi/ide-scsi.c | 840 ---------------------------- 6 files changed, 4 insertions(+), 876 deletions(-) delete mode 100644 drivers/scsi/ide-scsi.c diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 77eb6b1..31f7906 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt < at >< at > -322,15 +322,6 < at >< at > Who: Krzysztof Piotr Oledzki ans.pl> --------------------------- -What: ide-scsi (BLK_DEV_IDESCSI) -When: 2.6.29 -Why: The 2.6 kernel supports direct writing to ide CD drives, which - eliminates the need for ide-scsi. The new method is more - efficient in every way. -Who: FUJITA Tomonori lab.ntt.co.jp> - ---------------------------- - What:i2c_attach_client(), i2c_detach_client(), i2c_driver->detach_client() When:2.6.29 (ideally) or 2.6.30 (more likely) Why:Deprecated by the new (standard) device driver binding model. Use diff --git a/MAINTAINERS b/MAINTAINERS index 758dd7a..8e07bb9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS < at >< at > -2138,11 +2138,6 < at >< at > M:Gadi Oxman netvision.net.il> L:linux-kernel< at >vger.kernel.org S:Maintained -IDE-SCSI DRIVER -L:linux-ide< at >vger.kernel.org -L:linux-scsi< at >vger.kernel.org -S:Orphan - IDLE-I7300 P:Andy Henroid M:andrew.d.henroid< at >intel.com diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 8d84fe4..d806271 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig < at >< at > -185,23 +185,6 < at >< at > config BLK_DEV_IDETAPE To compile this driver as a module, choose M here: the module will be called ide-tape. -config BLK_DEV_IDESCSI -tristate "SCSI emulation support (DEPRECATED)" -depends on SCSI -select IDE_ATAPI ----help--- - WARNING: ide-scsi is no longer needed for cd writing applications! - The 2.6 kernel supports direct writing to ide-cd, which eliminates - the need for ide-scsi + the entire scsi stack just for writing a - cd. The new method is more efficient in every way. - - This will provide SCSI host adapter emulation for IDE ATAPI devices, - and will allow you to use a SCSI device driver instead of a native - ATAPI driver. - - If both this SCSI emulation and native ATAPI support are compiled - into the kernel, the native support will be used. - config BLK_DEV_IDEACPI bool "IDE ACPI support" depends on ACPI diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e6af21c..2eb172d 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig < at >< at > -21,7 +21,7 < at >< at > config SCSI You also need to say Y here if you have a device which speaks the SCSI protocol. Examples of this include the parallel port version of the IOMEGA ZIP drive, USB storage devices, Fibre - Channel, FireWire storage and the IDE-SCSI emulation driver. + Channel, and FireWire storage. To compile this driver as a module, choose M here and read . < at >< at > -101,9 +101,9 < at >< at > config CHR_DEV_OSST ---help--- The OnStream SC-x0 SCSI tape drives cannot be driven by the standard st driver, but instead need this special osst driver and - use the /dev/osstX char device nodes (major 206). Via usb-storage - and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives - as well. Note that there is also a second generation of OnStream + use the /dev/osstX char device nodes (major 206). Via usb-storage, + you may be able to drive the USB-x0 and DI-x0 drives as well. + Note that there is also a second generation of OnStream tape drives (ADR-x0) that supports the standard SCSI-2 commands for tapes (QIC-157) and can be driven by the standard driver st. For more information, you may have a look at the SCSI-HOWTO diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 1e49632..42bf88b 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile < at >< at > -103,7 +103,6 < at >< at > obj-$(CONFIG_SCSI_GDTH)+= gdth.o obj-$(CONFIG_SCSI_INITIO)+= initio.o obj-$(CONFIG_SCSI_INIA100)+= a100u2w.o obj-$(CONFIG_SCSI_QLOGICPTI)+= qlogicpti.o -obj-$(CONFIG_BLK_DEV_IDESCSI)+= ide-scsi.o obj-$(CONFIG_SCSI_MESH)+= mesh.o obj-$(CONFIG_SCSI_MAC53C94)+= mac53c94.o obj-$(CONFIG_BLK_DEV_3W_XXXX_RAID) += 3w-xxxx.o diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c deleted file mode 100644 index c24140a..0000000 --- a/drivers/scsi/ide-scsi.c +++ /dev/null < at >< at > -1,840 +0,0 < at >< at > -/* - * Copyright (C) 1996-1999 Gadi Oxman netvision.net.il> - * Copyright (C) 2004-2005 Bartlomiej Zolnierkiewicz - */ - -/* - * Emulation of a SCSI host adapter for IDE ATAPI devices. - * - * With this driver, one can use the Linux SCSI drivers instead of the - * native IDE ATAPI drivers. - * - * Ver 0.1 Dec 3 96 Initial version. - * Ver 0.2 Jan 26 97 Fixed bug in cleanup_module() and added emulation - * of MODE_SENSE_6/MODE_SELECT_6 for cdroms. Thanks - * to Janos Farkas for pointing this out. - * Avoid using bitfields in structures for m68k. - * Added Scatter/Gather and DMA support. - * Ver 0.4 Dec 7 97 Add support for ATAPI PD/CD drives. - * Use variable timeout for each command. - * Ver 0.5 Jan 2 98 Fix previous PD/CD support. - * Allow disabling of SCSI-6 to SCSI-10 transformation. - * Ver 0.6 Jan 27 98 Allow disabling of SCSI command translation layer - * for access through /dev/sg. - * Fix MODE_SENSE_6/MODE_SELECT_6/INQUIRY translation. - * Ver 0.7 Dec 04 98 Ignore commands where lun != 0 to avoid multiple - * detection of devices with CONFIG_SCSI_MULTI_LUN - * Ver 0.8 Feb 05 99 Optical media need translation too. Reverse 0.7. - * Ver 0.9 Jul 04 99 Fix a bug in SG_SET_TRANSFORM. - * Ver 0.91 Jun 10 02 Fix "off by one" error in transforms - * Ver 0.92 Dec 31 02 Implement new SCSI mid level API - */ - -#define IDESCSI_VERSION "0.92" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#define IDESCSI_DEBUG_LOG0 - -#if IDESCSI_DEBUG_LOG -#define debug_log(fmt, args...) \ -printk(KERN_INFO "ide-scsi: " fmt, ## args) -#else -#define debug_log(fmt, args...) do {} while (0) -#endif - -/* - *SCSI command transformation layer - */ -#define IDESCSI_SG_TRANSFORM1/* /dev/sg transformation */ - -/* - *Log flags - */ -#define IDESCSI_LOG_CMD0/* Log SCSI commands */ - -typedef struct ide_scsi_obj { -ide_drive_t*drive; -ide_driver_t*driver; -struct gendisk*disk; -struct Scsi_Host*host; - -unsigned long transform;/* SCSI cmd translation layer */ -unsigned long log;/* log flags */ -} idescsi_scsi_t; - -static DEFINE_MUTEX(idescsi_ref_mutex); -/* Set by module param to skip cd */ -static int idescsi_nocd; - -#define ide_scsi_g(disk) \ -container_of((disk)->private_data, struct ide_scsi_obj, driver) - -static struct ide_scsi_obj *ide_scsi_get(struct gendisk *disk) -{ -struct ide_scsi_obj *scsi = NULL; - -mutex_lock(&idescsi_ref_mutex); -scsi = ide_scsi_g(disk); -if (scsi) { -if (ide_device_get(scsi->drive)) -scsi = NULL; -else -scsi_host_get(scsi->host); -} -mutex_unlock(&idescsi_ref_mutex); -return scsi; -} - -static void ide_scsi_put(struct ide_scsi_obj *scsi) -{ -ide_drive_t *drive = scsi->drive; - -mutex_lock(&idescsi_ref_mutex); -scsi_host_put(scsi->host); -ide_device_put(drive); -mutex_unlock(&idescsi_ref_mutex); -} - -static inline idescsi_scsi_t *scsihost_to_idescsi(struct Scsi_Host *host) -{ -return (idescsi_scsi_t*) (&host[1]); -} - -static inline idescsi_scsi_t *drive_to_idescsi(ide_drive_t *ide_drive) -{ -return scsihost_to_idescsi(ide_drive->driver_data); -} - -static void ide_scsi_hex_dump(u8 *data, int len) -{ -print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, data, len, 0); -} - -static int idescsi_end_request(ide_drive_t *, int, int); - -static void ide_scsi_callback(ide_drive_t *drive, int dsc) -{ -idescsi_scsi_t *scsi = drive_to_idescsi(drive); -struct ide_atapi_pc *pc = drive->pc; - -if (pc->flags & PC_FLAG_TIMEDOUT) -debug_log("%s: got timed out packet %lu at %lu\n", __func__, - pc->scsi_cmd->serial_number, jiffies); -/* end this request now - scsi should retry it*/ -else if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) -printk(KERN_INFO "Packet command completed, %d bytes" - " transferred\n", pc->xferred); - -idescsi_end_request(drive, 1, 0); -} - -static int idescsi_check_condition(ide_drive_t *drive, -struct request *failed_cmd) -{ -idescsi_scsi_t *scsi = drive_to_idescsi(drive); -struct ide_atapi_pc *pc; -struct request *rq; -u8 *buf; - -/* stuff a sense request in front of our current request */ -pc = kzalloc(sizeof(struct ide_atapi_pc), GFP_ATOMIC); -rq = blk_get_request(drive->queue, READ, GFP_ATOMIC); -buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_ATOMIC); -if (!pc || !rq || !buf) { -kfree(buf); -if (rq) -blk_put_request(rq); -kfree(pc); -return -ENOMEM; -} -rq->special = (char *) pc; -pc->rq = rq; -pc->buf = buf; -pc->c[0] = REQUEST_SENSE; -pc->c[4] = pc->req_xfer = pc->buf_size = SCSI_SENSE_BUFFERSIZE; -rq->cmd_type = REQ_TYPE_SENSE; -rq->cmd_flags |= REQ_PREEMPT; -pc->timeout = jiffies + WAIT_READY; -/* NOTE! Save the failed packet command in "rq->buffer" */ -rq->buffer = (void *) failed_cmd->special; -pc->scsi_cmd = ((struct ide_atapi_pc *) failed_cmd->special)->scsi_cmd; -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) { -printk ("ide-scsi: %s: queue cmd = ", drive->name); -ide_scsi_hex_dump(pc->c, 6); -} -rq->rq_disk = scsi->disk; -rq->ref_count++; -memcpy(rq->cmd, pc->c, 12); -ide_do_drive_cmd(drive, rq); -return 0; -} - -static ide_startstop_t -idescsi_atapi_error(ide_drive_t *drive, struct request *rq, u8 stat, u8 err) -{ -ide_hwif_t *hwif = drive->hwif; - -if (hwif->tp_ops->read_status(hwif) & (ATA_BUSY | ATA_DRQ)) -/* force an abort */ -hwif->tp_ops->exec_command(hwif, ATA_CMD_IDLEIMMEDIATE); - -rq->errors++; - -idescsi_end_request(drive, 0, 0); - -return ide_stopped; -} - -static int idescsi_end_request (ide_drive_t *drive, int uptodate, int nrsecs) -{ -idescsi_scsi_t *scsi = drive_to_idescsi(drive); -struct request *rq = HWGROUP(drive)->rq; -struct ide_atapi_pc *pc = (struct ide_atapi_pc *) rq->special; -int log = test_bit(IDESCSI_LOG_CMD, &scsi->log); -struct Scsi_Host *host; -int errors = rq->errors; -unsigned long flags; - -if (!blk_special_request(rq) && !blk_sense_request(rq)) { -ide_end_request(drive, uptodate, nrsecs); -return 0; -} -ide_end_drive_cmd (drive, 0, 0); -if (blk_sense_request(rq)) { -struct ide_atapi_pc *opc = (struct ide_atapi_pc *) rq->buffer; -if (log) { -printk ("ide-scsi: %s: wrap up check %lu, rst = ", drive->name, opc->scsi_cmd->serial_number); -ide_scsi_hex_dump(pc->buf, 16); -} -memcpy((void *) opc->scsi_cmd->sense_buffer, pc->buf, -SCSI_SENSE_BUFFERSIZE); -kfree(pc->buf); -kfree(pc); -blk_put_request(rq); -pc = opc; -rq = pc->rq; -pc->scsi_cmd->result = (CHECK_CONDITION << 1) | -(((pc->flags & PC_FLAG_TIMEDOUT) ? - DID_TIME_OUT : - DID_OK) << 16); -} else if (pc->flags & PC_FLAG_TIMEDOUT) { -if (log) -printk (KERN_WARNING "ide-scsi: %s: timed out for %lu\n", -drive->name, pc->scsi_cmd->serial_number); -pc->scsi_cmd->result = DID_TIME_OUT << 16; -} else if (errors >= ERROR_MAX) { -pc->scsi_cmd->result = DID_ERROR << 16; -if (log) -printk ("ide-scsi: %s: I/O error for %lu\n", drive->name, pc->scsi_cmd->serial_number); -} else if (errors) { -if (log) -printk ("ide-scsi: %s: check condition for %lu\n", drive->name, pc->scsi_cmd->serial_number); -if (!idescsi_check_condition(drive, rq)) -/* we started a request sense, so we'll be back, exit for now */ -return 0; -pc->scsi_cmd->result = (CHECK_CONDITION << 1) | (DID_OK << 16); -} else { -pc->scsi_cmd->result = DID_OK << 16; -} -host = pc->scsi_cmd->device->host; -spin_lock_irqsave(host->host_lock, flags); -pc->done(pc->scsi_cmd); -spin_unlock_irqrestore(host->host_lock, flags); -kfree(pc); -blk_put_request(rq); -drive->pc = NULL; -return 0; -} - -static inline int idescsi_set_direction(struct ide_atapi_pc *pc) -{ -switch (pc->c[0]) { -case READ_6: case READ_10: case READ_12: -pc->flags &= ~PC_FLAG_WRITING; -return 0; -case WRITE_6: case WRITE_10: case WRITE_12: -pc->flags |= PC_FLAG_WRITING; -return 0; -default: -return 1; -} -} - -static int idescsi_map_sg(ide_drive_t *drive, struct ide_atapi_pc *pc) -{ -ide_hwif_t *hwif = drive->hwif; -struct scatterlist *sg, *scsi_sg; -int segments; - -if (!pc->req_xfer || pc->req_xfer % 1024) -return 1; - -if (idescsi_set_direction(pc)) -return 1; - -sg = hwif->sg_table; -scsi_sg = scsi_sglist(pc->scsi_cmd); -segments = scsi_sg_count(pc->scsi_cmd); - -if (segments > hwif->sg_max_nents) -return 1; - -hwif->sg_nents = segments; -memcpy(sg, scsi_sg, sizeof(*sg) * segments); - -return 0; -} - -static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive, -struct ide_atapi_pc *pc) -{ -/* Set the current packet command */ -drive->pc = pc; - -return ide_issue_pc(drive, ide_scsi_get_timeout(pc), ide_scsi_expiry); -} - -/* - *idescsi_do_request is our request handling function. - */ -static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *rq, sector_t block) -{ -debug_log("dev: %s, cmd: %x, errors: %d\n", rq->rq_disk->disk_name, - rq->cmd[0], rq->errors); -debug_log("sector: %ld, nr_sectors: %ld, current_nr_sectors: %d\n", - rq->sector, rq->nr_sectors, rq->current_nr_sectors); - -if (blk_sense_request(rq) || blk_special_request(rq)) { -struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq->special; - -if ((drive->dev_flags & IDE_DFLAG_USING_DMA) && - idescsi_map_sg(drive, pc) == 0) -pc->flags |= PC_FLAG_DMA_OK; - -return idescsi_issue_pc(drive, pc); -} -blk_dump_rq_flags(rq, "ide-scsi: unsup command"); -idescsi_end_request (drive, 0, 0); -return ide_stopped; -} - -#ifdef CONFIG_IDE_PROC_FS -static ide_proc_entry_t idescsi_proc[] = { -{ "capacity", S_IFREG|S_IRUGO, proc_ide_read_capacity, NULL }, -{ NULL, 0, NULL, NULL } -}; - -#define ide_scsi_devset_get(name, field) \ -static int get_##name(ide_drive_t *drive) \ -{ \ -idescsi_scsi_t *scsi = drive_to_idescsi(drive); \ -return scsi->field; \ -} - -#define ide_scsi_devset_set(name, field) \ -static int set_##name(ide_drive_t *drive, int arg) \ -{ \ -idescsi_scsi_t *scsi = drive_to_idescsi(drive); \ -scsi->field = arg; \ -return 0; \ -} - -#define ide_scsi_devset_rw_field(_name, _field) \ -ide_scsi_devset_get(_name, _field); \ -ide_scsi_devset_set(_name, _field); \ -IDE_DEVSET(_name, DS_SYNC, get_##_name, set_##_name); - -ide_devset_rw_field(bios_cyl, bios_cyl); -ide_devset_rw_field(bios_head, bios_head); -ide_devset_rw_field(bios_sect, bios_sect); - -ide_scsi_devset_rw_field(transform, transform); -ide_scsi_devset_rw_field(log, log); - -static const struct ide_proc_devset idescsi_settings[] = { -IDE_PROC_DEVSET(bios_cyl, 0, 1023), -IDE_PROC_DEVSET(bios_head, 0, 255), -IDE_PROC_DEVSET(bios_sect, 0,63), -IDE_PROC_DEVSET(log, 0, 1), -IDE_PROC_DEVSET(transform, 0, 3), -{ 0 }, -}; - -static ide_proc_entry_t *ide_scsi_proc_entries(ide_drive_t *drive) -{ -return idescsi_proc; -} - -static const struct ide_proc_devset *ide_scsi_proc_devsets(ide_drive_t *drive) -{ -return idescsi_settings; -} -#endif - -/* - *Driver initialization. - */ -static void idescsi_setup (ide_drive_t *drive, idescsi_scsi_t *scsi) -{ -clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform); -#if IDESCSI_DEBUG_LOG -set_bit(IDESCSI_LOG_CMD, &scsi->log); -#endif /* IDESCSI_DEBUG_LOG */ - -drive->pc_callback = ide_scsi_callback; -drive->pc_update_buffers = NULL; -drive->pc_io_buffers = ide_io_buffers; - -ide_proc_register_driver(drive, scsi->driver); -} - -static void ide_scsi_remove(ide_drive_t *drive) -{ -struct Scsi_Host *scsihost = drive->driver_data; -struct ide_scsi_obj *scsi = scsihost_to_idescsi(scsihost); -struct gendisk *g = scsi->disk; - -scsi_remove_host(scsihost); -ide_proc_unregister_driver(drive, scsi->driver); - -ide_unregister_region(g); - -drive->driver_data = NULL; -g->private_data = NULL; -put_disk(g); - -ide_scsi_put(scsi); - -drive->dev_flags &= ~IDE_DFLAG_SCSI; -} - -static int ide_scsi_probe(ide_drive_t *); - -static ide_driver_t idescsi_driver = { -.gen_driver = { -.owner= THIS_MODULE, -.name= "ide-scsi", -.bus= &ide_bus_type, -}, -.probe= ide_scsi_probe, -.remove= ide_scsi_remove, -.version= IDESCSI_VERSION, -.do_request= idescsi_do_request, -.end_request= idescsi_end_request, -.error = idescsi_atapi_error, -#ifdef CONFIG_IDE_PROC_FS -.proc_entries= ide_scsi_proc_entries, -.proc_devsets= ide_scsi_proc_devsets, -#endif -}; - -static int idescsi_ide_open(struct block_device *bdev, fmode_t mode) -{ -struct ide_scsi_obj *scsi = ide_scsi_get(bdev->bd_disk); - -if (!scsi) -return -ENXIO; - -return 0; -} - -static int idescsi_ide_release(struct gendisk *disk, fmode_t mode) -{ -ide_scsi_put(ide_scsi_g(disk)); -return 0; -} - -static int idescsi_ide_ioctl(struct block_device *bdev, fmode_t mode, -unsigned int cmd, unsigned long arg) -{ -struct ide_scsi_obj *scsi = ide_scsi_g(bdev->bd_disk); -return generic_ide_ioctl(scsi->drive, bdev, cmd, arg); -} - -static struct block_device_operations idescsi_ops = { -.owner= THIS_MODULE, -.open= idescsi_ide_open, -.release= idescsi_ide_release, -.locked_ioctl= idescsi_ide_ioctl, -}; - -static int idescsi_slave_configure(struct scsi_device * sdp) -{ -/* Configure detected device */ -sdp->use_10_for_rw = 1; -sdp->use_10_for_ms = 1; -scsi_adjust_queue_depth(sdp, MSG_SIMPLE_TAG, sdp->host->cmd_per_lun); -return 0; -} - -static const char *idescsi_info (struct Scsi_Host *host) -{ -return "SCSI host adapter emulation for IDE ATAPI devices"; -} - -static int idescsi_ioctl (struct scsi_device *dev, int cmd, void __user *arg) -{ -idescsi_scsi_t *scsi = scsihost_to_idescsi(dev->host); - -if (cmd == SG_SET_TRANSFORM) { -if (arg) -set_bit(IDESCSI_SG_TRANSFORM, &scsi->transform); -else -clear_bit(IDESCSI_SG_TRANSFORM, &scsi->transform); -return 0; -} else if (cmd == SG_GET_TRANSFORM) -return put_user(test_bit(IDESCSI_SG_TRANSFORM, &scsi->transform), (int __user *) arg); -return -EINVAL; -} - -static int idescsi_queue (struct scsi_cmnd *cmd, -void (*done)(struct scsi_cmnd *)) -{ -struct Scsi_Host *host = cmd->device->host; -idescsi_scsi_t *scsi = scsihost_to_idescsi(host); -ide_drive_t *drive = scsi->drive; -struct request *rq = NULL; -struct ide_atapi_pc *pc = NULL; -int write = cmd->sc_data_direction == DMA_TO_DEVICE; - -if (!drive) { -scmd_printk (KERN_ERR, cmd, "drive not present\n"); -goto abort; -} -scsi = drive_to_idescsi(drive); -pc = kmalloc(sizeof(struct ide_atapi_pc), GFP_ATOMIC); -rq = blk_get_request(drive->queue, write, GFP_ATOMIC); -if (rq == NULL || pc == NULL) { -printk (KERN_ERR "ide-scsi: %s: out of memory\n", drive->name); -goto abort; -} - -memset (pc->c, 0, 12); -pc->flags = 0; -if (cmd->sc_data_direction == DMA_TO_DEVICE) -pc->flags |= PC_FLAG_WRITING; -pc->rq = rq; -memcpy (pc->c, cmd->cmnd, cmd->cmd_len); -pc->buf = NULL; -pc->sg = scsi_sglist(cmd); -pc->sg_cnt = scsi_sg_count(cmd); -pc->b_count = 0; -pc->req_xfer = pc->buf_size = scsi_bufflen(cmd); -pc->scsi_cmd = cmd; -pc->done = done; -pc->timeout = jiffies + cmd->request->timeout; - -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) { -printk ("ide-scsi: %s: que %lu, cmd = ", drive->name, cmd->serial_number); -ide_scsi_hex_dump(cmd->cmnd, cmd->cmd_len); -if (memcmp(pc->c, cmd->cmnd, cmd->cmd_len)) { -printk ("ide-scsi: %s: que %lu, tsl = ", drive->name, cmd->serial_number); -ide_scsi_hex_dump(pc->c, 12); -} -} - -rq->special = (char *) pc; -rq->cmd_type = REQ_TYPE_SPECIAL; -spin_unlock_irq(host->host_lock); -rq->ref_count++; -memcpy(rq->cmd, pc->c, 12); -blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL); -spin_lock_irq(host->host_lock); -return 0; -abort: -kfree (pc); -if (rq) -blk_put_request(rq); -cmd->result = DID_ERROR << 16; -done(cmd); -return 0; -} - -static int idescsi_eh_abort (struct scsi_cmnd *cmd) -{ -idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); -ide_drive_t *drive = scsi->drive; -ide_hwif_t *hwif; -ide_hwgroup_t *hwgroup; -intbusy; -int ret = FAILED; - -struct ide_atapi_pc *pc; - -/* In idescsi_eh_abort we try to gently pry our command from the ide subsystem */ - -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) -printk (KERN_WARNING "ide-scsi: abort called for %lu\n", cmd->serial_number); - -if (!drive) { -printk (KERN_WARNING "ide-scsi: Drive not set in idescsi_eh_abort\n"); -WARN_ON(1); -goto no_drive; -} - -hwif = drive->hwif; -hwgroup = hwif->hwgroup; - -/* First give it some more time, how much is "right" is hard to say :-( - FIXME - uses mdelay which causes latency? */ -busy = ide_wait_not_busy(hwif, 100); -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) -printk (KERN_WARNING "ide-scsi: drive did%s become ready\n", busy?" not":""); - -spin_lock_irq(&hwgroup->lock); - -/* If there is no pc running we're done (our interrupt took care of it) */ -pc = drive->pc; -if (pc == NULL) { -ret = SUCCESS; -goto ide_unlock; -} - -/* It's somewhere in flight. Does ide subsystem agree? */ -if (pc->scsi_cmd->serial_number == cmd->serial_number && !busy && - elv_queue_empty(drive->queue) && HWGROUP(drive)->rq != pc->rq) { -/* - * FIXME - not sure this condition can ever occur - */ -printk (KERN_ERR "ide-scsi: cmd aborted!\n"); - -if (blk_sense_request(pc->rq)) -kfree(pc->buf); -/* we need to call blk_put_request twice. */ -blk_put_request(pc->rq); -blk_put_request(pc->rq); -kfree(pc); -drive->pc = NULL; - -ret = SUCCESS; -} - -ide_unlock: -spin_unlock_irq(&hwgroup->lock); -no_drive: -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) -printk (KERN_WARNING "ide-scsi: abort returns %s\n", ret == SUCCESS?"success":"failed"); - -return ret; -} - -static int idescsi_eh_reset (struct scsi_cmnd *cmd) -{ -struct request *req; -idescsi_scsi_t *scsi = scsihost_to_idescsi(cmd->device->host); -ide_drive_t *drive = scsi->drive; -ide_hwgroup_t *hwgroup; -int ready = 0; -int ret = SUCCESS; - -struct ide_atapi_pc *pc; - -/* In idescsi_eh_reset we forcefully remove the command from the ide subsystem and reset the device. */ - -if (test_bit(IDESCSI_LOG_CMD, &scsi->log)) -printk (KERN_WARNING "ide-scsi: reset called for %lu\n", cmd->serial_number); - -if (!drive) { -printk (KERN_WARNING "ide-scsi: Drive not set in idescsi_eh_reset\n"); -WARN_ON(1); -return FAILED; -} - -hwgroup = drive->hwif->hwgroup; - -spin_lock_irq(cmd->device->host->host_lock); -spin_lock(&hwgroup->lock); - -pc = drive->pc; -if (pc) -req = pc->rq; - -if (pc == NULL || req != hwgroup->rq || hwgroup->handler == NULL) { -printk (KERN_WARNING "ide-scsi: No active request in idescsi_eh_reset\n"); -spin_unlock(&hwgroup->lock); -spin_unlock_irq(cmd->device->host->host_lock); -return FAILED; -} - -/* kill current request */ -if (__blk_end_request(req, -EIO, 0)) -BUG(); -if (blk_sense_request(req)) -kfree(pc->buf); -kfree(pc); -drive->pc = NULL; -blk_put_request(req); - -/* now nuke the drive queue */ -while ((req = elv_next_request(drive->queue))) { -if (__blk_end_request(req, -EIO, 0)) -BUG(); -} - -hwgroup->rq = NULL; -hwgroup->handler = NULL; -hwgroup->busy = 1; /* will set this to zero when ide reset finished */ -spin_unlock(&hwgroup->lock); - -ide_do_reset(drive); - -/* ide_do_reset starts a polling handler which restarts itself every 50ms until the reset finishes */ - -do { -spin_unlock_irq(cmd->device->host->host_lock); -msleep(50); -spin_lock_irq(cmd->device->host->host_lock); -} while ( HWGROUP(drive)->handler ); - -ready = drive_is_ready(drive); -HWGROUP(drive)->busy--; -if (!ready) { -printk (KERN_ERR "ide-scsi: reset failed!\n"); -ret = FAILED; -} - -spin_unlock_irq(cmd->device->host->host_lock); -return ret; -} - -static int idescsi_bios(struct scsi_device *sdev, struct block_device *bdev, -sector_t capacity, int *parm) -{ -idescsi_scsi_t *idescsi = scsihost_to_idescsi(sdev->host); -ide_drive_t *drive = idescsi->drive; - -if (drive->bios_cyl && drive->bios_head && drive->bios_sect) { -parm[0] = drive->bios_head; -parm[1] = drive->bios_sect; -parm[2] = drive->bios_cyl; -} -return 0; -} - -static struct scsi_host_template idescsi_template = { -.module= THIS_MODULE, -.name= "idescsi", -.info= idescsi_info, -.slave_configure = idescsi_slave_configure, -.ioctl= idescsi_ioctl, -.queuecommand= idescsi_queue, -.eh_abort_handler= idescsi_eh_abort, -.eh_host_reset_handler = idescsi_eh_reset, -.bios_param= idescsi_bios, -.can_queue= 40, -.this_id= -1, -.sg_tablesize= 256, -.cmd_per_lun= 5, -.max_sectors= 128, -.use_clustering= DISABLE_CLUSTERING, -.emulated= 1, -.proc_name= "ide-scsi", -}; - -static int ide_scsi_probe(ide_drive_t *drive) -{ -idescsi_scsi_t *idescsi; -struct Scsi_Host *host; -struct gendisk *g; -static int warned; -int err = -ENOMEM; -u16 last_lun; - -if (!warned && drive->media == ide_cdrom) { -printk(KERN_WARNING "ide-scsi is deprecated for cd burning! Use ide-cd and give dev=/dev/hdX as device\n"); -warned = 1; -} - -if (idescsi_nocd && drive->media == ide_cdrom) -return -ENODEV; - -if (!strstr("ide-scsi", drive->driver_req) || - drive->media == ide_disk || - !(host = scsi_host_alloc(&idescsi_template,sizeof(idescsi_scsi_t)))) -return -ENODEV; - -drive->dev_flags |= IDE_DFLAG_SCSI; - -g = alloc_disk(1 << PARTN_BITS); -if (!g) -goto out_host_put; - -ide_init_disk(g, drive); - -host->max_id = 1; - -last_lun = drive->id[ATA_ID_LAST_LUN]; -if (last_lun) -debug_log("%s: last_lun=%u\n", drive->name, last_lun); - -if ((last_lun & 7) != 7) -host->max_lun = (last_lun & 7) + 1; -else -host->max_lun = 1; - -drive->driver_data = host; -idescsi = scsihost_to_idescsi(host); -idescsi->drive = drive; -idescsi->driver = &idescsi_driver; -idescsi->host = host; -idescsi->disk = g; -g->private_data = &idescsi->driver; -err = 0; -idescsi_setup(drive, idescsi); -g->fops = &idescsi_ops; -ide_register_region(g); -err = scsi_add_host(host, &drive->gendev); -if (!err) { -scsi_scan_host(host); -return 0; -} -/* fall through on error */ -ide_unregister_region(g); -ide_proc_unregister_driver(drive, &idescsi_driver); - -put_disk(g); -out_host_put: -drive->dev_flags &= ~IDE_DFLAG_SCSI; -scsi_host_put(host); -return err; -} - -static int __init init_idescsi_module(void) -{ -return driver_register(&idescsi_driver.gen_driver); -} - -static void __exit exit_idescsi_module(void) -{ -driver_unregister(&idescsi_driver.gen_driver); -} - -module_param(idescsi_nocd, int, 0600); -MODULE_PARM_DESC(idescsi_nocd, "Disable handling of CD-ROMs so they may be driven by ide-cd"); -module_init(init_idescsi_module); -module_exit(exit_idescsi_module); -MODULE_LICENSE("GPL");

[PATCH] [Target_Core_Mod/PSCSI]: Use struct request to structscsi_device->request_queue

Nicholas A. Bellinger — 2008-12-03T00:49:08

From: Nicholas Bellinger linux-iscsi.org> Date: Tue, 2 Dec 2008 16:30:51 -0800 Subject: [PATCH] [Target_Core_Mod/PSCSI]: Use struct request to struct scsi_device->request_queue This patch begins to remove the usage of scsi_execute_async() from the PSCSI subsystem plugin for v3.0 generic target core. It uses blk_get_request() to allocate struct request in pscsi_blk_get_request() and used by all CDB types and both memory backing types. struct request is then released with __blk_put_request() in the struct request->end_io() context in pscsi_req_done(). Also, this patch adds a temporary EXPORT_SYMBOL_GPL() for scsi/drivers/scsi_lib.c:scsi_req_map_sg() (which will also be going away at some point). At that point, the upstream struct scatterlist and/or struct page -> struct request mapping for usage with struct scsi_device->request_queue will be dropped into place in drivers/lio-core/target_core_pscsi.c:pscsi_map_task_SG() Tested on v2.6.28-rc7 32-bit x86 with virtual VMware TYPE_DISK on virtual MPT-Fusion Signed-off-by: Nicholas A. Bellinger linux-iscsi.org> --- drivers/lio-core/target_core_pscsi.c | 206 +++++++++++++++++++++++++--------- drivers/lio-core/target_core_pscsi.h | 5 +- drivers/scsi/scsi_lib.c | 6 +- 3 files changed, 161 insertions(+), 56 deletions(-) diff --git a/drivers/lio-core/target_core_pscsi.c b/drivers/lio-core/target_core_pscsi.c index ed9f588..bb46e1c 100644 --- a/drivers/lio-core/target_core_pscsi.c +++ b/drivers/lio-core/target_core_pscsi.c < at >< at > -37,6 +37,7 < at >< at > #include #include #include +#include #include #include < at >< at > -44,6 +45,7 < at >< at > #include #include #include +#include #include #include < at >< at > -763,11 +765,11 < at >< at > extern void *pscsi_allocate_request ( se_device_t *dev) { pscsi_plugin_task_t *pt; -if (!(pt = kmalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { -TRACE_ERROR("Unable to allocate pscsi_plugin_task_t\n"); + +if (!(pt = kzalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { +printk(KERN_ERR "Unable to allocate pscsi_plugin_task_t\n"); return(NULL); } -memset(pt, 0, sizeof(pscsi_plugin_task_t)); return(pt); } < at >< at > -788,7 +790,44 < at >< at > extern void pscsi_get_evpd_sn (unsigned char *buf, u32 size, se_device_t *dev) return; } -/*pscsi_do_task(): (Part of se_subsystem_api_t template) +static int pscsi_blk_get_request (se_task_t *task) +{ +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; + +pt->pscsi_req = blk_get_request(pdv->pdv_sd->request_queue, +(pt->pscsi_direction == DMA_TO_DEVICE), GFP_KERNEL); +if (!(pt->pscsi_req) || IS_ERR(pt->pscsi_req)) { +printk(KERN_ERR "PSCSI: blk_get_request() failed: %ld\n", +IS_ERR(pt->pscsi_req)); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +/* + * Defined as "scsi command" in include/linux/blkdev.h. + */ +pt->pscsi_req->cmd_type = REQ_TYPE_BLOCK_PC; +/* + * Setup the done function pointer for struct request, + * also set the end_io_data pointer.to se_task_t. + */ +pt->pscsi_req->end_io = pscsi_req_done; +pt->pscsi_req->end_io_data = (void *)task; +/* + * Load the referenced se_task_t's SCSI CDB into + * include/linux/blkdev.h:struct request->cmd + */ +pt->pscsi_req->cmd_len = COMMAND_SIZE(pt->pscsi_cdb[0]); +memcpy(pt->pscsi_req->cmd, pt->pscsi_cdb, pt->pscsi_req->cmd_len); +/* + * Setup pointer for outgoing sense data. + */ +pt->pscsi_req->sense = (void *)&pt->pscsi_sense[0]; +pt->pscsi_req->sense_len = 0; + +return(0); +} + +/* pscsi_do_task(): (Part of se_subsystem_api_t template) * * */ < at >< at > -796,17 +835,32 < at >< at > extern int pscsi_do_task (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; -int ret; - -if ((ret = scsi_execute_async((struct scsi_device *)pdv->pdv_sd, - pt->pscsi_cdb, COMMAND_SIZE(pt->pscsi_cdb[0]), pt->pscsi_direction, - pt->pscsi_buf, task->task_size, task->task_sg_num, - (task->se_obj_api->get_device_type(task->se_obj_ptr) == 0) ? - PS_TIMEOUT_DISK : PS_TIMEOUT_OTHER, PS_RETRY, - (void *)task, pscsi_req_done, GFP_KERNEL)) != 0) { -TRACE_ERROR("PSCSI Execute(): returned: %d\n", ret); -return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); -} +struct gendisk *gd = NULL; +/* + * Grab pointer to struct gendisk for TYPE_DISK and TYPE_ROM + * cases (eg: cases where struct scsi_device has a backing + * struct block_device. Also set the struct request->timeout + * value based on peripheral device type (from SCSI). + */ +if (pdv->pdv_sd->type == TYPE_DISK) { +struct scsi_disk *sdisk = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = sdisk->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_DISK; +} else if (pdv->pdv_sd->type == TYPE_ROM) { +struct scsi_cd *scd = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = scd->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; +} else +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; + +pt->pscsi_req->retries = PS_RETRY; +/* + * Queue the struct request into the struct scsi_device->request_queue. + */ +blk_execute_rq_nowait(pdv->pdv_sd->request_queue, gd, + pt->pscsi_req, 1, pscsi_req_done); return(PYX_TRANSPORT_SENT_TO_TRANSPORT); } < at >< at > -817,7 +871,8 < at >< at > extern int pscsi_do_task (se_task_t *task) */ extern void pscsi_free_task (se_task_t *task) { -kfree(task->transport_req); +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +kfree(pt); return; } < at >< at > -1099,31 +1154,64 < at >< at > extern void __pscsi_get_dev_info (pscsi_dev_virt_t *pdv, char *b, int *bl) return; } -/*pscsi_map_task_SG(): +extern int scsi_req_map_sg(struct request *, struct scatterlist *, int, unsigned , gfp_t ); + +/* pscsi_map_task_SG(): * * */ -extern void pscsi_map_task_SG (se_task_t *task) +extern int pscsi_map_task_SG (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +int ret = 0; + pt->pscsi_buf = (void *)task->task_buf; -return; +if (!task->task_size) +return(0); +#if 0 +if ((ret = blk_rq_map_sg(pdv->pdv_sd->request_queue, +pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_sg() returned %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#else +if ((ret = scsi_req_map_sg(pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf, +task->task_sg_num, task->task_size, +GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: scsi_req_map_sg() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#endif +return(0); } /*pscsi_map_task_non_SG(): * * */ -extern void pscsi_map_task_non_SG (se_task_t *task) +extern int pscsi_map_task_non_SG (se_task_t *task) { iscsi_cmd_t *cmd = task->iscsi_cmd; +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; unsigned char *buf = (unsigned char *) T_TASK(cmd)->t_task_buf; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; +int ret = 0; -pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_buf = (void *)buf; -return; +if (!task->task_size) +return(0); + +if ((ret = blk_rq_map_kern(pdv->pdv_sd->request_queue, +pt->pscsi_req, pt->pscsi_buf, +task->task_size, GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_kern() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +return(0); } /*pscsi_CDB_inquiry(): < at >< at > -1135,9 +1223,10 < at >< at > extern int pscsi_CDB_inquiry (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); +if (pscsi_blk_get_request(task) < 0) +return(-1); -return(0); +return(pscsi_map_task_non_SG(task)); } extern int pscsi_CDB_none (se_task_t *task, u32 size) < at >< at > -1146,7 +1235,7 < at >< at > extern int pscsi_CDB_none (se_task_t *task, u32 size) pt->pscsi_direction = DMA_NONE; -return(0); +return(pscsi_blk_get_request(task)); } /*pscsi_CDB_read_non_SG(): < at >< at > -1158,9 +1247,11 < at >< at > extern int pscsi_CDB_read_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_read_SG(): < at >< at > -1172,7 +1263,12 < at >< at > extern int pscsi_CDB_read_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1186,9 +1282,11 < at >< at > extern int pscsi_CDB_write_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_write_SG(): < at >< at > -1200,7 +1298,12 < at >< at > extern int pscsi_CDB_write_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1386,22 +1489,25 < at >< at > extern void pscsi_shutdown_hba (se_hba_t *hba) * * */ -//#warning FIXME: We can do some custom handling of HBA fuckups here. -extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb, int result) +static inline void pscsi_process_SAM_status ( +se_task_t *task, +pscsi_plugin_task_t *pt) { -if ((task->task_scsi_status = status_byte(result))) { +if ((task->task_scsi_status = status_byte(pt->pscsi_result))) { task->task_scsi_status <<= 1; -PYXPRINT("Parallel SCSI Status Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Status Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); } -switch (host_byte(result)) { +switch (host_byte(pt->pscsi_result)) { case DID_OK: transport_complete_task(task, (!task->task_scsi_status)); break; default: -PYXPRINT("Parallel SCSI Host Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Host Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); task->task_scsi_status = SAM_STAT_CHECK_CONDITION; task->task_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; task->iscsi_cmd->transport_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; < at >< at > -1412,21 +1518,17 < at >< at > extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb return; } -extern void pscsi_req_done (void *data, char *sense, int result, int data_len) +extern void pscsi_req_done (struct request *req, int uptodate) { -se_task_t *task = (se_task_t *)data; +se_task_t *task = (se_task_t *)req->end_io_data; pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *)task->transport_req; -#if 0 -printk("pscsi_req_done(): result: %08x, sense: %p data_len: %d\n", -result, sense, data_len); -#endif -pt->pscsi_result = result; -pt->pscsi_data_len = data_len; - -if (result != 0) -memcpy(pt->pscsi_sense, sense, SCSI_SENSE_BUFFERSIZE); + +pt->pscsi_result = req->errors; +pt->pscsi_resid = req->data_len; -pscsi_process_SAM_status(task, &pt->pscsi_cdb[0], result); +pscsi_process_SAM_status(task, pt); +__blk_put_request(req->q, req); +pt->pscsi_req = NULL; + return; } - diff --git a/drivers/lio-core/target_core_pscsi.h b/drivers/lio-core/target_core_pscsi.h index 980587d..090f0d2 100644 --- a/drivers/lio-core/target_core_pscsi.h +++ b/drivers/lio-core/target_core_pscsi.h < at >< at > -90,7 +90,7 < at >< at > extern struct scatterlist *pscsi_get_SG (se_task_t *); extern u32 pscsi_get_SG_count (se_task_t *); extern int pscsi_set_non_SG_buf (unsigned char *, se_task_t *); extern void pscsi_shutdown_hba (struct se_hba_s *); -extern void pscsi_req_done (void *, char *, int, int); +extern void pscsi_req_done (struct request *, int); #endif #include < at >< at > -104,8 +104,9 < at >< at > typedef struct pscsi_plugin_task_s { unsigned char pscsi_sense[SCSI_SENSE_BUFFERSIZE]; intpscsi_direction; intpscsi_result; -u32pscsi_data_len; +u32pscsi_resid; void*pscsi_buf; +struct request *pscsi_req; } pscsi_plugin_task_t; #define PDF_HAS_CHANNEL_ID0x01 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f5d3b96..9e03a02 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c < at >< at > -303,8 +303,8 < at >< at > static void scsi_bi_endio(struct bio *bio, int error) * request can be sent to the block layer. We do not trust the scatterlist * sent to use, as some ULDs use that struct to only organize the pages. */ -static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, - int nsegs, unsigned bufflen, gfp_t gfp) +int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, + int nsegs, unsigned bufflen, gfp_t gfp) { struct request_queue *q = rq->q; int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT; < at >< at > -379,6 +379,8 < at >< at > free_bios: return err; } +EXPORT_SYMBOL_GPL(scsi_req_map_sg); + /** * scsi_execute_async - insert request * < at >sdev:scsi device

[GIT PATCH] SCSI fixes for 2.6.28-rc7

James Bottomley — 2008-12-02T16:58:56

This is quite a hefty update for so late. It includes a slew of block timer related fixes (we moved to using block timers when the 2.6.28 merge window opened). The bad news is that I still don't think we have all the block timer related bugs caught and fixed. There's also a slew of zfcp (s390 driver) fixes and a few miscellaneous others (including another regression bugzilla fix, the hang in starved list processing). The patch is available here: master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git The short changelog is: Christof Schmitt (1): zfcp: Fix opening of wka ports James Bottomley (5): stex: switch to block timeout make scsi_eh_try_stu use block timeout megaraid_sas: switch to block timeout ibmvscsi: switch to block timeout aacraid: switch to block timeout James Smart (1): fc_transport: fix old bug on bitflag definitions Martin Petermann (1): zfcp: fix remote port status check Mike Christie (1): Fix hang in starved list processing Swen Schillig (5): zfcp: prevent double decrement on host_busy while being busy zfcp: fix deadlock between wq triggered port scan and ERP zfcp: eliminate race between validation and locking zfcp: verify for correct rport state before scanning for SCSI devs zfcp: returning an ERR_PTR where a NULL value is expected And the diffstat: drivers/s390/scsi/zfcp_erp.c | 7 +++++-- drivers/s390/scsi/zfcp_fc.c | 7 +++---- drivers/s390/scsi/zfcp_fsf.c | 20 ++++++++++++++------ drivers/s390/scsi/zfcp_scsi.c | 2 +- drivers/scsi/aacraid/linit.c | 4 ++-- drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- drivers/scsi/megaraid/megaraid_sas.c | 3 ++- drivers/scsi/scsi_error.c | 3 +-- drivers/scsi/scsi_lib.c | 23 +++++++++++------------ drivers/scsi/stex.c | 2 +- include/scsi/scsi_transport_fc.h | 2 +- 11 files changed, 42 insertions(+), 33 deletions(-) The entire diff is below. James --- diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 35364f6..c557ba3 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c < at >< at > -720,7 +720,6 < at >< at > static int zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *act, goto failed_openfcp; atomic_set_mask(ZFCP_STATUS_COMMON_OPEN, &act->adapter->status); -schedule_work(&act->adapter->scan_work); return ZFCP_ERP_SUCCEEDED; < at >< at > -1186,7 +1185,9 < at >< at > static void zfcp_erp_scsi_scan(struct work_struct *work) container_of(work, struct zfcp_erp_add_work, work); struct zfcp_unit *unit = p->unit; struct fc_rport *rport = unit->port->rport; -scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, + +if (rport && rport->port_state == FC_PORTSTATE_ONLINE) +scsi_scan_target(&rport->dev, 0, rport->scsi_target_id, scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0); atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status); zfcp_unit_put(unit); < at >< at > -1282,6 +1283,8 < at >< at > static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, int result) case ZFCP_ERP_ACTION_REOPEN_ADAPTER: if (result != ZFCP_ERP_SUCCEEDED) zfcp_erp_rports_del(adapter); +else +schedule_work(&adapter->scan_work); zfcp_adapter_put(adapter); break; } diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 1a7c80a..8aab309 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c < at >< at > -50,7 +50,8 < at >< at > static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port) if (mutex_lock_interruptible(&wka_port->mutex)) return -ERESTARTSYS; -if (wka_port->status != ZFCP_WKA_PORT_ONLINE) { +if (wka_port->status == ZFCP_WKA_PORT_OFFLINE || + wka_port->status == ZFCP_WKA_PORT_CLOSING) { wka_port->status = ZFCP_WKA_PORT_OPENING; if (zfcp_fsf_open_wka_port(wka_port)) wka_port->status = ZFCP_WKA_PORT_OFFLINE; < at >< at > -125,8 +126,7 < at >< at > static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range, read_lock_irqsave(&zfcp_data.config_lock, flags); list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) { -/* FIXME: ZFCP_STATUS_PORT_DID_DID check is racy */ -if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_DID_DID)) +if (!(atomic_read(&port->status) & ZFCP_STATUS_PORT_PHYS_OPEN)) /* Try to connect to unused ports anyway. */ zfcp_erp_port_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED, < at >< at > -610,7 +610,6 < at >< at > int zfcp_scan_ports(struct zfcp_adapter *adapter) int ret, i; struct zfcp_gpn_ft *gpn_ft; -zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */ if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT) return 0; diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index d024442..dc03676 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c < at >< at > -930,8 +930,10 < at >< at > struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, goto out; req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND, req_flags, adapter->pool.fsf_req_abort); -if (IS_ERR(req)) +if (IS_ERR(req)) { +req = NULL; goto out; +} if (unlikely(!(atomic_read(&unit->status) & ZFCP_STATUS_COMMON_UNBLOCKED))) < at >< at > -1584,6 +1586,7 < at >< at > static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) wka_port->status = ZFCP_WKA_PORT_OFFLINE; break; case FSF_PORT_ALREADY_OPEN: +break; case FSF_GOOD: wka_port->handle = header->port_handle; wka_port->status = ZFCP_WKA_PORT_ONLINE; < at >< at > -2113,18 +2116,21 < at >< at > static inline void zfcp_fsf_trace_latency(struct zfcp_fsf_req *fsf_req) static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req) { -struct scsi_cmnd *scpnt = req->data; +struct scsi_cmnd *scpnt; struct fcp_rsp_iu *fcp_rsp_iu = (struct fcp_rsp_iu *) &(req->qtcb->bottom.io.fcp_rsp); u32 sns_len; char *fcp_rsp_info = (unsigned char *) &fcp_rsp_iu[1]; unsigned long flags; -if (unlikely(!scpnt)) -return; - read_lock_irqsave(&req->adapter->abort_lock, flags); +scpnt = req->data; +if (unlikely(!scpnt)) { +read_unlock_irqrestore(&req->adapter->abort_lock, flags); +return; +} + if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) { set_host_byte(scpnt, DID_SOFT_ERROR); set_driver_byte(scpnt, SUGGEST_RETRY); < at >< at > -2442,8 +2448,10 < at >< at > struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, goto out; req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags, adapter->pool.fsf_req_scsi); -if (IS_ERR(req)) +if (IS_ERR(req)) { +req = NULL; goto out; +} req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT; req->data = unit; diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index e46fd3e..468c880 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c < at >< at > -88,7 +88,7 < at >< at > static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt, ret = zfcp_fsf_send_fcp_command_task(adapter, unit, scpnt, 0, ZFCP_REQ_AUTO_CLEANUP); if (unlikely(ret == -EBUSY)) -zfcp_scsi_command_fail(scpnt, DID_NO_CONNECT); +return SCSI_MLQUEUE_DEVICE_BUSY; else if (unlikely(ret < 0)) return SCSI_MLQUEUE_HOST_BUSY; diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9aa301c..162cd92 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c < at >< at > -427,8 +427,8 < at >< at > static int aac_slave_configure(struct scsi_device *sdev) * Firmware has an individual device recovery time typically * of 35 seconds, give us a margin. */ -if (sdev->timeout < (45 * HZ)) -sdev->timeout = 45 * HZ; +if (sdev->request_queue->rq_timeout < (45 * HZ)) +blk_queue_rq_timeout(sdev->request_queue, 45*HZ); for (cid = 0; cid < aac->maximum_num_containers; ++cid) if (aac->fsa_dev[cid].valid) ++num_lsu; diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 87e09f3..6cad175 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c < at >< at > -1442,7 +1442,7 < at >< at > static int ibmvscsi_slave_configure(struct scsi_device *sdev) spin_lock_irqsave(shost->host_lock, lock_flags); if (sdev->type == TYPE_DISK) { sdev->allow_restart = 1; -sdev->timeout = 60 * HZ; +blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); } scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); spin_unlock_irqrestore(shost->host_lock, lock_flags); diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index a454f94..17ce7ab 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c < at >< at > -1016,7 +1016,8 < at >< at > static int megasas_slave_configure(struct scsi_device *sdev) * The RAID firmware may require extended timeouts. */ if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS) -sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ; +blk_queue_rq_timeout(sdev->request_queue, + MEGASAS_DEFAULT_CMD_TIMEOUT * HZ); return 0; } diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 3863617..edfaf24 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c < at >< at > -932,8 +932,7 < at >< at > static int scsi_eh_try_stu(struct scsi_cmnd *scmd) int i, rtn = NEEDS_RETRY; for (i = 0; rtn == NEEDS_RETRY && i < 2; i++) -rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, -scmd->device->timeout, 0); +rtn = scsi_send_eh_cmnd(scmd, stu_command, 6, scmd->device->request_queue->rq_timeout, 0); if (rtn == SUCCESS) return 0; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f5d3b96..fa45a1a 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c < at >< at > -567,15 +567,18 < at >< at > static inline int scsi_host_is_busy(struct Scsi_Host *shost) */ static void scsi_run_queue(struct request_queue *q) { -struct scsi_device *starved_head = NULL, *sdev = q->queuedata; +struct scsi_device *sdev = q->queuedata; struct Scsi_Host *shost = sdev->host; +LIST_HEAD(starved_list); unsigned long flags; if (scsi_target(sdev)->single_lun) scsi_single_lun_run(sdev); spin_lock_irqsave(shost->host_lock, flags); -while (!list_empty(&shost->starved_list) && !scsi_host_is_busy(shost)) { +list_splice_init(&shost->starved_list, &starved_list); + +while (!list_empty(&starved_list)) { int flagset; /* < at >< at > -588,24 +591,18 < at >< at > static void scsi_run_queue(struct request_queue *q) * scsi_request_fn must get the host_lock before checking * or modifying starved_list or starved_entry. */ -sdev = list_entry(shost->starved_list.next, - struct scsi_device, starved_entry); -/* - * The *queue_ready functions can add a device back onto the - * starved list's tail, so we must check for a infinite loop. - */ -if (sdev == starved_head) +if (scsi_host_is_busy(shost)) break; -if (!starved_head) -starved_head = sdev; +sdev = list_entry(starved_list.next, + struct scsi_device, starved_entry); +list_del_init(&sdev->starved_entry); if (scsi_target_is_busy(scsi_target(sdev))) { list_move_tail(&sdev->starved_entry, &shost->starved_list); continue; } -list_del_init(&sdev->starved_entry); spin_unlock(shost->host_lock); spin_lock(sdev->request_queue->queue_lock); < at >< at > -621,6 +618,8 < at >< at > static void scsi_run_queue(struct request_queue *q) spin_lock(shost->host_lock); } +/* put any unprocessed entries back */ +list_splice(&starved_list, &shost->starved_list); spin_unlock_irqrestore(shost->host_lock, flags); blk_run_queue(q); diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 3790906..2fa830c 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c < at >< at > -477,7 +477,7 < at >< at > stex_slave_config(struct scsi_device *sdev) { sdev->use_10_for_rw = 1; sdev->use_10_for_ms = 1; -sdev->timeout = 60 * HZ; +blk_queue_rq_timeout(sdev->request_queue, 60 * HZ); sdev->tagged_supported = 1; return 0; diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h index 49d8913..6e04e6f 100644 --- a/include/scsi/scsi_transport_fc.h +++ b/include/scsi/scsi_transport_fc.h < at >< at > -357,7 +357,7 < at >< at > struct fc_rport {/* aka fc_starget_attrs */ /* bit field values for struct fc_rport "flags" field: */ #define FC_RPORT_DEVLOSS_PENDING0x01 #define FC_RPORT_SCAN_PENDING0x02 -#define FC_RPORT_FAST_FAIL_TIMEDOUT0x03 +#define FC_RPORT_FAST_FAIL_TIMEDOUT0x04 #definedev_to_rport(d)\ container_of(d, struct fc_rport, dev) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

iscsi update for 2.6.29

2008-12-02T06:32:03

This patchset is for 2.6.29. This should be the final patches to prepare the iscsi layer for cxgb3i, which looks like it has gone through the netdev review and will be sent here next shortly. This patchset was made over scsi-misc, and the fix here. http://marc.info/?l=linux-scsi&m=122815519326207&w=2 (the fix in that email does not conflict with this patchset and can be applied over or before these patches). cxgb3i adds a new offload model. Where qla4xxx offloaded pretty much everything, and bnx2i offloaded the iscsi sequence processing (give it the iscsi scsi command pdu and the offload engine will handle everything between), cxgb3i offloads operations like digest, padding, and data transfers. It relies on the iscsi layer for the sequence state machine, so this patchset is basically just breaking up iscsi_tcp into a lib layer so cxgb3i can share the code. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Changes to Linux/SCSI target mode infrastructure for v2.6.28

Nicholas A. Bellinger — 2008-12-02T01:52:07

Greetings Tomo-san and Co, With the ongoing work in Linux/SCSI for v2.6.28 to map target mode struct scatterlist memory directly down to struct scsi_cmnd without the need for a intermediate struct bio as with the existing scsi_execute_async(), I have started the porting process for the Linux/SCSI subsystem plugin in generic target core v3.0 (lio-core-2.6.git) on v2.6.28-rc6. So far, using struct request for ICF_SCSI_CONTROL_NONSG_IO_CDB is up using blk_rq_map_kern(), as well as ICF_SCSI_NON_DATA_CDB ops using struct request. In order to get the first READ_10s of type ICF_SCSI_DATA_SG_IO_CDB to work, I had to add a temporary EXPORT_SYMBOL_GPL() for drivers/scsi/scsi_lib.c:scsi_req_map_sg() in lio-core-2.6.git for v2.6.28-rc6 in order to get TYPE_DISK up using an software emulated MPT-Fusion HBA driver with struct request. I have been looking at drivers/scsi/scsi_tgt_lib.c() (which currently uses struct request), and I figure we need something similar for the generic target infrastructure, although __scsi_get_command() and __scsi_put_command() are currently used in that code. Below is what my patch looks like so far, I will probably just end up commiting an temporary ifdef to keep scsi_execute_async() until the proper pieces are in place and the other issues are resolved below. for struct scatterlist in drivers/lio-core/target_core_pscsi.c:pscsi_map_task_SG() get rid of scsi_req_map_sg() usage all together. So far during my initial testing, I am running into a two different exceptions. One NULL pointer deference OOPS after half dozen Open/iSCSI login/logouts in block/elevator.c:elv_dequeue_request(). Here is the trace from SCSI softirq context: http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-0.png http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-1.png The other one is a BUG_ON in blk/blk-timeout.c:177 in blk_add_timeout() that happens after a few hundred MB of READ_10 traffic, which also appears to pass through elv_dequeue_request() at some point: http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-2.png http://linux-iscsi.org/builds/user/nab/2.6.28-rc6-oops-4.png Tomo, Boaz, Jens, any comments..? --nab diff --git a/drivers/lio-core/target_core_pscsi.c b/drivers/lio-core/target_core_pscsi.c index ed9f588..5161483 100644 --- a/drivers/lio-core/target_core_pscsi.c +++ b/drivers/lio-core/target_core_pscsi.c < at >< at > -37,6 +37,7 < at >< at > #include #include #include +#include #include #include < at >< at > -44,6 +45,7 < at >< at > #include #include #include +#include #include #include < at >< at > -763,11 +765,11 < at >< at > extern void *pscsi_allocate_request ( se_device_t *dev) { pscsi_plugin_task_t *pt; -if (!(pt = kmalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { -TRACE_ERROR("Unable to allocate pscsi_plugin_task_t\n"); + +if (!(pt = kzalloc(sizeof(pscsi_plugin_task_t), GFP_KERNEL))) { +printk(KERN_ERR "Unable to allocate pscsi_plugin_task_t\n"); return(NULL); } -memset(pt, 0, sizeof(pscsi_plugin_task_t)); return(pt); } < at >< at > -788,7 +790,44 < at >< at > extern void pscsi_get_evpd_sn (unsigned char *buf, u32 size, se_device_t *dev) return; } -/*pscsi_do_task(): (Part of se_subsystem_api_t template) +static int pscsi_blk_get_request (se_task_t *task) +{ +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; + +pt->pscsi_req = blk_get_request(pdv->pdv_sd->request_queue, +(pt->pscsi_direction == DMA_TO_DEVICE), GFP_KERNEL); +if (!(pt->pscsi_req) || IS_ERR(pt->pscsi_req)) { +printk(KERN_ERR "PSCSI: blk_get_request() failed: %ld\n", +IS_ERR(pt->pscsi_req)); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +/* + * Defined as "scsi command" in include/linux/blkdev.h. + */ +pt->pscsi_req->cmd_type = REQ_TYPE_BLOCK_PC; +/* + * Setup the done function pointer for struct request, + * also set the end_io_data pointer.to se_task_t. + */ +pt->pscsi_req->end_io = pscsi_req_done; +pt->pscsi_req->end_io_data = (void *)task; +/* + * Load the referenced se_task_t's SCSI CDB into + * include/linux/blkdev.h:struct request->cmd + */ +pt->pscsi_req->cmd_len = COMMAND_SIZE(pt->pscsi_cdb[0]); +memcpy(pt->pscsi_req->cmd, pt->pscsi_cdb, pt->pscsi_req->cmd_len); +/* + * Setup pointer for outgoing sense data. + */ +pt->pscsi_req->sense = (void *)&pt->pscsi_sense[0]; +pt->pscsi_req->sense_len = 0; + +return(0); +} + +/* pscsi_do_task(): (Part of se_subsystem_api_t template) * * */ < at >< at > -796,17 +835,32 < at >< at > extern int pscsi_do_task (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; -int ret; - -if ((ret = scsi_execute_async((struct scsi_device *)pdv->pdv_sd, - pt->pscsi_cdb, COMMAND_SIZE(pt->pscsi_cdb[0]), pt->pscsi_direction, - pt->pscsi_buf, task->task_size, task->task_sg_num, - (task->se_obj_api->get_device_type(task->se_obj_ptr) == 0) ? - PS_TIMEOUT_DISK : PS_TIMEOUT_OTHER, PS_RETRY, - (void *)task, pscsi_req_done, GFP_KERNEL)) != 0) { -TRACE_ERROR("PSCSI Execute(): returned: %d\n", ret); -return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); -} +struct gendisk *gd = NULL; +/* + * Grab pointer to struct gendisk for TYPE_DISK and TYPE_ROM + * cases (eg: cases where struct scsi_device has a backing + * struct block_device. Also set the struct request->timeout + * value based on peripheral device type (from SCSI). + */ +if (pdv->pdv_sd->type == TYPE_DISK) { +struct scsi_disk *sdisk = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = sdisk->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_DISK; +} else if (pdv->pdv_sd->type == TYPE_ROM) { +struct scsi_cd *scd = dev_get_drvdata( +&pdv->pdv_sd->sdev_gendev); +gd = scd->disk; +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; +} else +pt->pscsi_req->timeout = PS_TIMEOUT_OTHER; + +pt->pscsi_req->retries = PS_RETRY; +/* + * Queue the struct request into the struct scsi_device->request_queue. + */ +blk_execute_rq_nowait(pdv->pdv_sd->request_queue, gd, + pt->pscsi_req, 1, pscsi_req_done); return(PYX_TRANSPORT_SENT_TO_TRANSPORT); } < at >< at > -817,7 +871,14 < at >< at > extern int pscsi_do_task (se_task_t *task) */ extern void pscsi_free_task (se_task_t *task) { -kfree(task->transport_req); +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; + +if (pt->pscsi_req) { +blk_put_request(pt->pscsi_req); +pt->pscsi_req = NULL; +} + +kfree(pt); return; } < at >< at > -1099,31 +1160,65 < at >< at > extern void __pscsi_get_dev_info (pscsi_dev_virt_t *pdv, char *b, int *bl) return; } -/*pscsi_map_task_SG(): +extern int scsi_req_map_sg(struct request *, struct scatterlist *, int, unsigned , gfp_t ); + +/* pscsi_map_task_SG(): * * */ -extern void pscsi_map_task_SG (se_task_t *task) +extern int pscsi_map_task_SG (se_task_t *task) { pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +int ret = 0; + pt->pscsi_buf = (void *)task->task_buf; -return; +if (!task->task_size) +return(0); +#if 0 +if ((ret = blk_rq_map_sg(pdv->pdv_sd->request_queue, +pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_sg() returned %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#else +if ((ret = scsi_req_map_sg(pt->pscsi_req, +(struct scatterlist *)pt->pscsi_buf, +task->task_sg_num, task->task_size, +GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: scsi_req_map_sg() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} +#endif +return(0); } /*pscsi_map_task_non_SG(): * * */ -extern void pscsi_map_task_non_SG (se_task_t *task) +extern int pscsi_map_task_non_SG (se_task_t *task) { iscsi_cmd_t *cmd = task->iscsi_cmd; +pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; +pscsi_dev_virt_t *pdv = (pscsi_dev_virt_t *) task->iscsi_dev->dev_ptr; unsigned char *buf = (unsigned char *) T_TASK(cmd)->t_task_buf; +int ret = 0; -pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_buf = (void *)buf; -return; +if (!task->task_size) +return(0); + +if ((ret = blk_rq_map_kern(pdv->pdv_sd->request_queue, +pt->pscsi_req, pt->pscsi_buf, +task->task_size, GFP_KERNEL)) < 0) { +printk(KERN_ERR "PSCSI: blk_rq_map_kern() failed: %d\n", ret); +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); +} + +return(0); } /*pscsi_CDB_inquiry(): < at >< at > -1135,9 +1230,11 < at >< at > extern int pscsi_CDB_inquiry (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(-1); -return(0); +return(pscsi_map_task_non_SG(task)); } extern int pscsi_CDB_none (se_task_t *task, u32 size) < at >< at > -1146,7 +1243,7 < at >< at > extern int pscsi_CDB_none (se_task_t *task, u32 size) pt->pscsi_direction = DMA_NONE; -return(0); +return(pscsi_blk_get_request(task)); } /*pscsi_CDB_read_non_SG(): < at >< at > -1158,9 +1255,11 < at >< at > extern int pscsi_CDB_read_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_read_SG(): < at >< at > -1172,7 +1271,12 < at >< at > extern int pscsi_CDB_read_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_FROM_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1186,9 +1290,11 < at >< at > extern int pscsi_CDB_write_non_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_non_SG(task); -return(0); +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +return(pscsi_map_task_non_SG(task)); } /*pscsi_CDB_write_SG(): < at >< at > -1200,7 +1306,12 < at >< at > extern int pscsi_CDB_write_SG (se_task_t *task, u32 size) pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *) task->transport_req; pt->pscsi_direction = DMA_TO_DEVICE; -pscsi_map_task_SG(task); + +if (pscsi_blk_get_request(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); + +if (pscsi_map_task_SG(task) < 0) +return(PYX_TRANSPORT_LOGICAL_UNIT_COMMUNICATION_FAILURE); return(task->task_sg_num); } < at >< at > -1386,22 +1497,25 < at >< at > extern void pscsi_shutdown_hba (se_hba_t *hba) * * */ -//#warning FIXME: We can do some custom handling of HBA fuckups here. -extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb, int result) +static inline void pscsi_process_SAM_status ( +se_task_t *task, +pscsi_plugin_task_t *pt) { -if ((task->task_scsi_status = status_byte(result))) { +if ((task->task_scsi_status = status_byte(pt->pscsi_result))) { task->task_scsi_status <<= 1; -PYXPRINT("Parallel SCSI Status Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Status Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); } -switch (host_byte(result)) { +switch (host_byte(pt->pscsi_result)) { case DID_OK: transport_complete_task(task, (!task->task_scsi_status)); break; default: -PYXPRINT("Parallel SCSI Host Byte exception - ITT: 0x%08x Task: %p CDB: 0x%02x" -" Result: 0x%08x\n", task->iscsi_cmd->init_task_tag, task, cdb[0], result); +PYXPRINT("PSCSI Host Byte exception at task: %p CDB: 0x%02x" +" Result: 0x%08x\n", task, pt->pscsi_cdb[0], +pt->pscsi_result); task->task_scsi_status = SAM_STAT_CHECK_CONDITION; task->task_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; task->iscsi_cmd->transport_error_status = PYX_TRANSPORT_UNKNOWN_SAM_OPCODE; < at >< at > -1412,21 +1526,17 < at >< at > extern inline void pscsi_process_SAM_status (se_task_t *task, unsigned char *cdb return; } -extern void pscsi_req_done (void *data, char *sense, int result, int data_len) +extern void pscsi_req_done (struct request *req, int uptodate) { -se_task_t *task = (se_task_t *)data; +se_task_t *task = (se_task_t *)req->end_io_data; pscsi_plugin_task_t *pt = (pscsi_plugin_task_t *)task->transport_req; -#if 0 -printk("pscsi_req_done(): result: %08x, sense: %p data_len: %d\n", -result, sense, data_len); -#endif -pt->pscsi_result = result; -pt->pscsi_data_len = data_len; - -if (result != 0) -memcpy(pt->pscsi_sense, sense, SCSI_SENSE_BUFFERSIZE); + +pt->pscsi_result = req->errors; +pt->pscsi_resid = req->data_len; -pscsi_process_SAM_status(task, &pt->pscsi_cdb[0], result); +pscsi_process_SAM_status(task, pt); + +__blk_put_request(req->q, req); + return; } - diff --git a/drivers/lio-core/target_core_pscsi.h b/drivers/lio-core/target_core_pscsi.h index 980587d..090f0d2 100644 --- a/drivers/lio-core/target_core_pscsi.h +++ b/drivers/lio-core/target_core_pscsi.h < at >< at > -90,7 +90,7 < at >< at > extern struct scatterlist *pscsi_get_SG (se_task_t *); extern u32 pscsi_get_SG_count (se_task_t *); extern int pscsi_set_non_SG_buf (unsigned char *, se_task_t *); extern void pscsi_shutdown_hba (struct se_hba_s *); -extern void pscsi_req_done (void *, char *, int, int); +extern void pscsi_req_done (struct request *, int); #endif #include < at >< at > -104,8 +104,9 < at >< at > typedef struct pscsi_plugin_task_s { unsigned char pscsi_sense[SCSI_SENSE_BUFFERSIZE]; intpscsi_direction; intpscsi_result; -u32pscsi_data_len; +u32pscsi_resid; void*pscsi_buf; +struct request *pscsi_req; } pscsi_plugin_task_t; #define PDF_HAS_CHANNEL_ID0x01 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index f5d3b96..9e03a02 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c < at >< at > -303,8 +303,8 < at >< at > static void scsi_bi_endio(struct bio *bio, int error) * request can be sent to the block layer. We do not trust the scatterlist * sent to use, as some ULDs use that struct to only organize the pages. */ -static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, - int nsegs, unsigned bufflen, gfp_t gfp) +int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl, + int nsegs, unsigned bufflen, gfp_t gfp) { struct request_queue *q = rq->q; int nr_pages = (bufflen + sgl[0].offset + PAGE_SIZE - 1) >> PAGE_SHIFT; < at >< at > -379,6 +379,8 < at >< at > free_bios: return err; } +EXPORT_SYMBOL_GPL(scsi_req_map_sg); + /** * scsi_execute_async - insert request * < at >sdev:scsi device -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Linux SCSI programming

Sihan Goi — 2008-12-02T01:50:00

Hi, I'm trying to port a Windows SCSI API over to Linux. The API has several functions, most of them using ATA_PASS_THROUGH_EX to send a vendor specific command over to the device. I've managed to port 1 of the API function that is a modified INQUIRY command. However, I'm very confused as to how ATA passthrough is done in Linux. I've looked at the sg3_utils source code to get some inspiration but it's too complicated for me to understand what's going on. Does anyone know how to port this? In Windows a ATA_PASS_THROUGH_EX pointer is declared and memory allocated for it. It's fields are then initialized(Length, AtaFlags, DataTransferLength, TimeOutValue, DataBufferOffset, CurrentTaskFile[], PreviousTaskFile[], etc) and then a DeviceIoControl() is called. Now I know Linux's version of DeviceIoControl is ioctl() and I've used it successfully for the INQUIRY command, but what's Linux's version of ATA_PASS_THROUGH_EX? Any help would be appreciated. Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[patch 08/10] scsi: annotate gdth_rdcap_data, gdth_rdcap16_data endianness

2008-12-01T22:32:14

From: Harvey Harrison gmail.com> It would be easy to get rid of the typedefs too, but I kept this minimal. Noticed by sparse: drivers/scsi/gdth.c:2395:31: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2395:31: expected unsigned int [unsigned] [assigned] [usertype] last_block_no drivers/scsi/gdth.c:2395:31: got restricted __be32 [usertype] drivers/scsi/gdth.c:2396:27: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2396:27: expected unsigned int [unsigned] [assigned] [usertype] block_length drivers/scsi/gdth.c:2396:27: got restricted __be32 [usertype] drivers/scsi/gdth.c:2406:33: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2406:33: expected unsigned long long [unsigned] [usertype] last_block_no drivers/scsi/gdth.c:2406:33: got restricted __be64 [usertype] drivers/scsi/gdth.c:2407:33: warning: incorrect type in assignment (different base types) drivers/scsi/gdth.c:2407:33: expected unsigned int [unsigned] [usertype] block_length drivers/scsi/gdth.c:2407:33: got restricted __be32 [usertype] Signed-off-by: Harvey Harrison gmail.com> Cc: Boaz Harrosh panasas.com> Cc: James Bottomley HansenPartnership.com> Signed-off-by: Andrew Morton linux-foundation.org> --- drivers/scsi/gdth.c | 2 +- drivers/scsi/gdth.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/scsi/gdth.c~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +++ a/drivers/scsi/gdth.c < at >< at > -2391,7 +2391,7 < at >< at > static int gdth_internal_cache_cmd(gdth_ case READ_CAPACITY: TRACE2(("Read capacity hdrive %d\n",t)); if (ha->hdr[t].size > (ulong64)0xffffffff) - rdc.last_block_no = 0xffffffff; + rdc.last_block_no = cpu_to_be32(0xffffffff); else rdc.last_block_no = cpu_to_be32(ha->hdr[t].size-1); rdc.block_length = cpu_to_be32(SECTOR_SIZE); diff -puN drivers/scsi/gdth.h~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness drivers/scsi/gdth.h --- a/drivers/scsi/gdth.h~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +++ a/drivers/scsi/gdth.h < at >< at > -968,14 +968,14 < at >< at > typedef struct { /* READ_CAPACITY data format */ typedef struct { - ulong32 last_block_no; - ulong32 block_length; +__be32 last_block_no; +__be32 block_length; } PACKED gdth_rdcap_data; /* READ_CAPACITY (16) data format */ typedef struct { - ulong64 last_block_no; - ulong32 block_length; +__be64 last_block_no; +__be32 block_length; } PACKED gdth_rdcap16_data; /* REQUEST_SENSE data format */ _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[patch 09/10] esp: fix section mismatch warning

2008-12-01T22:32:15

From: Randy Dunlap oracle.com> Not critical. WARNING: drivers/char/esp.o(.text+0x278): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_version The function show_serial_version() references the variable __initdata serial_version. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_version is wrong. WARNING: drivers/char/esp.o(.text+0x27d): Section mismatch in reference from the function show_serial_version() to the variable .init.data:serial_name The function show_serial_version() references the variable __initdata serial_name. This is often because show_serial_version lacks a __initdata annotation or the annotation of serial_name is wrong. Signed-off-by: Randy Dunlap oracle.com> Cc: Andrew J. Robinson nyx.net> Signed-off-by: Andrew Morton linux-foundation.org> --- drivers/char/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/char/esp.c~esp-fix-section-mismatch-warning drivers/char/esp.c --- a/drivers/char/esp.c~esp-fix-section-mismatch-warning +++ a/drivers/char/esp.c < at >< at > -2258,7 +2258,7 < at >< at > static int esp_open(struct tty_struct *t * driver. */ -static void show_serial_version(void) +static void __init show_serial_version(void) { printk(KERN_INFO "%s version %s (DMA %u)\n", serial_name, serial_version, dma); _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[patch 07/10] scsi: gdth.c use unaligned access helpers

2008-12-01T22:32:13

From: Harvey Harrison gmail.com> Remove two now unnecessary local vars. Signed-off-by: Harvey Harrison gmail.com> Cc: Boaz Harrosh panasas.com> Cc: James Bottomley HansenPartnership.com> Signed-off-by: Andrew Morton linux-foundation.org> --- drivers/scsi/gdth.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff -puN drivers/scsi/gdth.c~scsi-gdthc-use-unaligned-access-helpers drivers/scsi/gdth.c --- a/drivers/scsi/gdth.c~scsi-gdthc-use-unaligned-access-helpers +++ a/drivers/scsi/gdth.c < at >< at > -131,6 +131,7 < at >< at > #include #include #include +#include #include #include #include < at >< at > -2429,8 +2430,8 < at >< at > static int gdth_fill_cache_cmd(gdth_ha_s { register gdth_cmd_str *cmdp; struct gdth_cmndinfo *cmndinfo = gdth_cmnd_priv(scp); - ulong32 cnt, blockcnt; - ulong64 no, blockno; + ulong32 blockcnt; + ulong64 blockno; int i, cmd_index, read_write, sgcnt, mode64; cmdp = ha->pccb; < at >< at > -2498,19 +2499,15 < at >< at > static int gdth_fill_cache_cmd(gdth_ha_s if (read_write) { if (scp->cmd_len == 16) { - memcpy(&no, &scp->cmnd[2], sizeof(ulong64)); - blockno = be64_to_cpu(no); - memcpy(&cnt, &scp->cmnd[10], sizeof(ulong32)); - blockcnt = be32_to_cpu(cnt); +blockno = get_unaligned_be64(&scp->cmnd[2]); +blockcnt = get_unaligned_be32(&scp->cmnd[10]); } else if (scp->cmd_len == 10) { - memcpy(&no, &scp->cmnd[2], sizeof(ulong32)); - blockno = be32_to_cpu(no); - memcpy(&cnt, &scp->cmnd[7], sizeof(ushort)); - blockcnt = be16_to_cpu(cnt); +blockno = get_unaligned_be32(&scp->cmnd[2]); +blockcnt = get_unaligned_be16(&scp->cmnd[7]); } else { - memcpy(&no, &scp->cmnd[0], sizeof(ulong32)); - blockno = be32_to_cpu(no) & 0x001fffffUL; - blockcnt= scp->cmnd[4]==0 ? 0x100 : scp->cmnd[4]; +blockno = get_unaligned_be32(&scp->cmnd[2]); +blockno &= 0x001fffffUL; +blockcnt = scp->cmnd[4] == 0 ? 0x100 : scp->cmnd[4]; } if (mode64) { cmdp->u.cache64.BlockNo = blockno; _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[patch 10/10] scsi: fix bad use of udelay in atp870u.c

2008-12-01T22:32:16

From: Martin Michlmayr cyrius.com> The ACARD driver calls udelay() with a value > 2000, which leads to to the following compilation error on ARM: ERROR: "__bad_udelay" [drivers/scsi/atp870u.ko] undefined! make[1]: *** [__modpost] Error 1 Fix this by using a combination of mdelay and udelay. Signed-off-by: Martin Michlmayr cyrius.com> Cc: James Bottomley HansenPartnership.com> Signed-off-by: Andrew Morton linux-foundation.org> --- drivers/scsi/atp870u.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/scsi/atp870u.c~scsi-fix-bad-use-of-udelay-in-atp870uc drivers/scsi/atp870u.c --- a/drivers/scsi/atp870u.c~scsi-fix-bad-use-of-udelay-in-atp870uc +++ a/drivers/scsi/atp870u.c < at >< at > -1171,7 +1171,8 < at >< at > wait_io1: outw(val, tmport); outb(2, 0x80); TCM_SYNC: -udelay(0x800); +mdelay(2); +udelay(48); if ((inb(tmport) & 0x80) == 0x00) {/* bsy ? */ outw(0, tmport--); outb(0, tmport); _ -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo< at >vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html