block,scsi,ide: unify sector and data_len
Subsystems (25)
PATCH 1/1 block,scsi,ide: unify sector and data_len
Hello,
Upon ack, please pull from the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git block-unify-sector-and-data_len
This is the first take of block-unify-sector-and-data_len patchset. The primary goal of this patchset is to consolidate all the similar bug slightly different current position and data length fields in struct request.
Currently, there are two current position fields - rq->sector and rq->hard_sector. Three possible total lengths - rq->nr_sectors, rq->hard_nr_sectors and rq->data_len and two possible current lengths
- rq->current_nr_sectors and rq->hard_cur_sectors.
The hard_ prefixed fields are there to allow low level drivers to modify respective fields without the hard_ prefix for partial processing. However, this capability can easily be replaced with partial completion and/or blk_update_request() and in fact with recent updates there is no remaining user.
data_len equals nr_sectors << 9 for FS requests. For !FS requests, nr_sectors could be zero while data_len contains the request length. This is further complicated by the fact that data_len duals as residual count on request completion.
All these duplications with slight variances lead to a lot of confusion. For example, it's not very clear what blk_rq_bytes() would return during request processing. It depends on the type of the request, whether the driver supports residual byte counting and if so how it supports that. These subtleties show up both in block layer and llds requiring request length caching during completion and different completion paths depending on request type.
This patch simplifies the situation by doing the followings.
* Introduce rq->resid_len and use it for residual count. rq->data_len means the left data length in the request at all times.
* Make sure nobody tinkers with rq fields directly.
* Kill rq->hard_sector and use rq->sector exclusively.
* Kill rq->nr_sectors and rq->hard_nr_sectors and use rq->data_len exclusively.
* Kill rq->current_nr_sectors and rq->hard_cur_sectors and use bio_cur_bytes(rq->bio) instead.
* Encapsulate all accesses via accessors.
* Add __ prefix to rq->sector and rq->data_len to make it clear that these fields are internal and llds MUST NOT access these directly. This field renaming is also to trigger build breakage on out-of-tree drivers which access and modify request fields directly which won't work correctly anymore.
This patchset contains the following ten patches.
0001-nbd-don-t-clear-rq-sector-and-nr_sectors-unnecessa.patch 0002-ide-tape-don-t-initialize-rq-sector-for-rw-request.patch 0003-block-add-rq-resid_len.patch 0004-block-implement-blk_rq_pos-cur_-sectors-and-conv.patch 0005-block-convert-to-pos-and-nr_sectors-accessors.patch 0006-ide-convert-to-rq-pos-and-nr_sectors-accessors.patch 0007-block-drop-request-hard_-and-nr_sectors.patch 0008-block-cleanup-rq-data_len-usages.patch 0009-ide-cleanup-rq-data_len-usages.patch 0010-block-hide-request-sector-and-data_len.patch
0001-0002 remove unnecessary explicit rq field clearing.
0003 adds rq->resid_len.
0004-0006 introduce and use blk_rq_pos() and blk_rq_[cur_]sectors() accessors.
0007 drops fields with hard_ prefix.
0008-0009 replaces direct data_len usage with blk_rq_bytes().
0010 hides rq->sector and data_len.
As the patchset contains several block-ide sync points, I think it's best to apply this series in unified series. SCSI also received good amount of changes. If there's a tree I can pull from which won't be rebased, please let me know. If SCSI tree is gonna pull block tree after merge, that will be fine too.
All changed llds have been compile tested, mid-high layer resid_len handling has been verified and nothing broke during my test runs with ide and libata.
This patchset is on top of
linux-2.6-block#for-2.6.31 (f68adec3c7155a8bbf32a90cb4c4d0737df045d9)
+ linux-2.6-ide#for-next (b656eba122929881c52d38ae16637167aaa5b88b)
and contains the following changes.
arch/um/drivers/ubd_kern.c | 2 block/as-iosched.c | 18 +++-- block/blk-barrier.c | 4 - block/blk-core.c | 100 ++++++++++++------------------- block/blk-map.c | 2 block/blk-merge.c | 46 ++------------ block/blk.h | 1 block/bsg.c | 8 +- block/cfq-iosched.c | 30 ++++----- block/deadline-iosched.c | 2 block/elevator.c | 22 +++--- block/scsi_ioctl.c | 2 drivers/ata/libata-scsi.c | 2 drivers/block/DAC960.c | 6 - drivers/block/amiflop.c | 6 - drivers/block/ataflop.c | 10 +-- drivers/block/cciss.c | 35 ++++------ drivers/block/cpqarray.c | 9 +- drivers/block/floppy.c | 53 ++++++++-------- drivers/block/hd.c | 14 ++-- drivers/block/nbd.c | 19 +---- drivers/block/paride/pcd.c | 4 - drivers/block/paride/pd.c | 8 +- drivers/block/paride/pf.c | 8 +- drivers/block/ps3disk.c | 9 +- drivers/block/sunvdc.c | 2 drivers/block/swim3.c | 34 +++++----- drivers/block/sx8.c | 6 - drivers/block/ub.c | 16 ++-- drivers/block/viodasd.c | 8 +- drivers/block/virtio_blk.c | 2 drivers/block/xd.c | 4 - drivers/block/xen-blkfront.c | 11 +-- drivers/block/xsysace.c | 25 ++++--- drivers/block/z2ram.c | 6 - drivers/cdrom/gdrom.c | 6 - drivers/cdrom/viocd.c | 2 drivers/ide/ide-atapi.c | 13 ---- drivers/ide/ide-cd.c | 44 ++++--------- drivers/ide/ide-disk.c | 8 +- drivers/ide/ide-dma.c | 2 drivers/ide/ide-floppy.c | 10 +-- drivers/ide/ide-io.c | 10 +-- drivers/ide/ide-lib.c | 2 drivers/ide/ide-tape.c | 11 +-- drivers/ide/ide-taskfile.c | 2 drivers/ide/pdc202xx_old.c | 2 drivers/ide/tc86c001.c | 2 drivers/ide/tx4939ide.c | 2 drivers/memstick/core/mspro_block.c | 6 - drivers/message/fusion/mptsas.c | 21 +++--- drivers/message/i2o/i2o_block.c | 24 ++++--- drivers/mmc/card/block.c | 10 +-- drivers/mtd/mtd_blkdevs.c | 7 +- drivers/s390/block/dasd.c | 2 drivers/s390/block/dasd_diag.c | 5 - drivers/s390/block/dasd_eckd.c | 6 - drivers/s390/block/dasd_fba.c | 7 +- drivers/s390/char/tape_34xx.c | 2 drivers/s390/char/tape_3590.c | 2 drivers/s390/char/tape_block.c | 2 drivers/sbus/char/jsflash.c | 4 - drivers/scsi/eata.c | 24 +++---- drivers/scsi/libsas/sas_expander.c | 14 +--- drivers/scsi/libsas/sas_host_smp.c | 52 ++++++++-------- drivers/scsi/lpfc/lpfc_scsi.c | 22 +++--- drivers/scsi/mpt2sas/mpt2sas_transport.c | 23 +++---- drivers/scsi/osd/osd_initiator.c | 4 - drivers/scsi/scsi_lib.c | 45 ++++++------- drivers/scsi/scsi_tgt_lib.c | 2 drivers/scsi/sd.c | 24 +++---- drivers/scsi/sd_dif.c | 2 drivers/scsi/sg.c | 2 drivers/scsi/sr.c | 15 ++-- drivers/scsi/st.c | 2 drivers/scsi/u14-34f.c | 22 +++--- fs/exofs/osd.c | 4 - include/linux/bio.h | 6 - include/linux/blkdev.h | 56 ++++++++++------- include/linux/elevator.h | 2 include/scsi/scsi_cmnd.h | 2 kernel/trace/blktrace.c | 16 ++-- 82 files changed, 511 insertions(+), 576 deletions(-)
Thanks.
--
tejun
PATCH 1/10 nbd: don't clear rq->sector and nr_sectors unnecessarily
There's no reason to clear rq->sector and nr_sectors after calling blk_rq_init(). They're guaranteed to be clear. Drop unnecessary clearing.
[ Impact: cleanup ]
--- drivers/block/nbd.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/block/nbd.c +0 -7
@@ -580,13 +580,6 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,blk_rq_init (NULL , &sreq); sreq.cmd_type =REQ_TYPE_SPECIAL ;nbd_cmd (&sreq) =NBD_CMD_DISC ; -/* -* Set these to sane values in case server implementation -* fails to check the request type first and also to keep -* debugging output cleaner. -*/ - sreq.sector =0 ; - sreq.nr_sectors =0 ;if (!lo->sock)return -EINVAL ;nbd_send_req (lo, &sreq);
Signature · 1 line
1.6.0.2
PATCH 2/10 ide-tape: don't initialize rq->sector for rw requests
In reply to Tejun Heorq->sector is set to the tape->first_frame but it's never actually used and not even in the correct unit (512 byte sectors). Don't set it.
[ Impact: cleanup ]
--- drivers/ide/ide-tape.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/ide/ide-tape.c +0 -1
@@ -892,7 +892,6 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size) rq->cmd_type =REQ_TYPE_SPECIAL ; rq->cmd[13 ] = cmd; rq->rq_disk = tape->disk; - rq->sector = tape->first_frame;if (size) { ret = blk_rq_map_kern(drive->queue, rq, tape->buf, size,
Signature · 1 line
1.6.0.2
PATCH 3/10 block: add rq->resid_len
In reply to Tejun Heorq->data_len served two purposes - the length of data buffer on issue and the residual count on completion. This duality creates some headaches.
First of all, block layer and low level drivers can't really determine what rq->data_len contains while a request is executing. It could be the total request length or it coulde be anything else one of the lower layers is using to keep track of residual count. This complicates things because blk_rq_bytes() and thus [__]blk_end_request_all() relies on rq->data_len for PC commands. Drivers which want to report residual count should first cache the total request length, update rq->data_len and then complete the request with the cached data length.
Secondly, it makes requests default to reporting full residual count, ie. reporting that no data transfer occurred. The residual count is an exception not the norm; however, the driver should clear rq->data_len to zero to signify the normal cases while leaving it alone means no data transfer occurred at all. This reverse default behavior complicates code unnecessarily and renders block PC on some drivers (ide-tape/floppy) unuseable.
This patch adds rq->resid_len which is used only for residual count.
While at it, remove now unnecessasry blk_rq_bytes() caching in ide_pc_intr() as rq->data_len is not changed anymore.
[ Impact: cleanup residual count handling, report 0 resid by default ]
--- block/bsg.c | 8 +++--- block/scsi_ioctl.c | 2 +- drivers/block/cciss.c | 13 +++------- drivers/block/ub.c | 6 +--- drivers/ide/ide-atapi.c | 9 +------ drivers/ide/ide-cd.c | 13 ++++------ drivers/ide/ide-tape.c | 4 +- drivers/message/fusion/mptsas.c | 3 +- drivers/scsi/libsas/sas_expander.c | 6 +---- drivers/scsi/libsas/sas_host_smp.c | 38 +++++++++++++++-------------- drivers/scsi/mpt2sas/mpt2sas_transport.c | 4 +-- drivers/scsi/scsi_lib.c | 24 +++++++++--------- drivers/scsi/sg.c | 2 +- drivers/scsi/st.c | 2 +- include/linux/blkdev.h | 1 + 15 files changed, 57 insertions(+), 78 deletions(-)
block/bsg.c +4 -4
@@ -445,14 +445,14 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, }if (rq->next_rq) { - hdr->dout_resid = rq->data_len; - hdr->din_resid = rq->next_rq->data_len; + hdr->dout_resid = rq->resid_len; + hdr->din_resid = rq->next_rq->resid_len;blk_rq_unmap_user (bidi_bio);blk_put_request (rq->next_rq); }else if (rq_data_dir (rq) ==READ ) - hdr->din_resid = rq->data_len; + hdr->din_resid = rq->resid_len;else - hdr->dout_resid = rq->data_len; + hdr->dout_resid = rq->resid_len;/* * If the request generated a negative error number, return it
block/scsi_ioctl.c +1 -1
@@ -230,7 +230,7 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, hdr->info =0 ;if (hdr->masked_status || hdr->host_status || hdr->driver_status) hdr->info |=SG_INFO_CHECK ; - hdr->resid = rq->data_len; + hdr->resid = rq->resid_len; hdr->sb_len_wr =0 ;if (rq->sense_len && hdr->sbp) {
drivers/block/cciss.c +4 -9
@@ -1299,7 +1299,6 @@ static void cciss_softirq_done(struct request *rq) {CommandList_struct *cmd = rq->completion_data;ctlr_info_t *h = hba[cmd->ctlr]; -unsigned int nr_bytes;unsigned long flags;u64bit temp64;int i, ddir;
@@ -1321,15 +1320,11 @@ static void cciss_softirq_done(struct request *rq)printk ("Done with %p\n" , rq);#endif /* CCISS_DEBUG */ -/* -* Store the full size and set the residual count for pc requests -*/ - nr_bytes =blk_rq_bytes (rq); +/* set the residual count for pc requests */ if (blk_pc_request (rq)) - rq->data_len = cmd->err_info->ResidualCnt; + rq->resid_len = cmd->err_info->ResidualCnt; -if (blk_end_request (rq, (rq->errors ==0 ) ?0 : -EIO , nr_bytes)) -BUG (); +blk_end_request_all (rq, (rq->errors ==0 ) ?0 : -EIO );spin_lock_irqsave (&h->lock, flags);cmd_free (h, cmd,1 );
@@ -2691,7 +2686,7 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd,printk (KERN_WARNING "cciss: cmd %p has" " completed with data underrun " "reported\n" , cmd); - cmd->rq->data_len = cmd->err_info->ResidualCnt; + cmd->rq->resid_len = cmd->err_info->ResidualCnt; }break ;case CMD_DATA_OVERRUN :
drivers/block/ub.c +2 -4
@@ -783,10 +783,8 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)if (cmd->error ==0 ) {if (blk_pc_request (rq)) { -if (cmd->act_len >= rq->data_len) - rq->data_len =0 ; -else - rq->data_len -= cmd->act_len; +if (cmd->act_len < rq->data_len) + rq->resid_len = rq->data_len - cmd->act_len; scsi_status =0 ; }else {if (cmd->act_len != cmd->len) {
drivers/ide/ide-atapi.c +1 -8
@@ -367,7 +367,6 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)/* No more interrupts */ if ((stat &ATA_DRQ ) ==0 ) {int uptodate, error; -unsigned int done;debug_log ("Packet command completed, %d bytes transferred\n" , pc->xferred);
@@ -406,12 +405,6 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)if ((pc->flags &PC_FLAG_WAIT_FOR_DSC ) && (stat &ATA_DSC ) ==0 ) dsc =1 ; -/* -* ->pc_callback() might change rq->data_len for -* residual count, cache total length. -*/ - done =blk_rq_bytes (rq); -/* Command finished - Call the callback function */ uptodate = drive->pc_callback (drive, dsc);
@@ -431,7 +424,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) error = uptodate ?0 : -EIO ; } -ide_complete_rq (drive, error, done); +ide_complete_rq (drive, error,blk_rq_bytes (rq));return ide_stopped; }
drivers/ide/ide-cd.c +5 -8
@@ -519,7 +519,7 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, error =blk_execute_rq (drive->queue, info->disk, rq,0 );if (buffer) - *bufflen = rq->data_len; + *bufflen = rq->resid_len; flags = rq->cmd_flags;blk_put_request (rq);
@@ -707,11 +707,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) out_end:if (blk_pc_request (rq) && rc ==0 ) { -unsigned int dlen = rq->data_len; - - rq->data_len =0 ; - -if (blk_end_request (rq,0 , dlen)) +if (blk_end_request (rq,0 , rq->data_len))BUG (); hwif->rq =NULL ;
@@ -740,9 +736,10 @@ out_end: nsectors =1 ;if (blk_fs_request (rq) ==0 ) { - rq->data_len -= (cmd->nbytes - cmd->nleft); + rq->resid_len = rq->data_len - + (cmd->nbytes - cmd->nleft);if (uptodate ==0 && (cmd->tf_flags &IDE_TFLAG_WRITE )) - rq->data_len += cmd->last_xfer_len; + rq->resid_len += cmd->last_xfer_len; }ide_complete_rq (drive, uptodate ?0 : -EIO , nsectors <<9 );
drivers/ide/ide-tape.c +2 -2
@@ -380,7 +380,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc) } tape->first_frame += blocks; - rq->data_len -= blocks * tape->blk_size; + rq->resid_len =blk_rq_bytes (rq) - blocks * tape->blk_size;if (pc->error) { uptodate =0 ;
@@ -903,7 +903,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size)blk_execute_rq (drive->queue, tape->disk, rq,0 );/* calculate the number of transferred bytes and update buffer state */ - size -= rq->data_len; + size -= rq->resid_len; tape->cur = tape->buf;if (cmd ==REQ_IDETAPE_READ ) tape->valid = size;
drivers/message/fusion/mptsas.c +1 -2
@@ -1357,8 +1357,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;memcpy (req->sense, smprep,sizeof (*smprep)); req->sense_len =sizeof (*smprep); - req->data_len =0 ; - rsp->data_len -= smprep->ResponseDataLength; + rsp->resid_len = rsp->data_len - smprep->ResponseDataLength; }else {printk (MYIOC_s_ERR_FMT"%s: smp passthru reply failed to be returned\n" , ioc->name, __func__);
drivers/scsi/libsas/sas_expander.c +1 -5
@@ -1936,12 +1936,8 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, bio_data(rsp->bio), rsp->data_len);if (ret >0 ) {/* positive number is the untransferred residual */ - rsp->data_len = ret; - req->data_len =0 ; + rsp->resid_len = ret; ret =0 ; - }else if (ret ==0 ) { - rsp->data_len =0 ; - req->data_len =0 ; }return ret;
drivers/scsi/libsas/sas_host_smp.c +20 -18
@@ -134,7 +134,7 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req, {u8 *req_data =NULL , *resp_data =NULL , *buf;struct sas_ha_struct *sas_ha =SHOST_TO_SAS_HA (shost); -int error = -EINVAL , resp_data_len = rsp->data_len; +int error = -EINVAL ;/* eight is the minimum size for request and response frames */ if (req->data_len <8 || rsp->data_len <8 )
@@ -176,17 +176,20 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req, resp_data[1 ] = req_data[1 ]; resp_data[2 ] =SMP_RESP_FUNC_UNK ; + req->resid_len = req->data_len; + rsp->resid_len = rsp->data_len; +switch (req_data[1 ]) {case SMP_REPORT_GENERAL : - req->data_len -=8 ; - resp_data_len -=32 ; + req->resid_len -=8 ; + rsp->resid_len -=32 ; resp_data[2 ] =SMP_RESP_FUNC_ACC ; resp_data[9 ] = sas_ha->num_phys;break ;case SMP_REPORT_MANUF_INFO : - req->data_len -=8 ; - resp_data_len -=64 ; + req->resid_len -=8 ; + rsp->resid_len -=64 ; resp_data[2 ] =SMP_RESP_FUNC_ACC ;memcpy (resp_data +12 , shost->hostt->name,SAS_EXPANDER_VENDOR_ID_LEN );
@@ -199,13 +202,13 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,break ;case SMP_DISCOVER : - req->data_len -=16 ; -if ((int )req->data_len <0 ) { - req->data_len =0 ; + req->resid_len -=16 ; +if ((int )req->resid_len <0 ) { + req->resid_len =0 ; error = -EINVAL ; goto out; } - resp_data_len -=56 ; + rsp->resid_len -=56 ;sas_host_smp_discover (sas_ha, resp_data, req_data[9 ]);break ;
@@ -215,13 +218,13 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,break ;case SMP_REPORT_PHY_SATA : - req->data_len -=16 ; -if ((int )req->data_len <0 ) { - req->data_len =0 ; + req->resid_len -=16 ; +if ((int )req->resid_len <0 ) { + req->resid_len =0 ; error = -EINVAL ; goto out; } - resp_data_len -=60 ; + rsp->resid_len -=60 ;sas_report_phy_sata (sas_ha, resp_data, req_data[9 ]);break ;
@@ -238,13 +241,13 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,break ;case SMP_PHY_CONTROL : - req->data_len -=44 ; -if ((int )req->data_len <0 ) { - req->data_len =0 ; + req->resid_len -=44 ; +if ((int )req->resid_len <0 ) { + req->resid_len =0 ; error = -EINVAL ; goto out; } - resp_data_len -=8 ; + rsp->resid_len -=8 ;sas_phy_control (sas_ha, req_data[9 ], req_data[10 ], req_data[32 ] >>4 , req_data[33 ] >>4 , resp_data);
@@ -265,7 +268,6 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,flush_kernel_dcache_page (bio_page (rsp->bio));kunmap_atomic (buf -bio_offset (rsp->bio),KM_USER0 );local_irq_enable (); - rsp->data_len = resp_data_len; out:kfree (req_data);
drivers/scsi/mpt2sas/mpt2sas_transport.c +1 -3
@@ -1170,9 +1170,7 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,memcpy (req->sense, mpi_reply,sizeof (*mpi_reply)); req->sense_len =sizeof (*mpi_reply); - req->data_len =0 ; - rsp->data_len -= mpi_reply->ResponseDataLength; - + rsp->resid_len = rsp->data_len - mpi_reply->ResponseDataLength; }else {dtransportprintk (ioc,printk (MPT2SAS_DEBUG_FMT "%s - no reply\n" , ioc->name, __func__));
drivers/scsi/scsi_lib.c +12 -12
@@ -240,11 +240,11 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,* is invalid. Prevent the garbage from being misinterpreted * and prevent security leaks by zeroing out the excess data. */ -if (unlikely (req->data_len >0 && req->data_len <= bufflen)) -memset (buffer + (bufflen - req->data_len),0 , req->data_len); +if (unlikely (req->resid_len >0 && req->resid_len <= bufflen)) +memset (buffer + (bufflen - req->resid_len),0 , req->resid_len);if (resid) - *resid = req->data_len; + *resid = req->resid_len; ret = req->errors; out:blk_put_request (req);
@@ -549,7 +549,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int error,int leftover = (req->hard_nr_sectors <<9 );if (blk_pc_request (req)) - leftover = req->data_len; + leftover = req->resid_len;/* kill remainder if no retrys */ if (error &&scsi_noretry_cmd (cmd))
@@ -673,11 +673,11 @@ void scsi_release_buffers(struct scsi_cmnd *cmd)EXPORT_SYMBOL (scsi_release_buffers);/* -* Bidi commands Must be complete as a whole, both sides at once. -* If part of the bytes were written and lld returned -* scsi_in()->resid and/or scsi_out()->resid this information will be left -* in req->data_len and req->next_rq->data_len. The upper-layer driver can -* decide what to do with this information. +* Bidi commands Must be complete as a whole, both sides at once. If +* part of the bytes were written and lld returned scsi_in()->resid +* and/or scsi_out()->resid this information will be left in +* req->resid_len and req->next_rq->resid_len. The upper-layer driver +* can decide what to do with this information. */ static void scsi_end_bidi_request (struct scsi_cmnd *cmd) {
@@ -685,8 +685,8 @@ static void scsi_end_bidi_request(struct scsi_cmnd *cmd)unsigned int dlen = req->data_len;unsigned int next_dlen = req->next_rq->data_len; - req->data_len =scsi_out (cmd)->resid; - req->next_rq->data_len =scsi_in (cmd)->resid; + req->resid_len =scsi_out (cmd)->resid; + req->next_rq->resid_len =scsi_in (cmd)->resid;/* The req and req->next_rq have not been completed */ BUG_ON (blk_end_bidi_request (req,0 , dlen, next_dlen));
@@ -778,7 +778,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)scsi_end_bidi_request (cmd);return ; } - req->data_len =scsi_get_resid (cmd); + req->resid_len =scsi_get_resid (cmd); }BUG_ON (blk_bidi_rq (req));/* bidi not support for !blk_pc_request yet */
drivers/scsi/sg.c +1 -1
@@ -1260,7 +1260,7 @@ static void sg_rq_end_io(struct request *rq, int uptodate) sense = rq->sense; result = rq->errors; - resid = rq->data_len; + resid = rq->resid_len;SCSI_LOG_TIMEOUT (4 ,printk ("sg_cmd_done: %s, pack_id=%d, res=0x%x\n" , sdp->disk->disk_name, srp->header.pack_id, result));
drivers/scsi/st.c +1 -1
@@ -463,7 +463,7 @@ static void st_scsi_execute_end(struct request *req, int uptodate)struct scsi_tape *STp = SRpnt->stp; STp->buffer->cmdstat.midlevel_result = SRpnt->result = req->errors; - STp->buffer->cmdstat.residual = req->data_len; + STp->buffer->cmdstat.residual = req->resid_len;if (SRpnt->waiting)complete (SRpnt->waiting);
include/linux/blkdev.h +1 -0
@@ -229,6 +229,7 @@ struct request {unsigned int data_len;unsigned int extra_len;/* length of alignment and padding */ unsigned int sense_len; +unsigned int resid_len;/* residual count */ void *sense;unsigned long deadline;
Signature · 1 line
1.6.0.2
PATCH 4/10 block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones
In reply to Tejun HeoImplement accessors - blk_rq_pos(), blk_rq_sectors() and blk_rq_cur_sectors() which return rq->sector, rq->hard_nr_sectors and rq->hard_cur_sectors respectively and convert direct references of the said fields to the accessors.
This is in preparation of request data length handling cleanup.
[ Impact: cleanup ]
--- block/blk-barrier.c | 2 +- block/blk-core.c | 2 +- block/cfq-iosched.c | 2 +- drivers/block/ps3disk.c | 2 +- drivers/block/viodasd.c | 6 +++--- drivers/block/xsysace.c | 10 +++++----- drivers/ide/ide-cd.c | 8 ++++---- drivers/ide/ide-io.c | 4 ++-- drivers/message/i2o/i2o_block.c | 2 +- drivers/scsi/scsi_lib.c | 2 +- include/linux/blkdev.h | 23 ++++++++++++++++++++--- kernel/trace/blktrace.c | 4 ++-- 12 files changed, 42 insertions(+), 25 deletions(-)
block/blk-barrier.c +1 -1
@@ -163,7 +163,7 @@ static inline bool start_ordered(struct request_queue *q, struct request **rqp)* For an empty barrier, there's no actual BAR request, which * in turn makes POSTFLUSH unnecessary. Mask them off. */ -if (!rq->hard_nr_sectors) { +if (!blk_rq_sectors (rq)) { q->ordered &= ~(QUEUE_ORDERED_DO_BAR |QUEUE_ORDERED_DO_POSTFLUSH );/*
block/blk-core.c +1 -1
@@ -1683,7 +1683,7 @@ static void blk_account_io_done(struct request *req)unsigned int blk_rq_bytes (struct request *rq) {if (blk_fs_request (rq)) -return rq->hard_nr_sectors <<9 ; +return blk_rq_sectors (rq) <<9 ;return rq->data_len; }
block/cfq-iosched.c +1 -1
@@ -760,7 +760,7 @@ static void cfq_activate_request(struct request_queue *q, struct request *rq)cfq_log_cfqq (cfqd,RQ_CFQQ (rq),"activate rq, drv=%d" , cfqd->rq_in_driver); - cfqd->last_position = rq->hard_sector + rq->hard_nr_sectors; + cfqd->last_position =blk_rq_pos (rq) +blk_rq_sectors (rq); }static void cfq_deactivate_request (struct request_queue *q,struct request *rq)
drivers/block/ps3disk.c +1 -1
@@ -136,7 +136,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,dev_dbg (&dev->sbd.core,"%s:%u: %s req has %u bvecs for %lu sectors %lu hard sectors\n" , __func__, __LINE__, op, n, req->nr_sectors, - req->hard_nr_sectors); +blk_rq_sectors (req));#endif start_sector = req->sector * priv->blocking_factor;
drivers/block/viodasd.c +3 -3
@@ -368,12 +368,12 @@ static void do_viodasd_request(struct request_queue *q)blkdev_dequeue_request (req);/* check that request contains a valid command */ if (!blk_fs_request (req)) { -viodasd_end_request (req, -EIO , req->hard_nr_sectors); +viodasd_end_request (req, -EIO ,blk_rq_sectors (req));continue ; }/* Try sending the request */ if (send_request (req) !=0 ) -viodasd_end_request (req, -EIO , req->hard_nr_sectors); +viodasd_end_request (req, -EIO ,blk_rq_sectors (req)); } }
@@ -590,7 +590,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent) err =vio_lookup_rc (viodasd_err_table, bevent->sub_result);printk (VIOD_KERN_WARNING "read/write error %d:0x%04x (%s)\n" , event->xRc, bevent->sub_result, err->msg); - num_sect = req->hard_nr_sectors; + num_sect =blk_rq_sectors (req); } qlock = req->q->queue_lock;spin_lock_irqsave (qlock, irq_flags);
drivers/block/xsysace.c +5 -5
@@ -645,8 +645,8 @@ static void ace_fsm_dostate(struct ace_device *ace)/* Okay, it's a data request, set it up for transfer */ dev_dbg (ace->dev, -"request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n" , - (unsigned long long ) req->sector, req->hard_nr_sectors, +"request: sec=%llx hcnt=%x, ccnt=%x, dir=%i\n" , + (unsigned long long ) req->sector,blk_rq_sectors (req), req->current_nr_sectors,rq_data_dir (req)); ace->req = req;
@@ -654,7 +654,7 @@ static void ace_fsm_dostate(struct ace_device *ace) ace->data_count = req->current_nr_sectors *ACE_BUF_PER_SECTOR ;ace_out32 (ace,ACE_MPULBA , req->sector &0x0FFFFFFF ); - count = req->hard_nr_sectors; + count =blk_rq_sectors (req);if (rq_data_dir (req)) {/* Kick off write request */ dev_dbg (ace->dev,"write data\n" );
@@ -719,8 +719,8 @@ static void ace_fsm_dostate(struct ace_device *ace)/* bio finished; is there another one? */ if (__blk_end_request (ace->req,0 ,blk_rq_cur_bytes (ace->req))) { -/* dev_dbg(ace->dev, "next block; h=%li c=%i\n", -* ace->req->hard_nr_sectors, +/* dev_dbg(ace->dev, "next block; h=%u c=%u\n", +* blk_rq_sectors(ace->req), * ace->req->current_nr_sectors); */ ace->data_ptr = ace->req->buffer;
drivers/ide/ide-cd.c +4 -4
@@ -730,7 +730,7 @@ out_end:if (blk_pc_request (rq)) nsectors = (rq->data_len +511 ) >>9 ;else - nsectors = rq->hard_nr_sectors; + nsectors =blk_rq_sectors (rq);if (nsectors ==0 ) nsectors =1 ;
@@ -875,7 +875,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,return ide_issue_pc (drive, &cmd); out_end: - nsectors = rq->hard_nr_sectors; + nsectors =blk_rq_sectors (rq);if (nsectors ==0 ) nsectors =1 ;
@@ -1359,8 +1359,8 @@ static int ide_cdrom_probe_capabilities(ide_drive_t *drive)static int ide_cdrom_prep_fs (struct request_queue *q,struct request *rq) {int hard_sect =queue_hardsect_size (q); -long block = (long )rq->hard_sector / (hard_sect >>9 ); -unsigned long blocks = rq->hard_nr_sectors / (hard_sect >>9 ); +long block = (long )blk_rq_pos (rq) / (hard_sect >>9 ); +unsigned long blocks =blk_rq_sectors (rq) / (hard_sect >>9 );memset (rq->cmd,0 ,BLK_MAX_CDB );
drivers/ide/ide-io.c +2 -2
@@ -118,7 +118,7 @@ unsigned int ide_rq_bytes(struct request *rq)if (blk_pc_request (rq))return rq->data_len;else -return rq->hard_cur_sectors <<9 ; +return blk_rq_cur_sectors (rq) <<9 ; }EXPORT_SYMBOL_GPL (ide_rq_bytes);
@@ -133,7 +133,7 @@ int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)* and complete the whole request right now */ if (blk_noretry_request (rq) && error <=0 ) - nr_bytes = rq->hard_nr_sectors <<9 ; + nr_bytes =blk_rq_sectors (rq) <<9 ; rc =ide_end_rq (drive, rq, error, nr_bytes);if (rc ==0 )
drivers/message/i2o/i2o_block.c +1 -1
@@ -427,7 +427,7 @@ static void i2o_block_end_request(struct request *req, int error,unsigned long flags;if (blk_end_request (req, error, nr_bytes)) { -int leftover = (req->hard_nr_sectors <<KERNEL_SECTOR_SHIFT ); +int leftover = (blk_rq_sectors (req) <<KERNEL_SECTOR_SHIFT );if (blk_pc_request (req)) leftover = req->data_len;
drivers/scsi/scsi_lib.c +1 -1
@@ -546,7 +546,7 @@ static struct scsi_cmnd *scsi_end_request(struct scsi_cmnd *cmd, int error,* to queue the remainder of them. */ if (blk_end_request (req, error, bytes)) { -int leftover = (req->hard_nr_sectors <<9 ); +int leftover =blk_rq_sectors (req) <<9 ;if (blk_pc_request (req)) leftover = req->resid_len;
include/linux/blkdev.h +20 -3
@@ -832,13 +832,30 @@ static inline void blk_run_address_space(struct address_space *mapping)extern void blkdev_dequeue_request (struct request *req);/* -* blk_end_request() takes bytes instead of sectors as a complete size. -* blk_rq_bytes() returns bytes left to complete in the entire request. -* blk_rq_cur_bytes() returns bytes left to complete in the current segment. +* blk_rq_pos() : the current sector +* blk_rq_bytes() : bytes left in the entire request +* blk_rq_cur_bytes() : bytes left in the current segment +* blk_rq_sectors() : sectors left in the entire request +* blk_rq_cur_sectors() : sectors left in the current segment */ +static inline sector_t blk_rq_pos (struct request *rq) +{ +return rq->hard_sector; +} +extern unsigned int blk_rq_bytes (struct request *rq);extern unsigned int blk_rq_cur_bytes (struct request *rq); +static inline unsigned int blk_rq_sectors (struct request *rq) +{ +return rq->hard_nr_sectors; +} + +static inline unsigned int blk_rq_cur_sectors (struct request *rq) +{ +return rq->hard_cur_sectors; +} +/* * Request completion related functions. *
kernel/trace/blktrace.c +2 -2
@@ -646,7 +646,7 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq, rq->cmd_len, rq->cmd); }else { what |=BLK_TC_ACT (BLK_TC_FS ); -__blk_add_trace (bt, rq->hard_sector, rq->hard_nr_sectors <<9 , +__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_sectors (rq) <<9 , rw, what, rq->errors,0 ,NULL ); } }
@@ -857,7 +857,7 @@ void blk_add_driver_data(struct request_queue *q,__blk_add_trace (bt,0 , rq->data_len,0 ,BLK_TA_DRV_DATA , rq->errors, len, data); else - __blk_add_trace(bt, rq->hard_sector, rq->hard_nr_sectors << 9, + __blk_add_trace(bt, blk_rq_pos(rq), blk_rq_sectors(rq) << 9, 0, BLK_TA_DRV_DATA, rq->errors, len, data); }EXPORT_SYMBOL_GPL (blk_add_driver_data);
Signature · 1 line
1.6.0.2
PATCH 5/10 block: convert to pos and nr_sectors accessors
In reply to Tejun HeoWith recent cleanups, there is no place where low level driver directly manipulates request fields. This means that the 'hard' request fields always equal the !hard fields. Convert all rq->sectors, nr_sectors and current_nr_sectors references to accessors.
[ Impact: use pos and nr_sectors accessors ]
--- arch/um/drivers/ubd_kern.c | 2 +- block/as-iosched.c | 18 ++++++----- block/blk-barrier.c | 2 +- block/blk-core.c | 17 +++++------ block/blk-merge.c | 10 +++--- block/cfq-iosched.c | 18 ++++++------ block/deadline-iosched.c | 2 +- block/elevator.c | 22 +++++++------- drivers/block/DAC960.c | 6 ++-- drivers/block/amiflop.c | 6 ++-- drivers/block/ataflop.c | 10 +++--- drivers/block/cciss.c | 22 +++++++------- drivers/block/cpqarray.c | 9 +++-- drivers/block/floppy.c | 53 ++++++++++++++++++----------------- drivers/block/hd.c | 14 ++++---- drivers/block/nbd.c | 12 ++++---- drivers/block/paride/pcd.c | 4 +- drivers/block/paride/pd.c | 8 ++-- drivers/block/paride/pf.c | 8 ++-- drivers/block/ps3disk.c | 9 ++--- drivers/block/sunvdc.c | 2 +- drivers/block/swim3.c | 34 ++++++++++++---------- drivers/block/sx8.c | 6 ++-- drivers/block/ub.c | 6 ++-- drivers/block/viodasd.c | 2 +- drivers/block/virtio_blk.c | 2 +- drivers/block/xd.c | 4 +- drivers/block/xen-blkfront.c | 11 +++---- drivers/block/xsysace.c | 17 ++++++----- drivers/block/z2ram.c | 6 ++-- drivers/cdrom/gdrom.c | 6 ++-- drivers/cdrom/viocd.c | 2 +- drivers/memstick/core/mspro_block.c | 6 ++-- drivers/message/i2o/i2o_block.c | 20 +++++++------ drivers/mmc/card/block.c | 10 +++--- drivers/mtd/mtd_blkdevs.c | 7 ++-- drivers/s390/block/dasd.c | 2 +- drivers/s390/block/dasd_diag.c | 5 ++- drivers/s390/block/dasd_eckd.c | 6 ++-- drivers/s390/block/dasd_fba.c | 7 ++-- drivers/s390/char/tape_34xx.c | 2 +- drivers/s390/char/tape_3590.c | 2 +- drivers/s390/char/tape_block.c | 2 +- drivers/sbus/char/jsflash.c | 4 +- drivers/scsi/eata.c | 24 ++++++++-------- drivers/scsi/lpfc/lpfc_scsi.c | 22 +++++++------- drivers/scsi/scsi_lib.c | 6 ++-- drivers/scsi/sd.c | 24 ++++++++-------- drivers/scsi/sd_dif.c | 2 +- drivers/scsi/sr.c | 15 +++++---- drivers/scsi/u14-34f.c | 22 ++++++++------ include/scsi/scsi_cmnd.h | 2 +- 52 files changed, 276 insertions(+), 264 deletions(-)
arch/um/drivers/ubd_kern.c +1 -1
@@ -1239,7 +1239,7 @@ static void do_ubd_request(struct request_queue *q) } req = dev->request; - sector = req->sector; + sector =blk_rq_pos (req);while (dev->start_sg < dev->end_sg){struct scatterlist *sg = &dev->sg[dev->start_sg];
block/as-iosched.c +10 -8
@@ -306,8 +306,8 @@ as_choose_req(struct as_data *ad, struct request *rq1, struct request *rq2) data_dir =rq_is_sync (rq1); last = ad->last_sector[data_dir]; - s1 = rq1->sector; - s2 = rq2->sector; + s1 =blk_rq_pos (rq1); + s2 =blk_rq_pos (rq2);BUG_ON (data_dir !=rq_is_sync (rq2));
@@ -566,13 +566,15 @@ static void as_update_iohist(struct as_data *ad, struct as_io_context *aic,as_update_thinktime (ad, aic, thinktime);/* Calculate read -> read seek distance */ -if (aic->last_request_pos < rq->sector) - seek_dist = rq->sector - aic->last_request_pos; +if (aic->last_request_pos <blk_rq_pos (rq)) + seek_dist =blk_rq_pos (rq) - + aic->last_request_pos;else - seek_dist = aic->last_request_pos - rq->sector; + seek_dist = aic->last_request_pos - +blk_rq_pos (rq);as_update_seekdist (ad, aic, seek_dist); } - aic->last_request_pos = rq->sector + rq->nr_sectors; + aic->last_request_pos =blk_rq_pos (rq) +blk_rq_sectors (rq);set_bit (AS_TASK_IOSTARTED , &aic->state);spin_unlock (&aic->lock); }
@@ -587,7 +589,7 @@ static int as_close_req(struct as_data *ad, struct as_io_context *aic, {unsigned long delay;/* jiffies */ sector_t last = ad->last_sector[ad->batch_data_dir]; -sector_t next = rq->sector; +sector_t next =blk_rq_pos (rq);sector_t delta;/* acceptable close offset (in sectors) */ sector_t s;
@@ -981,7 +983,7 @@ static void as_move_to_dispatch(struct as_data *ad, struct request *rq)* This has to be set in order to be correctly updated by * as_find_next_rq */ - ad->last_sector[data_dir] = rq->sector + rq->nr_sectors; + ad->last_sector[data_dir] =blk_rq_pos (rq) +blk_rq_sectors (rq);if (data_dir ==BLK_RW_SYNC ) {struct io_context *ioc =RQ_IOC (rq);
block/blk-barrier.c +1 -1
@@ -324,7 +324,7 @@ int blkdev_issue_flush(struct block_device *bdev, sector_t *error_sector)/* * The driver must store the error location in ->bi_sector, if * it supports it. For non-stacked drivers, this should be copied -* from rq->sector. +* from blk_rq_pos(rq). */ if (error_sector) *error_sector = bio->bi_sector;
block/blk-core.c +8 -9
@@ -72,7 +72,7 @@ static void drive_stat_acct(struct request *rq, int new_io)return ; cpu =part_stat_lock (); - part =disk_map_sector_rcu (rq->rq_disk, rq->sector); + part =disk_map_sector_rcu (rq->rq_disk,blk_rq_pos (rq));if (!new_io)part_stat_inc (cpu, part, merges[rw]);
@@ -185,10 +185,9 @@ void blk_dump_rq_flags(struct request *rq, char *msg) rq->rq_disk ? rq->rq_disk->disk_name :"?" , rq->cmd_type, rq->cmd_flags); -printk (KERN_INFO " sector %llu, nr/cnr %lu/%u\n" , - (unsigned long long )rq->sector, - rq->nr_sectors, - rq->current_nr_sectors); +printk (KERN_INFO " sector %llu, nr/cnr %u/%u\n" , + (unsigned long long )blk_rq_pos (rq), +blk_rq_sectors (rq),blk_rq_cur_sectors (rq));printk (KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n" , rq->bio, rq->biotail, rq->buffer, rq->data_len);
@@ -1557,7 +1556,7 @@ EXPORT_SYMBOL(submit_bio);*/ int blk_rq_check_limits (struct request_queue *q,struct request *rq) { -if (rq->nr_sectors > q->max_sectors || +if (blk_rq_sectors (rq) > q->max_sectors || rq->data_len > q->max_hw_sectors <<9 ) {printk (KERN_ERR "%s: over max size limit.\n" , __func__);return -EIO ;
@@ -1645,7 +1644,7 @@ static void blk_account_io_completion(struct request *req, unsigned int bytes)int cpu; cpu =part_stat_lock (); - part =disk_map_sector_rcu (req->rq_disk, req->sector); + part =disk_map_sector_rcu (req->rq_disk,blk_rq_pos (req));part_stat_add (cpu, part, sectors[rw], bytes >>9 );part_stat_unlock (); }
@@ -1665,7 +1664,7 @@ static void blk_account_io_done(struct request *req)int cpu; cpu =part_stat_lock (); - part =disk_map_sector_rcu (req->rq_disk, req->sector); + part =disk_map_sector_rcu (req->rq_disk,blk_rq_pos (req));part_stat_inc (cpu, part, ios[rw]);part_stat_add (cpu, part, ticks[rw], duration);
@@ -1846,7 +1845,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)if (error && (blk_fs_request (req) && !(req->cmd_flags &REQ_QUIET ))) {printk (KERN_ERR "end_request: I/O error, dev %s, sector %llu\n" , req->rq_disk ? req->rq_disk->disk_name :"?" , - (unsigned long long )req->sector); + (unsigned long long )blk_rq_pos (req)); }blk_account_io_completion (req, nr_bytes);
block/blk-merge.c +5 -5
@@ -259,7 +259,7 @@ int ll_back_merge_fn(struct request_queue *q, struct request *req,else max_sectors = q->max_sectors; -if (req->nr_sectors +bio_sectors (bio) > max_sectors) { +if (blk_rq_sectors (req) +bio_sectors (bio) > max_sectors) { req->cmd_flags |=REQ_NOMERGE ;if (req == q->last_merge) q->last_merge =NULL ;
@@ -284,7 +284,7 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req, max_sectors = q->max_sectors; -if (req->nr_sectors +bio_sectors (bio) > max_sectors) { +if (blk_rq_sectors (req) +bio_sectors (bio) > max_sectors) { req->cmd_flags |=REQ_NOMERGE ;if (req == q->last_merge) q->last_merge =NULL ;
@@ -315,7 +315,7 @@ static int ll_merge_requests_fn(struct request_queue *q, struct request *req,/* * Will it become too large? */ -if ((req->nr_sectors + next->nr_sectors) > q->max_sectors) +if ((blk_rq_sectors (req) +blk_rq_sectors (next)) > q->max_sectors)return 0 ; total_phys_segments = req->nr_phys_segments + next->nr_phys_segments;
@@ -345,7 +345,7 @@ static void blk_account_io_merge(struct request *req)int cpu; cpu =part_stat_lock (); - part =disk_map_sector_rcu (req->rq_disk, req->sector); + part =disk_map_sector_rcu (req->rq_disk,blk_rq_pos (req));part_round_stats (cpu, part);part_dec_in_flight (part);
@@ -366,7 +366,7 @@ static int attempt_merge(struct request_queue *q, struct request *req,/* * not contiguous */ -if (req->sector + req->nr_sectors != next->sector) +if (blk_rq_pos (req) +blk_rq_sectors (req) !=blk_rq_pos (next))return 0 ; if (rq_data_dir(req) != rq_data_dir(next)
block/cfq-iosched.c +9 -9
@@ -349,8 +349,8 @@ cfq_choose_req(struct cfq_data *cfqd, struct request *rq1, struct request *rq2)else if (rq_is_meta (rq2) && !rq_is_meta (rq1))return rq2; - s1 = rq1->sector; - s2 = rq2->sector; + s1 =blk_rq_pos (rq1); + s2 =blk_rq_pos (rq2); last = cfqd->last_position;
@@ -949,10 +949,10 @@ static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd,static inline sector_t cfq_dist_from_last (struct cfq_data *cfqd,struct request *rq) { -if (rq->sector >= cfqd->last_position) -return rq->sector - cfqd->last_position; +if (blk_rq_pos (rq) >= cfqd->last_position) +return blk_rq_pos (rq) - cfqd->last_position;else -return cfqd->last_position - rq->sector; +return cfqd->last_position -blk_rq_pos (rq); }#define CIC_SEEK_THR 8 * 1024
@@ -1918,10 +1918,10 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,if (!cic->last_request_pos) sdist =0 ; -else if (cic->last_request_pos < rq->sector) - sdist = rq->sector - cic->last_request_pos; +else if (cic->last_request_pos <blk_rq_pos (rq)) + sdist =blk_rq_pos (rq) - cic->last_request_pos;else - sdist = cic->last_request_pos - rq->sector; + sdist = cic->last_request_pos -blk_rq_pos (rq);/* * Don't allow the seek distance to get too large from the
@@ -2071,7 +2071,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,cfq_update_io_seektime (cfqd, cic, rq);cfq_update_idle_window (cfqd, cfqq, cic); - cic->last_request_pos = rq->sector + rq->nr_sectors; + cic->last_request_pos =blk_rq_pos (rq) +blk_rq_sectors (rq);if (cfqq == cfqd->active_queue) {/*
block/deadline-iosched.c +1 -1
@@ -138,7 +138,7 @@ deadline_merge(struct request_queue *q, struct request **req, struct bio *bio) __rq =elv_rb_find (&dd->sort_list[bio_data_dir (bio)], sector);if (__rq) { -BUG_ON (sector != __rq->sector); +BUG_ON (sector !=blk_rq_pos (__rq));if (elv_rq_merge_ok (__rq, bio)) { ret =ELEVATOR_FRONT_MERGE ;
block/elevator.c +11 -11
@@ -52,7 +52,7 @@ static const int elv_hash_shift = 6;#define ELV_HASH_FN (sec) \ (hash_long(ELV_HASH_BLOCK((sec)), elv_hash_shift))#define ELV_HASH_ENTRIES (1 << elv_hash_shift) -#define rq_hash_key (rq) ((rq)->sector + (rq)->nr_sectors) +#define rq_hash_key (rq) (blk_rq_pos(rq) + blk_rq_sectors(rq))DEFINE_TRACE (block_rq_insert);DEFINE_TRACE (block_rq_issue);
@@ -119,9 +119,9 @@ static inline int elv_try_merge(struct request *__rq, struct bio *bio)* we can merge and sequence is ok, check if it's possible */ if (elv_rq_merge_ok (__rq, bio)) { -if (__rq->sector + __rq->nr_sectors == bio->bi_sector) +if (blk_rq_pos (__rq) +blk_rq_sectors (__rq) == bio->bi_sector) ret =ELEVATOR_BACK_MERGE ; -else if (__rq->sector -bio_sectors (bio) == bio->bi_sector) +else if (blk_rq_pos (__rq) -bio_sectors (bio) == bio->bi_sector) ret =ELEVATOR_FRONT_MERGE ; }
@@ -370,9 +370,9 @@ struct request *elv_rb_add(struct rb_root *root, struct request *rq) parent = *p; __rq = rb_entry(parent, struct request, rb_node); -if (rq->sector < __rq->sector) +if (blk_rq_pos (rq) <blk_rq_pos (__rq)) p = &(*p)->rb_left; -else if (rq->sector > __rq->sector) +else if (blk_rq_pos (rq) >blk_rq_pos (__rq)) p = &(*p)->rb_right;else return __rq;
@@ -400,9 +400,9 @@ struct request *elv_rb_find(struct rb_root *root, sector_t sector)while (n) { rq = rb_entry(n, struct request, rb_node); -if (sector < rq->sector) +if (sector <blk_rq_pos (rq)) n = n->rb_left; -else if (sector > rq->sector) +else if (sector >blk_rq_pos (rq)) n = n->rb_right;else return rq;
@@ -441,14 +441,14 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq)break ;if (pos->cmd_flags & stop_flags)break ; -if (rq->sector >= boundary) { -if (pos->sector < boundary) +if (blk_rq_pos (rq) >= boundary) { +if (blk_rq_pos (pos) < boundary)continue ; }else { -if (pos->sector >= boundary) +if (blk_rq_pos (pos) >= boundary)break ; } -if (rq->sector >= pos->sector) +if (blk_rq_pos (rq) >=blk_rq_pos (pos))break ; }
drivers/block/DAC960.c +3 -3
@@ -3338,8 +3338,8 @@ static int DAC960_process_queue(DAC960_Controller_T *Controller, struct request_ } Command->Completion = Request->end_io_data; Command->LogicalDriveNumber = (long )Request->rq_disk->private_data; - Command->BlockNumber = Request->sector; - Command->BlockCount = Request->nr_sectors; + Command->BlockNumber =blk_rq_pos (Request); + Command->BlockCount =blk_rq_sectors (Request); Command->Request = Request;blkdev_dequeue_request (Request); Command->SegmentCount = blk_rq_map_sg(req_q,
@@ -3431,7 +3431,7 @@ static void DAC960_queue_partial_rw(DAC960_Command_T *Command)* successfully as possible. */ Command->SegmentCount =1 ; - Command->BlockNumber = Request->sector; + Command->BlockNumber =blk_rq_pos (Request); Command->BlockCount =1 ;DAC960_QueueReadWriteCommand (Command);return ;
drivers/block/amiflop.c +3 -3
@@ -1351,13 +1351,13 @@ static void redo_fd_request(void) drive = floppy - unit;/* Here someone could investigate to be more efficient */ -for (cnt =0 ; cnt <CURRENT ->current_nr_sectors; cnt++) { +for (cnt =0 ; cnt <blk_rq_cur_sectors (CURRENT ); cnt++) {#ifdef DEBUG printk ("fd: sector %ld + %d requested for %s\n" , -CURRENT ->sector,cnt, +blk_rq_pos (CURRENT ), cnt, (rq_data_dir (CURRENT ) ==READ ) ?"read" :"write" );#endif - block =CURRENT ->sector + cnt; + block =blk_rq_pos (CURRENT ) + cnt;if ((int )block > floppy->blocks) {__blk_end_request_cur (CURRENT , -EIO ); goto repeat;
drivers/block/ataflop.c +5 -5
@@ -725,7 +725,7 @@ static void do_fd_action( int drive )if (IS_BUFFERED ( drive, ReqSide, ReqTrack )) {if (ReqCmd ==READ ) {copy_buffer (SECTOR_BUFFER (ReqSector), ReqData ); -if (++ReqCnt <CURRENT ->current_nr_sectors) { +if (++ReqCnt <blk_rq_cur_sectors (CURRENT )) {/* read next sector */ setup_req_params ( drive ); goto repeat;
@@ -1130,7 +1130,7 @@ static void fd_rwsec_done1(int status) } } -if (++ReqCnt <CURRENT ->current_nr_sectors) { +if (++ReqCnt <blk_rq_cur_sectors (CURRENT )) {/* read next sector */ setup_req_params ( SelectedDrive );do_fd_action ( SelectedDrive );
@@ -1394,7 +1394,7 @@ static void redo_fd_request(void)DPRINT (("redo_fd_request: CURRENT=%p dev=%s CURRENT->sector=%ld\n" ,CURRENT ,CURRENT ?CURRENT ->rq_disk->disk_name :"" , -CURRENT ?CURRENT ->sector :0 )); +CURRENT ?blk_rq_pos (CURRENT ) :0 )); IsFormatting =0 ;
@@ -1440,7 +1440,7 @@ repeat:UD .autoprobe =0 ; } -if (CURRENT ->sector +1 >UDT ->blocks) { +if (blk_rq_pos (CURRENT ) +1 >UDT ->blocks) {__blk_end_request_cur (CURRENT , -EIO ); goto repeat; }
@@ -1450,7 +1450,7 @@ repeat: ReqCnt =0 ; ReqCmd =rq_data_dir (CURRENT ); - ReqBlock =CURRENT ->sector; + ReqBlock =blk_rq_pos (CURRENT ); ReqBuffer =CURRENT ->buffer;setup_req_params ( drive );do_fd_action ( drive );
drivers/block/cciss.c +11 -11
@@ -2835,10 +2835,10 @@ static void do_cciss_request(struct request_queue *q) c->Request.Timeout =0 ;// Don't time out c->Request.CDB[0 ] = (rq_data_dir (creq) ==READ ) ? h->cciss_read : h->cciss_write; - start_blk = creq->sector; + start_blk =blk_rq_pos (creq);#ifdef CCISS_DEBUG -printk (KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n" , (int )creq->sector, - (int )creq->nr_sectors); +printk (KERN_DEBUG "ciss: sector =%d nr_sectors=%d\n" , + (int )blk_rq_pos (creq), (int )blk_rq_sectors (creq));#endif /* CCISS_DEBUG */ sg_init_table (tmp_sg,MAXSGENTRIES );
@@ -2864,8 +2864,8 @@ static void do_cciss_request(struct request_queue *q) h->maxSG = seg;#ifdef CCISS_DEBUG -printk (KERN_DEBUG "cciss: Submitting %lu sectors in %d segments\n" , - creq->nr_sectors, seg); +printk (KERN_DEBUG "cciss: Submitting %u sectors in %d segments\n" , +blk_rq_sectors (creq), seg);#endif /* CCISS_DEBUG */ c->Header.SGList = c->Header.SGTotal = seg;
@@ -2877,8 +2877,8 @@ static void do_cciss_request(struct request_queue *q) c->Request.CDB[4 ] = (start_blk >>8 ) &0xff ; c->Request.CDB[5 ] = start_blk &0xff ; c->Request.CDB[6 ] =0 ;// (sect >> 24) & 0xff; MSB - c->Request.CDB[7 ] = (creq->nr_sectors >>8 ) &0xff ; - c->Request.CDB[8 ] = creq->nr_sectors &0xff ; + c->Request.CDB[7 ] = (blk_rq_sectors (creq) >>8 ) &0xff ; + c->Request.CDB[8 ] =blk_rq_sectors (creq) &0xff ; c->Request.CDB[9 ] = c->Request.CDB[11 ] = c->Request.CDB[12 ] =0 ; }else {u32 upper32 =upper_32_bits (start_blk);
@@ -2893,10 +2893,10 @@ static void do_cciss_request(struct request_queue *q) c->Request.CDB[7 ]= (start_blk >>16 ) &0xff ; c->Request.CDB[8 ]= (start_blk >>8 ) &0xff ; c->Request.CDB[9 ]= start_blk &0xff ; - c->Request.CDB[10 ]= (creq->nr_sectors >>24 ) &0xff ; - c->Request.CDB[11 ]= (creq->nr_sectors >>16 ) &0xff ; - c->Request.CDB[12 ]= (creq->nr_sectors >>8 ) &0xff ; - c->Request.CDB[13 ]= creq->nr_sectors &0xff ; + c->Request.CDB[10 ]= (blk_rq_sectors (creq) >>24 ) &0xff ; + c->Request.CDB[11 ]= (blk_rq_sectors (creq) >>16 ) &0xff ; + c->Request.CDB[12 ]= (blk_rq_sectors (creq) >>8 ) &0xff ; + c->Request.CDB[13 ]=blk_rq_sectors (creq) &0xff ; c->Request.CDB[14 ] = c->Request.CDB[15 ] =0 ; } }else if (blk_pc_request (creq)) {
drivers/block/cpqarray.c +5 -4
@@ -919,10 +919,11 @@ queue_next: c->hdr.size =sizeof (rblk_t) >>2 ; c->size +=sizeof (rblk_t); - c->req.hdr.blk = creq->sector; + c->req.hdr.blk =blk_rq_pos (creq); c->rq = creq;DBGPX ( - printk("sector=%d, nr_sectors=%d\n", creq->sector, creq->nr_sectors); +printk ("sector=%d, nr_sectors=%u\n" , + blk_rq_pos(creq), blk_rq_sectors(creq)); );sg_init_table (tmp_sg,SG_MAX ); seg =blk_rq_map_sg (q, creq, tmp_sg);
@@ -940,9 +941,9 @@ DBGPX( tmp_sg[i].offset, tmp_sg[i].length, dir); } -DBGPX( printk("Submitting %d sectors in %d segments\n", creq->nr_sectors, seg); ); +DBGPX( printk("Submitting %u sectors in %d segments\n", blk_rq_sectors(creq), seg); ); c->req.hdr.sg_cnt = seg; - c->req.hdr.blk_cnt = creq->nr_sectors; + c->req.hdr.blk_cnt =blk_rq_sectors (creq); c->req.hdr.cmd = (rq_data_dir (creq) ==READ ) ?IDA_READ :IDA_WRITE ; c->type =CMD_RWREQ ;
drivers/block/floppy.c +27 -26
146 lines not on this page · raw message
drivers/block/hd.c +7 -7
@@ -228,7 +228,7 @@ static void dump_status(const char *msg, unsigned int stat)printk (", CHS=%d/%d/%d" , (inb (HD_HCYL )<<8 ) +inb (HD_LCYL ),inb (HD_CURRENT ) &0xf ,inb (HD_SECTOR ));if (CURRENT ) -printk (", sector=%ld" ,CURRENT ->sector); +printk (", sector=%ld" ,blk_rq_pos (CURRENT )); }printk ("\n" ); }
@@ -457,9 +457,9 @@ ok_to_read: req =CURRENT ;insw (HD_DATA , req->buffer,256 );#ifdef DEBUG -printk ("%s: read: sector %ld, remaining = %ld, buffer=%p\n" , - req->rq_disk->disk_name, req->sector +1 , req->nr_sectors -1 , - req->buffer+512 ); +printk ("%s: read: sector %ld, remaining = %u, buffer=%p\n" , + req->rq_disk->disk_name,blk_rq_pos (req) +1 , +blk_rq_sectors (req) -1 , req->buffer+512 );#endif if (__blk_end_request (req,0 ,512 )) {SET_HANDLER (&read_intr);
@@ -485,7 +485,7 @@ static void write_intr(void)continue ;if (!OK_STATUS (i))break ; -if ((req->nr_sectors <=1 ) || (i &DRQ_STAT )) +if ((blk_rq_sectors (req) <=1 ) || (i &DRQ_STAT )) goto ok_to_write; }while (--retries >0 );dump_status ("write_intr" , i);
@@ -589,8 +589,8 @@ repeat:return ; } disk = req->rq_disk->private_data; - block = req->sector; - nsect = req->nr_sectors; + block =blk_rq_pos (req); + nsect =blk_rq_sectors (req);if (block >=get_capacity (req->rq_disk) || ((block+nsect) >get_capacity (req->rq_disk))) { printk("%s: bad access: block=%d, count=%d\n",
drivers/block/nbd.c +6 -6
@@ -110,7 +110,7 @@ static void nbd_end_request(struct request *req) req, error ? "failed" : "done");spin_lock_irqsave (q->queue_lock, flags); -__blk_end_request (req, error, req->nr_sectors <<9 ); +__blk_end_request (req, error,blk_rq_sectors (req) <<9 );spin_unlock_irqrestore (q->queue_lock, flags); }
@@ -231,19 +231,19 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req) {int result, flags;struct nbd_request request; -unsigned long size = req->nr_sectors <<9 ; +unsigned long size =blk_rq_sectors (req) <<9 ; request.magic =htonl (NBD_REQUEST_MAGIC ); request.type =htonl (nbd_cmd (req)); - request.from =cpu_to_be64 ((u64 ) req->sector <<9 ); + request.from =cpu_to_be64 ((u64 )blk_rq_pos (req) <<9 ); request.len =htonl (size);memcpy (request.handle, &req,sizeof (req)); -dprintk (DBG_TX ,"%s: request %p: sending control (%s@%llu,%luB)\n" , +dprintk (DBG_TX ,"%s: request %p: sending control (%s@%llu,%uB)\n" , lo->disk->disk_name, req,nbdcmd_to_ascii (nbd_cmd (req)), - (unsigned long long )req->sector <<9 , - req->nr_sectors <<9 ); + (unsigned long long )blk_rq_pos (req) <<9 , +blk_rq_sectors (req) <<9 ); result =sock_xmit (lo,1 , &request,sizeof (request), (nbd_cmd (req) ==NBD_CMD_WRITE ) ?MSG_MORE :0 );if (result <=0 ) {
drivers/block/paride/pcd.c +2 -2
@@ -728,8 +728,8 @@ static void do_pcd_request(struct request_queue * q)if (cd != pcd_current) pcd_bufblk =-1 ; pcd_current = cd; - pcd_sector = pcd_req->sector; - pcd_count = pcd_req->current_nr_sectors; + pcd_sector =blk_rq_pos (pcd_req); + pcd_count =blk_rq_cur_sectors (pcd_req); pcd_buf = pcd_req->buffer; pcd_busy =1 ;ps_set_intr (do_pcd_read,NULL ,0 , nice);
drivers/block/paride/pd.c +4 -4
@@ -444,11 +444,11 @@ static enum action do_pd_io_start(void) pd_cmd =rq_data_dir (pd_req);if (pd_cmd ==READ || pd_cmd ==WRITE ) { - pd_block = pd_req->sector; - pd_count = pd_req->current_nr_sectors; + pd_block =blk_rq_pos (pd_req); + pd_count =blk_rq_cur_sectors (pd_req);if (pd_block + pd_count >get_capacity (pd_req->rq_disk))return Fail; - pd_run = pd_req->nr_sectors; + pd_run =blk_rq_sectors (pd_req); pd_buf = pd_req->buffer; pd_retries =0 ;if (pd_cmd ==READ )
@@ -479,7 +479,7 @@ static int pd_next_buf(void)return 0 ;spin_lock_irqsave (&pd_lock, saved_flags);__blk_end_request_cur (pd_req,0 ); - pd_count = pd_req->current_nr_sectors; + pd_count =blk_rq_cur_sectors (pd_req); pd_buf = pd_req->buffer;spin_unlock_irqrestore (&pd_lock, saved_flags);return 0 ;
drivers/block/paride/pf.c +4 -4
@@ -768,9 +768,9 @@ repeat:return ; pf_current = pf_req->rq_disk->private_data; - pf_block = pf_req->sector; - pf_run = pf_req->nr_sectors; - pf_count = pf_req->current_nr_sectors; + pf_block =blk_rq_pos (pf_req); + pf_run =blk_rq_sectors (pf_req); + pf_count =blk_rq_cur_sectors (pf_req);if (pf_block + pf_count >get_capacity (pf_req->rq_disk)) {pf_end_request (-EIO );
@@ -810,7 +810,7 @@ static int pf_next_buf(void)spin_unlock_irqrestore (&pf_spin_lock, saved_flags);if (!pf_req)return 1 ; - pf_count = pf_req->current_nr_sectors; + pf_count =blk_rq_cur_sectors (pf_req); pf_buf = pf_req->buffer; }return 0 ;
drivers/block/ps3disk.c +4 -5
@@ -134,13 +134,12 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,rq_for_each_segment (bv, req, iter) n++;dev_dbg (&dev->sbd.core, -"%s:%u: %s req has %u bvecs for %lu sectors %lu hard sectors\n" , - __func__, __LINE__, op, n, req->nr_sectors, -blk_rq_sectors (req)); +"%s:%u: %s req has %u bvecs for %u sectors\n" , + __func__, __LINE__, op, n,blk_rq_sectors (req));#endif - start_sector = req->sector * priv->blocking_factor; - sectors = req->nr_sectors * priv->blocking_factor; + start_sector =blk_rq_pos (req) * priv->blocking_factor; + sectors =blk_rq_sectors (req) * priv->blocking_factor;dev_dbg (&dev->sbd.core,"%s:%u: %s %llu sectors starting at %llu\n" , __func__, __LINE__, op, sectors, start_sector);
drivers/block/sunvdc.c +1 -1
@@ -416,7 +416,7 @@ static int __send_request(struct request *req) desc->slice =0 ; } desc->status = ~0 ; - desc->offset = (req->sector <<9 ) / port->vdisk_block_size; + desc->offset = (blk_rq_pos (req) <<9 ) / port->vdisk_block_size; desc->size = len; desc->ncookies = err;
drivers/block/swim3.c +18 -16
@@ -312,14 +312,14 @@ static void start_request(struct floppy_state *fs) }while (fs->state == idle && (req =elv_next_request (swim3_queue))) {#if 0 -printk ("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%ld buf=%p\n" , +printk ("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%u buf=%p\n" , req->rq_disk->disk_name, req->cmd, - (long )req->sector, req->nr_sectors, req->buffer); -printk (" errors=%d current_nr_sectors=%ld\n" , - req->errors, req->current_nr_sectors); + (long )blk_rq_pos (req),blk_rq_sectors (req), req->buffer); +printk (" errors=%d current_nr_sectors=%u\n" , + req->errors,blk_rq_cur_sectors (req));#endif -if (req->sector >= fs->total_secs) { +if (blk_rq_pos (req) >= fs->total_secs) {__blk_end_request_cur (req, -EIO );continue ; }
@@ -337,13 +337,14 @@ static void start_request(struct floppy_state *fs) } } -/* Do not remove the cast. req->sector is now a sector_t and -* can be 64 bits, but it will never go past 32 bits for this -* driver anyway, so we can safely cast it down and not have -* to do a 64/32 division +/* Do not remove the cast. blk_rq_pos(req) is now a +* sector_t and can be 64 bits, but it will never go +* past 32 bits for this driver anyway, so we can +* safely cast it down and not have to do a 64/32 +* division */ - fs->req_cyl = ((long )req->sector) / fs->secpercyl; - x = ((long )req->sector) % fs->secpercyl; + fs->req_cyl = ((long )blk_rq_pos (req)) / fs->secpercyl; + x = ((long )blk_rq_pos (req)) % fs->secpercyl; fs->head = x / fs->secpertrack; fs->req_sector = x % fs->secpertrack +1 ; fd_req = req;
@@ -420,7 +421,7 @@ static inline void setup_transfer(struct floppy_state *fs)struct dbdma_cmd *cp = fs->dma_cmd;struct dbdma_regs __iomem *dr = fs->dma; -if (fd_req->current_nr_sectors <=0 ) { +if (blk_rq_cur_sectors (fd_req) <=0 ) {printk (KERN_ERR "swim3: transfer 0 sectors?\n" );return ; }
@@ -428,8 +429,8 @@ static inline void setup_transfer(struct floppy_state *fs) n =1 ; else { n = fs->secpertrack - fs->req_sector +1 ; -if (n > fd_req->current_nr_sectors) - n = fd_req->current_nr_sectors; +if (n >blk_rq_cur_sectors (fd_req)) + n =blk_rq_cur_sectors (fd_req); } fs->scount = n;swim3_select (fs, fs->head?READ_DATA_1 :READ_DATA_0 );
@@ -600,7 +601,8 @@ static void xfer_timeout(unsigned long data)out_8 (&sw->control_bic,WRITE_SECTORS |DO_ACTION );out_8 (&sw->select,RELAX );printk (KERN_ERR "swim3: timeout %sing sector %ld\n" , - (rq_data_dir (fd_req)==WRITE ?"writ" :"read" ), (long )fd_req->sector); + (rq_data_dir (fd_req)==WRITE ?"writ" :"read" ), + (long )blk_rq_pos (fd_req));__blk_end_request_cur (fd_req, -EIO ); fs->state = idle;start_request (fs);
@@ -714,7 +716,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id) }else {printk ("swim3: error %sing block %ld (err=%x)\n" ,rq_data_dir (fd_req) ==WRITE ?"writ" :"read" , - (long )fd_req->sector, err); + (long )blk_rq_pos (fd_req), err);__blk_end_request_cur (fd_req, -EIO ); fs->state = idle; }
drivers/block/sx8.c +3 -3
@@ -903,10 +903,10 @@ queue_one_request: msg->sg_count = n_elem; msg->sg_type =SGT_32BIT ; msg->handle =cpu_to_le32 (TAG_ENCODE (crq->tag)); - msg->lba =cpu_to_le32 (rq->sector &0xffffffff ); - tmp = (rq->sector >>16 ) >>16 ; + msg->lba =cpu_to_le32 (blk_rq_pos (rq) &0xffffffff ); + tmp = (blk_rq_pos (rq) >>16 ) >>16 ; msg->lba_high =cpu_to_le16 ( (u16 ) tmp ); - msg->lba_count =cpu_to_le16 (rq->nr_sectors); + msg->lba_count =cpu_to_le16 (blk_rq_sectors (rq)); msg_size =sizeof (struct carm_msg_rw ) -sizeof (msg->sg);for (i =0 ; i < n_elem; i++) {
drivers/block/ub.c +3 -3
@@ -726,8 +726,8 @@ static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,* The call to blk_queue_hardsect_size() guarantees that request * is aligned, but it is given in terms of 512 byte units, always. */ - block = rq->sector >> lun->capacity.bshift; - nblks = rq->nr_sectors >> lun->capacity.bshift; + block =blk_rq_pos (rq) >> lun->capacity.bshift; + nblks =blk_rq_sectors (rq) >> lun->capacity.bshift; cmd->cdb[0 ] = (cmd->dir ==UB_DIR_READ )?READ_10 :WRITE_10 ;/* 10-byte uses 4 bytes of LBA: 2147483648KB, 2097152MB, 2048GB */
@@ -739,7 +739,7 @@ static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, cmd->cdb[8 ] = nblks; cmd->cdb_len =10 ; - cmd->len = rq->nr_sectors *512 ; + cmd->len =blk_rq_sectors (rq) *512 ; } static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun,
drivers/block/viodasd.c +1 -1
@@ -252,7 +252,7 @@ static int send_request(struct request *req)struct viodasd_device *d;unsigned long flags; - start = (u64 )req->sector <<9 ; + start = (u64 )blk_rq_pos (req) <<9 ;if (rq_data_dir (req) ==READ ) { direction =DMA_FROM_DEVICE ;
drivers/block/virtio_blk.c +1 -1
@@ -85,7 +85,7 @@ static bool do_req(struct request_queue *q, struct virtio_blk *vblk, vbr->req = req;if (blk_fs_request (vbr->req)) { vbr->out_hdr.type =0 ; - vbr->out_hdr.sector = vbr->req->sector; + vbr->out_hdr.sector =blk_rq_pos (vbr->req); vbr->out_hdr.ioprio =req_get_ioprio (vbr->req); }else if (blk_pc_request (vbr->req)) { vbr->out_hdr.type =VIRTIO_BLK_T_SCSI_CMD ;
drivers/block/xd.c +2 -2
@@ -306,8 +306,8 @@ static void do_xd_request (struct request_queue * q)return ;while ((req =elv_next_request (q)) !=NULL ) { -unsigned block = req->sector; -unsigned count = req->nr_sectors; +unsigned block =blk_rq_pos (req); +unsigned count =blk_rq_sectors (req);XD_INFO *disk = req->rq_disk->private_data;int res =0 ;int retry;
drivers/block/xen-blkfront.c +5 -6
@@ -231,7 +231,7 @@ static int blkif_queue_request(struct request *req) info->shadow[id].request = (unsigned long )req; ring_req->id = id; - ring_req->sector_number = (blkif_sector_t )req->sector; + ring_req->sector_number = (blkif_sector_t )blk_rq_pos (req); ring_req->handle = info->handle; ring_req->operation = rq_data_dir(req) ?
@@ -310,11 +310,10 @@ static void do_blkif_request(struct request_queue *rq) goto wait;pr_debug ("do_blk_req %p: cmd %p, sec %lx, " -"(%u/%li) buffer:%p [%s]\n" , - req, req->cmd, (unsigned long )req->sector, - req->current_nr_sectors, - req->nr_sectors, req->buffer, -rq_data_dir (req) ?"write" :"read" ); +"(%u/%u) buffer:%p [%s]\n" , + req, req->cmd, (unsigned long )blk_rq_pos (req), +blk_rq_cur_sectors (req),blk_rq_sectors (req), + req->buffer,rq_data_dir (req) ?"write" :"read" );blkdev_dequeue_request (req);
drivers/block/xsysace.c +9 -8
@@ -646,13 +646,14 @@ static void ace_fsm_dostate(struct ace_device *ace)/* Okay, it's a data request, set it up for transfer */ dev_dbg (ace->dev,"request: sec=%llx hcnt=%x, ccnt=%x, dir=%i\n" , - (unsigned long long ) req->sector,blk_rq_sectors (req), - req->current_nr_sectors,rq_data_dir (req)); + (unsigned long long )blk_rq_pos (req), +blk_rq_sectors (req),blk_rq_cur_sectors (req), +rq_data_dir (req)); ace->req = req; ace->data_ptr = req->buffer; - ace->data_count = req->current_nr_sectors *ACE_BUF_PER_SECTOR ; -ace_out32 (ace,ACE_MPULBA , req->sector &0x0FFFFFFF ); + ace->data_count =blk_rq_cur_sectors (req) *ACE_BUF_PER_SECTOR ; +ace_out32 (ace,ACE_MPULBA ,blk_rq_pos (req) &0x0FFFFFFF ); count =blk_rq_sectors (req);if (rq_data_dir (req)) {
@@ -688,7 +689,7 @@ static void ace_fsm_dostate(struct ace_device *ace)dev_dbg (ace->dev,"CFBSY set; t=%i iter=%i c=%i dc=%i irq=%i\n" , ace->fsm_task, ace->fsm_iter_num, - ace->req->current_nr_sectors *16 , +blk_rq_cur_sectors (ace->req) *16 , ace->data_count, ace->in_irq);ace_fsm_yield (ace);/* need to poll CFBSY bit */ break ;
@@ -697,7 +698,7 @@ static void ace_fsm_dostate(struct ace_device *ace)dev_dbg (ace->dev,"DATABUF not set; t=%i iter=%i c=%i dc=%i irq=%i\n" , ace->fsm_task, ace->fsm_iter_num, - ace->req->current_nr_sectors *16 , +blk_rq_cur_sectors (ace->req) *16 , ace->data_count, ace->in_irq);ace_fsm_yieldirq (ace);break ;
@@ -721,10 +722,10 @@ static void ace_fsm_dostate(struct ace_device *ace) blk_rq_cur_bytes(ace->req))) {/* dev_dbg(ace->dev, "next block; h=%u c=%u\n", * blk_rq_sectors(ace->req), -* ace->req->current_nr_sectors); +* blk_rq_cur_sectors(ace->req)); */ ace->data_ptr = ace->req->buffer; - ace->data_count = ace->req->current_nr_sectors *16 ; + ace->data_count =blk_rq_cur_sectors (ace->req) *16 ;ace_fsm_yieldirq (ace);break ; }
drivers/block/z2ram.c +3 -3
@@ -71,12 +71,12 @@ static void do_z2_request(struct request_queue *q) {struct request *req;while ((req =elv_next_request (q)) !=NULL ) { -unsigned long start = req->sector <<9 ; -unsigned long len = req->current_nr_sectors <<9 ; +unsigned long start =blk_rq_pos (req) <<9 ; +unsigned long len =blk_rq_cur_sectors (req) <<9 ;if (start + len > z2ram_size) { printk( KERN_ERR DEVICE_NAME ": bad access: block=%lu, count=%u\n", - req->sector, req->current_nr_sectors); + blk_rq_pos(req), blk_rq_cur_sectors(req));__blk_end_request_cur (req, -EIO );continue ; }
drivers/cdrom/gdrom.c +3 -3
@@ -584,8 +584,8 @@ static void gdrom_readdisk_dma(struct work_struct *work)list_for_each_safe (elem, next, &gdrom_deferred) { req = list_entry(elem, struct request, queuelist);spin_unlock (&gdrom_lock); - block = req->sector/GD_TO_BLK +GD_SESSION_OFFSET ; - block_cnt = req->nr_sectors/GD_TO_BLK ; + block =blk_rq_pos (req)/GD_TO_BLK +GD_SESSION_OFFSET ; + block_cnt =blk_rq_sectors (req)/GD_TO_BLK ;ctrl_outl (PHYSADDR (req->buffer),GDROM_DMA_STARTADDR_REG );ctrl_outl (block_cnt *GDROM_HARD_SECTOR ,GDROM_DMA_LENGTH_REG );ctrl_outl (1 ,GDROM_DMA_DIRECTION_REG );
@@ -661,7 +661,7 @@ static void gdrom_request(struct request_queue *rq)printk (" write request ignored\n" );__blk_end_request_cur (req, -EIO ); } -if (req->nr_sectors) +if (blk_rq_sectors (req))gdrom_request_handler_dma (req);else __blk_end_request_cur (req, -EIO );
drivers/cdrom/viocd.c +1 -1
@@ -282,7 +282,7 @@ static int send_request(struct request *req)viopath_targetinst (viopath_hostLp), (u64 )req,VIOVERSION <<16 , ((u64 )DEVICE_NR (diskinfo) <<48 ) | dmaaddr, - (u64)req->sector * 512, len, 0); + (u64)blk_rq_pos(req) * 512, len, 0);if (hvrc != HvLpEvent_Rc_Good) {printk (VIOCD_KERN_WARNING "hv error on op %d\n" , (int )hvrc);return -1 ;
drivers/memstick/core/mspro_block.c +3 -3
@@ -677,10 +677,10 @@ try_again:continue ; } - t_sec = msb->block_req->sector <<9 ; + t_sec =blk_rq_pos (msb->block_req) <<9 ;sector_div (t_sec, msb->page_size); - count = msb->block_req->nr_sectors <<9 ; + count =blk_rq_sectors (msb->block_req) <<9 ; count /= msb->page_size; param.system = msb->system;
@@ -745,7 +745,7 @@ static int mspro_block_complete_req(struct memstick_dev *card, int error) t_len *= msb->page_size; } }else - t_len = msb->block_req->nr_sectors <<9 ; + t_len =blk_rq_sectors (msb->block_req) <<9 ;dev_dbg (&card->dev,"transferred %x (%d)\n" , t_len, error);
drivers/message/i2o/i2o_block.c +11 -9
@@ -761,7 +761,7 @@ static int i2o_block_transfer(struct request *req)break ;case CACHE_SMARTFETCH : -if (req->nr_sectors >16 ) +if (blk_rq_sectors (req) >16 ) ctl_flags =0x201F0008 ;else ctl_flags =0x001F0000 ;
@@ -781,13 +781,13 @@ static int i2o_block_transfer(struct request *req) ctl_flags =0x001F0010 ;break ;case CACHE_SMARTBACK : -if (req->nr_sectors >16 ) +if (blk_rq_sectors (req) >16 ) ctl_flags =0x001F0004 ;else ctl_flags =0x001F0010 ;break ;case CACHE_SMARTTHROUGH : -if (req->nr_sectors >16 ) +if (blk_rq_sectors (req) >16 ) ctl_flags =0x001F0004 ;else ctl_flags =0x001F0010 ;
@@ -827,22 +827,24 @@ static int i2o_block_transfer(struct request *req) *mptr++ =cpu_to_le32 (scsi_flags); - *((u32 *) & cmd[2 ]) =cpu_to_be32 (req->sector * hwsec); - *((u16 *) & cmd[7 ]) =cpu_to_be16 (req->nr_sectors * hwsec); + *((u32 *) & cmd[2 ]) =cpu_to_be32 (blk_rq_pos (req) * hwsec); + *((u16 *) & cmd[7 ]) =cpu_to_be16 (blk_rq_sectors (req) * hwsec);memcpy (mptr, cmd,10 ); mptr +=4 ; - *mptr++ =cpu_to_le32 (req->nr_sectors <<KERNEL_SECTOR_SHIFT ); + *mptr++ = +cpu_to_le32 (blk_rq_sectors (req) <<KERNEL_SECTOR_SHIFT ); } else#endif { msg->u.head[1 ] =cpu_to_le32 (cmd |HOST_TID <<12 | tid); *mptr++ =cpu_to_le32 (ctl_flags); - *mptr++ =cpu_to_le32 (req->nr_sectors <<KERNEL_SECTOR_SHIFT ); *mptr++ = -cpu_to_le32 ((u32) (req->sector <<KERNEL_SECTOR_SHIFT )); +cpu_to_le32 (blk_rq_sectors (req) <<KERNEL_SECTOR_SHIFT ); + *mptr++ = +cpu_to_le32 ((u32) (blk_rq_pos (req) <<KERNEL_SECTOR_SHIFT )); *mptr++ = -cpu_to_le32 (req->sector >> (32 -KERNEL_SECTOR_SHIFT )); +cpu_to_le32 (blk_rq_pos (req) >> (32 -KERNEL_SECTOR_SHIFT )); }if (!i2o_block_sglist_alloc (c, ireq, &mptr)) {
drivers/mmc/card/block.c +5 -5
@@ -243,7 +243,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) brq.mrq.cmd = &brq.cmd; brq.mrq.data = &brq.data; - brq.cmd.arg = req->sector; + brq.cmd.arg =blk_rq_pos (req);if (!mmc_card_blockaddr (card)) brq.cmd.arg <<=9 ; brq.cmd.flags =MMC_RSP_SPI_R1 |MMC_RSP_R1 |MMC_CMD_ADTC ;
@@ -251,7 +251,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) brq.stop.opcode =MMC_STOP_TRANSMISSION ; brq.stop.arg =0 ; brq.stop.flags =MMC_RSP_SPI_R1B |MMC_RSP_R1B |MMC_CMD_AC ; - brq.data.blocks = req->nr_sectors; + brq.data.blocks =blk_rq_sectors (req);/* * After a read error, we redo the request one sector at a time
@@ -293,7 +293,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)* Adjust the sg list so it is the same size as the * request. */ -if (brq.data.blocks != req->nr_sectors) { +if (brq.data.blocks !=blk_rq_sectors (req)) {int i, data_size = brq.data.blocks <<9 ;struct scatterlist *sg;
@@ -344,8 +344,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)printk (KERN_ERR "%s: error %d transferring data," " sector %u, nr %u, card status %#x\n" , req->rq_disk->disk_name, brq.data.error, - (unsigned )req->sector, - (unsigned )req->nr_sectors, status); + (unsigned )blk_rq_pos (req), + (unsigned )blk_rq_sectors (req), status); }if (brq.stop.error) {
drivers/mtd/mtd_blkdevs.c +4 -3
@@ -47,8 +47,8 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,unsigned long block, nsect;char *buf; - block = req->sector <<9 >> tr->blkshift; - nsect = req->current_nr_sectors <<9 >> tr->blkshift; + block =blk_rq_pos (req) <<9 >> tr->blkshift; + nsect =blk_rq_cur_sectors (req) <<9 >> tr->blkshift; buf = req->buffer;
@@ -59,7 +59,8 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,if (!blk_fs_request (req))return -EIO ; -if (req->sector + req->current_nr_sectors >get_capacity (req->rq_disk)) +if (blk_rq_pos (req) +blk_rq_cur_sectors (req) > +get_capacity (req->rq_disk))return -EIO ;switch (rq_data_dir (req)) {
drivers/s390/block/dasd.c +1 -1
@@ -603,7 +603,7 @@ static void dasd_profile_end(struct dasd_block *block,if (dasd_profile_level !=DASD_PROFILE_ON )return ; - sectors = req->nr_sectors; + sectors =blk_rq_sectors (req);if (!cqr->buildclk || !cqr->startclk || !cqr->stopclk || !cqr->endclk || !sectors)
drivers/s390/block/dasd_diag.c +3 -2
@@ -505,8 +505,9 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,return ERR_PTR (-EINVAL ); blksize = block->bp_block;/* Calculate record id of first and last block. */ - first_rec = req->sector >> block->s2b_shift; - last_rec = (req->sector + req->nr_sectors -1 ) >> block->s2b_shift; + first_rec =blk_rq_pos (req) >> block->s2b_shift; + last_rec = + (blk_rq_pos (req) +blk_rq_sectors (req) -1 ) >> block->s2b_shift;/* Check struct bio and count the number of blocks for the request. */ count =0 ;rq_for_each_segment (bv, req, iter) {
drivers/s390/block/dasd_eckd.c +3 -3
@@ -2354,10 +2354,10 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev, blksize = block->bp_block; blk_per_trk =recs_per_track (&private->rdc_data,0 , blksize);/* Calculate record id of first and last block. */ - first_rec = first_trk = req->sector >> block->s2b_shift; + first_rec = first_trk =blk_rq_pos (req) >> block->s2b_shift; first_offs =sector_div (first_trk, blk_per_trk); last_rec = last_trk = - (req->sector + req->nr_sectors -1 ) >> block->s2b_shift; + (blk_rq_pos (req) +blk_rq_sectors (req) -1 ) >> block->s2b_shift; last_offs =sector_div (last_trk, blk_per_trk); cdlspecial = (private->uses_cdl && first_rec <2 *blk_per_trk);
@@ -2420,7 +2420,7 @@ dasd_eckd_free_cp(struct dasd_ccw_req *cqr, struct request *req) private = (struct dasd_eckd_private *) cqr->block->base->private; blksize = cqr->block->bp_block; blk_per_trk =recs_per_track (&private->rdc_data,0 , blksize); - recid = req->sector >> cqr->block->s2b_shift; + recid =blk_rq_pos (req) >> cqr->block->s2b_shift; ccw = cqr->cpaddr;/* Skip over define extent & locate record. */ ccw++;
drivers/s390/block/dasd_fba.c +4 -3
@@ -270,8 +270,9 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,return ERR_PTR (-EINVAL ); blksize = block->bp_block;/* Calculate record id of first and last block. */ - first_rec = req->sector >> block->s2b_shift; - last_rec = (req->sector + req->nr_sectors -1 ) >> block->s2b_shift; + first_rec =blk_rq_pos (req) >> block->s2b_shift; + last_rec = + (blk_rq_pos (req) +blk_rq_sectors (req) -1 ) >> block->s2b_shift;/* Check struct bio and count the number of blocks for the request. */ count =0 ; cidaw =0 ;
@@ -309,7 +310,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev, ccw = cqr->cpaddr;/* First ccw is define extent. */ define_extent (ccw++, cqr->data,rq_data_dir (req), - block->bp_block, req->sector, req->nr_sectors); + block->bp_block,blk_rq_pos (req),blk_rq_sectors (req));/* Build locate_record + read/write ccws. */ idaws = (unsigned long *) (cqr->data +sizeof (struct DE_fba_data )); LO_data = (struct LO_fba_data *) (idaws + cidaw);
drivers/s390/char/tape_34xx.c +1 -1
@@ -1134,7 +1134,7 @@ tape_34xx_bread(struct tape_device *device, struct request *req)/* Setup ccws. */ request->op =TO_BLOCK ; start_block = (struct tape_34xx_block_id *) request->cpdata; - start_block->block = req->sector >>TAPEBLOCK_HSEC_S2B ; + start_block->block =blk_rq_pos (req) >>TAPEBLOCK_HSEC_S2B ;DBF_EVENT (6 ,"start_block = %i\n" , start_block->block); ccw = request->cpaddr;
drivers/s390/char/tape_3590.c +1 -1
@@ -633,7 +633,7 @@ tape_3590_bread(struct tape_device *device, struct request *req)struct req_iterator iter;DBF_EVENT (6 ,"xBREDid:" ); - start_block = req->sector >>TAPEBLOCK_HSEC_S2B ; + start_block =blk_rq_pos (req) >>TAPEBLOCK_HSEC_S2B ;DBF_EVENT (6 ,"start_block = %i\n" , start_block);rq_for_each_segment (bv, req, iter)
drivers/s390/char/tape_block.c +1 -1
@@ -87,7 +87,7 @@ __tapeblock_end_request(struct tape_request *ccw_req, void *data)if (ccw_req->rc ==0 )/* Update position. */ device->blk_data.block_position = - (req->sector + req->nr_sectors) >>TAPEBLOCK_HSEC_S2B ; + (blk_rq_pos (req) +blk_rq_sectors (req)) >>TAPEBLOCK_HSEC_S2B ;else /* We lost the position information due to an error. */ device->blk_data.block_position =-1 ;
drivers/sbus/char/jsflash.c +2 -2
@@ -188,8 +188,8 @@ static void jsfd_do_request(struct request_queue *q)while ((req =elv_next_request (q)) !=NULL ) {struct jsfd_part *jdp = req->rq_disk->private_data; -unsigned long offset = req->sector <<9 ; -size_t len = req->current_nr_sectors <<9 ; +unsigned long offset =blk_rq_pos (req) <<9 ; +size_t len =blk_rq_cur_sectors (req) <<9 ;if ((offset + len) > jdp->dsize) {__blk_end_request_cur (req, -EIO );
drivers/scsi/eata.c +12 -12
@@ -1825,7 +1825,7 @@ static int eata2x_queuecommand(struct scsi_cmnd *SCpnt,if (linked_comm && SCpnt->device->queue_depth >2 &&TLDEV (SCpnt->device->type)) { ha->cp_stat[i] =READY ; -flush_dev (SCpnt->device, SCpnt->request->sector, ha,0 ); +flush_dev (SCpnt->device,blk_rq_pos (SCpnt->request), ha,0 );return 0 ; }
@@ -2144,13 +2144,13 @@ static int reorder(struct hostdata *ha, unsigned long cursec,if (!cpp->din) input_only =0 ; -if (SCpnt->request->sector < minsec) - minsec = SCpnt->request->sector; -if (SCpnt->request->sector > maxsec) - maxsec = SCpnt->request->sector; +if (blk_rq_pos (SCpnt->request) < minsec) + minsec =blk_rq_pos (SCpnt->request); +if (blk_rq_pos (SCpnt->request) > maxsec) + maxsec =blk_rq_pos (SCpnt->request); - sl[n] = SCpnt->request->sector; - ioseek += SCpnt->request->nr_sectors; + sl[n] =blk_rq_pos (SCpnt->request); + ioseek +=blk_rq_sectors (SCpnt->request);if (!n)continue ;
@@ -2190,7 +2190,7 @@ static int reorder(struct hostdata *ha, unsigned long cursec, k = il[n]; cpp = &ha->cp[k]; SCpnt = cpp->SCpnt; - ll[n] = SCpnt->request->nr_sectors; + ll[n] =blk_rq_sectors (SCpnt->request); pl[n] = SCpnt->serial_number;if (!n)
@@ -2236,12 +2236,12 @@ static int reorder(struct hostdata *ha, unsigned long cursec, cpp = &ha->cp[k]; SCpnt = cpp->SCpnt;scmd_printk (KERN_INFO , SCpnt, -"%s pid %ld mb %d fc %d nr %d sec %ld ns %ld" +"%s pid %ld mb %d fc %d nr %d sec %ld ns %u" " cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n" , (ihdlr ?"ihdlr" :"qcomm" ), SCpnt->serial_number, k, flushcount, - n_ready, SCpnt->request->sector, - SCpnt->request->nr_sectors, cursec,YESNO (s), + n_ready,blk_rq_pos (SCpnt->request), +blk_rq_sectors (SCpnt->request), cursec,YESNO (s),YESNO (r),YESNO (rev),YESNO (input_only),YESNO (overlap), cpp->din); }
@@ -2408,7 +2408,7 @@ static irqreturn_t ihdlr(struct Scsi_Host *shost)if (linked_comm && SCpnt->device->queue_depth >2 &&TLDEV (SCpnt->device->type)) -flush_dev (SCpnt->device, SCpnt->request->sector, ha,1 ); +flush_dev (SCpnt->device,blk_rq_pos (SCpnt->request), ha,1 ); tstatus =status_byte (spp->target_status);
drivers/scsi/lpfc/lpfc_scsi.c +11 -11
@@ -1313,10 +1313,10 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,uint32_t bgstat = bgf->bgstat;uint64_t failing_sector =0 ; -printk (KERN_ERR "BG ERROR in cmd 0x%x lba 0x%llx blk cnt 0x%lx " +printk (KERN_ERR "BG ERROR in cmd 0x%x lba 0x%llx blk cnt 0x%x " "bgstat=0x%x bghm=0x%x\n" , cmd->cmnd[0 ], (unsigned long long )scsi_get_lba (cmd), - cmd->request->nr_sectors, bgstat, bghm); +blk_rq_sectors (cmd->request), bgstat, bghm);spin_lock (&_dump_buf_lock);if (!_dump_buf_done) {
@@ -2375,15 +2375,15 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))if (cmnd->cmnd[0 ] ==READ_10 )lpfc_printf_vlog (vport,KERN_WARNING ,LOG_BG ,"9035 BLKGRD: READ @ sector %llu, " -"count %lu\n" , - (unsigned long long )scsi_get_lba (cmnd), - cmnd->request->nr_sectors); +"count %u\n" , + (unsigned long long )scsi_get_lba (cmnd), +blk_rq_sectors (cmnd->request));else if (cmnd->cmnd[0 ] ==WRITE_10 )lpfc_printf_vlog (vport,KERN_WARNING ,LOG_BG ,"9036 BLKGRD: WRITE @ sector %llu, " -"count %lu cmd=%p\n" , +"count %u cmd=%p\n" , (unsigned long long )scsi_get_lba (cmnd), - cmnd->request->nr_sectors, +blk_rq_sectors (cmnd->request), cmnd); err =lpfc_bg_scsi_prep_dma_buf (phba, lpfc_cmd);
@@ -2403,15 +2403,15 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))if (cmnd->cmnd[0 ] ==READ_10 )lpfc_printf_vlog (vport,KERN_WARNING ,LOG_BG ,"9040 dbg: READ @ sector %llu, " -"count %lu\n" , +"count %u\n" , (unsigned long long )scsi_get_lba (cmnd), - cmnd->request->nr_sectors); +blk_rq_sectors (cmnd->request));else if (cmnd->cmnd[0 ] ==WRITE_10 )lpfc_printf_vlog (vport,KERN_WARNING ,LOG_BG ,"9041 dbg: WRITE @ sector %llu, " -"count %lu cmd=%p\n" , +"count %u cmd=%p\n" , (unsigned long long )scsi_get_lba (cmnd), - cmnd->request->nr_sectors, cmnd); +blk_rq_sectors (cmnd->request), cmnd);else lpfc_printf_vlog (vport,KERN_WARNING ,LOG_BG ,"9042 dbg: parser not implemented\n" );
drivers/scsi/scsi_lib.c +3 -3
@@ -787,9 +787,9 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)* Next deal with any sectors which we were able to correctly * handle. */ -SCSI_LOG_HLCOMPLETE (1 ,printk ("%ld sectors total, " +SCSI_LOG_HLCOMPLETE (1 ,printk ("%u sectors total, " "%d bytes done.\n" , - req->nr_sectors, good_bytes)); +blk_rq_sectors (req), good_bytes));/* * Recovered errors need reporting, but they're always treated
@@ -968,7 +968,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,if (blk_pc_request (req)) sdb->length = req->data_len;else - sdb->length = req->nr_sectors <<9 ; + sdb->length =blk_rq_sectors (req) <<9 ;return BLKPREP_OK ; }
drivers/scsi/sd.c +12 -12
@@ -383,9 +383,9 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)struct scsi_device *sdp = q->queuedata;struct gendisk *disk = rq->rq_disk;struct scsi_disk *sdkp; -sector_t block = rq->sector; +sector_t block =blk_rq_pos (rq);sector_t threshold; -unsigned int this_count = rq->nr_sectors; +unsigned int this_count =blk_rq_sectors (rq);int ret, host_dif;if (rq->cmd_type ==REQ_TYPE_BLOCK_PC ) {
@@ -412,10 +412,10 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) this_count));if (!sdp || !scsi_device_online (sdp) || - block + rq->nr_sectors >get_capacity (disk)) { + block +blk_rq_sectors (rq) >get_capacity (disk)) {SCSI_LOG_HLQUEUE (2 ,scmd_printk (KERN_INFO , SCpnt, -"Finishing %ld sectors\n" , - rq->nr_sectors)); +"Finishing %u sectors\n" , +blk_rq_sectors (rq)));SCSI_LOG_HLQUEUE (2 ,scmd_printk (KERN_INFO , SCpnt,"Retry with 0x%p\n" , SCpnt)); goto out;
@@ -462,7 +462,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)* for this. */ if (sdp->sector_size ==1024 ) { -if ((block &1 ) || (rq->nr_sectors &1 )) { +if ((block &1 ) || (blk_rq_sectors (rq) &1 )) {scmd_printk (KERN_ERR , SCpnt,"Bad block number requested\n" ); goto out;
@@ -472,7 +472,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) } }if (sdp->sector_size ==2048 ) { -if ((block &3 ) || (rq->nr_sectors &3 )) { +if ((block &3 ) || (blk_rq_sectors (rq) &3 )) {scmd_printk (KERN_ERR , SCpnt,"Bad block number requested\n" ); goto out;
@@ -482,7 +482,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) } }if (sdp->sector_size ==4096 ) { -if ((block &7 ) || (rq->nr_sectors &7 )) { +if ((block &7 ) || (blk_rq_sectors (rq) &7 )) {scmd_printk (KERN_ERR , SCpnt,"Bad block number requested\n" ); goto out;
@@ -511,10 +511,10 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) }SCSI_LOG_HLQUEUE (2 ,scmd_printk (KERN_INFO , SCpnt, -"%s %d/%ld 512 byte blocks.\n" , +"%s %d/%u 512 byte blocks.\n" , (rq_data_dir (rq) ==WRITE ) ?"writing" :"reading" , this_count, - rq->nr_sectors)); +blk_rq_sectors (rq)));/* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */ host_dif =scsi_host_dif_capable (sdp->host, sdkp->protection_type);
@@ -970,8 +970,8 @@ static struct block_device_operations sd_fops = {static unsigned int sd_completed_bytes (struct scsi_cmnd *scmd) { -u64 start_lba = scmd->request->sector; -u64 end_lba = scmd->request->sector + (scsi_bufflen (scmd) /512 ); +u64 start_lba =blk_rq_pos (scmd->request); +u64 end_lba =blk_rq_pos (scmd->request) + (scsi_bufflen (scmd) /512 );u64 bad_lba;int info_valid;
drivers/scsi/sd_dif.c +1 -1
@@ -507,7 +507,7 @@ void sd_dif_complete(struct scsi_cmnd *scmd, unsigned int good_bytes) sector_sz = scmd->device->sector_size; sectors = good_bytes / sector_sz; - phys = scmd->request->sector &0xffffffff ; + phys =blk_rq_pos (scmd->request) &0xffffffff ;if (sector_sz ==4096 ) phys >>=3 ;
drivers/scsi/sr.c +8 -7
@@ -292,7 +292,8 @@ static int sr_done(struct scsi_cmnd *SCpnt)if (cd->device->sector_size ==2048 ) error_sector <<=2 ; error_sector &= ~(block_sectors -1 ); - good_bytes = (error_sector - SCpnt->request->sector) <<9 ; + good_bytes = (error_sector - +blk_rq_pos (SCpnt->request)) <<9 ;if (good_bytes <0 || good_bytes >= this_count) good_bytes =0 ;/*
@@ -349,8 +350,8 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq) cd->disk->disk_name, block));if (!cd->device || !scsi_device_online (cd->device)) { -SCSI_LOG_HLQUEUE (2 ,printk ("Finishing %ld sectors\n" , - rq->nr_sectors)); +SCSI_LOG_HLQUEUE (2 ,printk ("Finishing %u sectors\n" , +blk_rq_sectors (rq)));SCSI_LOG_HLQUEUE (2 ,printk ("Retry with 0x%p\n" , SCpnt)); goto out; }
@@ -413,7 +414,7 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq)/* * request doesn't start on hw block boundary, add scatter pads */ -if (((unsigned int )rq->sector % (s_size >>9 )) || +if (((unsigned int )blk_rq_pos (rq) % (s_size >>9 )) || (scsi_bufflen (SCpnt) % s_size)) {scmd_printk (KERN_NOTICE , SCpnt,"unaligned transfer\n" ); goto out;
@@ -422,14 +423,14 @@ static int sr_prep_fn(struct request_queue *q, struct request *rq) this_count = (scsi_bufflen (SCpnt) >>9 ) / (s_size >>9 ); -SCSI_LOG_HLQUEUE (2 ,printk ("%s : %s %d/%ld 512 byte blocks.\n" , +SCSI_LOG_HLQUEUE (2 ,printk ("%s : %s %d/%u 512 byte blocks.\n" , cd->cdi.name, (rq_data_dir (rq) ==WRITE ) ?"writing" :"reading" , - this_count, rq->nr_sectors)); + this_count,blk_rq_sectors (rq))); SCpnt->cmnd[1 ] =0 ; - block = (unsigned int )rq->sector / (s_size >>9 ); + block = (unsigned int )blk_rq_pos (rq) / (s_size >>9 );if (this_count >0xffff ) { this_count =0xffff ;
drivers/scsi/u14-34f.c +12 -10
@@ -1306,7 +1306,7 @@ static int u14_34f_queuecommand(struct scsi_cmnd *SCpnt, void (*done)(struct scsif (linked_comm && SCpnt->device->queue_depth >2 &&TLDEV (SCpnt->device->type)) {HD (j)->cp_stat[i] =READY ; -flush_dev (SCpnt->device, SCpnt->request->sector, j, FALSE); +flush_dev (SCpnt->device,blk_rq_pos (SCpnt->request), j, FALSE);return 0 ; }
@@ -1610,11 +1610,13 @@ static int reorder(unsigned int j, unsigned long cursec,if (!(cpp->xdir ==DTD_IN )) input_only = FALSE; -if (SCpnt->request->sector < minsec) minsec = SCpnt->request->sector; -if (SCpnt->request->sector > maxsec) maxsec = SCpnt->request->sector; +if (blk_rq_pos (SCpnt->request) < minsec) + minsec =blk_rq_pos (SCpnt->request); +if (blk_rq_pos (SCpnt->request) > maxsec) + maxsec =blk_rq_pos (SCpnt->request); - sl[n] = SCpnt->request->sector; - ioseek += SCpnt->request->nr_sectors; + sl[n] =blk_rq_pos (SCpnt->request); + ioseek +=blk_rq_sectors (SCpnt->request);if (!n)continue ;
@@ -1642,7 +1644,7 @@ static int reorder(unsigned int j, unsigned long cursec,if (!input_only)for (n =0 ; n < n_ready; n++) { k = il[n]; cpp = &HD (j)->cp[k]; SCpnt = cpp->SCpnt; - ll[n] = SCpnt->request->nr_sectors; pl[n] = SCpnt->serial_number; + ll[n] =blk_rq_sectors (SCpnt->request); pl[n] = SCpnt->serial_number;if (!n)continue ;
@@ -1666,12 +1668,12 @@ static int reorder(unsigned int j, unsigned long cursec,if (link_statistics && (overlap || !(flushcount % link_statistics)))for (n =0 ; n < n_ready; n++) { k = il[n]; cpp = &HD (j)->cp[k]; SCpnt = cpp->SCpnt; -printk ("%s %d.%d:%d pid %ld mb %d fc %d nr %d sec %ld ns %ld" \ +printk ("%s %d.%d:%d pid %ld mb %d fc %d nr %d sec %ld ns %u" \" cur %ld s:%c r:%c rev:%c in:%c ov:%c xd %d.\n" , (ihdlr ?"ihdlr" :"qcomm" ), SCpnt->channel, SCpnt->target, SCpnt->lun, SCpnt->serial_number, k, flushcount, n_ready, - SCpnt->request->sector, SCpnt->request->nr_sectors, cursec, -YESNO (s),YESNO (r),YESNO (rev),YESNO (input_only), +blk_rq_pos (SCpnt->request),blk_rq_sectors (SCpnt->request), + cursec,YESNO (s),YESNO (r),YESNO (rev),YESNO (input_only),YESNO (overlap), cpp->xdir); }#endif
@@ -1799,7 +1801,7 @@ static irqreturn_t ihdlr(unsigned int j)if (linked_comm && SCpnt->device->queue_depth >2 &&TLDEV (SCpnt->device->type)) -flush_dev (SCpnt->device, SCpnt->request->sector, j, TRUE); +flush_dev (SCpnt->device,blk_rq_pos (SCpnt->request), j, TRUE); tstatus =status_byte (spp->target_status);
include/scsi/scsi_cmnd.h +1 -1
@@ -270,7 +270,7 @@ static inline unsigned char scsi_get_prot_type(struct scsi_cmnd *scmd)static inline sector_t scsi_get_lba (struct scsi_cmnd *scmd) { -return scmd->request->sector; +return blk_rq_pos (scmd->request); }static inline unsigned scsi_prot_sg_count (struct scsi_cmnd *cmd)
Signature · 1 line
1.6.0.2
PATCH 6/10 ide: convert to rq pos and nr_sectors accessors
In reply to Tejun Heoide doesn't manipulate request fields anymore and thus all hard and their soft equivalents are always equal. Convert all references to accessors.
[ Impact: use pos and nr_sectors accessors ]
--- drivers/ide/ide-cd.c | 8 ++++---- drivers/ide/ide-disk.c | 8 ++++---- drivers/ide/ide-dma.c | 2 +- drivers/ide/ide-floppy.c | 6 +++--- drivers/ide/ide-io.c | 4 ++-- drivers/ide/ide-lib.c | 2 +- drivers/ide/ide-tape.c | 6 +++--- drivers/ide/ide-taskfile.c | 2 +- drivers/ide/pdc202xx_old.c | 2 +- drivers/ide/tc86c001.c | 2 +- drivers/ide/tx4939ide.c | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-)
drivers/ide/ide-cd.c +4 -4
@@ -775,8 +775,8 @@ static ide_startstop_t cdrom_start_rw(ide_drive_t *drive, struct request *rq) }/* fs requests *must* be hardware frame aligned */ -if ((rq->nr_sectors & (sectors_per_frame -1 )) || - (rq->sector & (sectors_per_frame -1 ))) +if ((blk_rq_sectors (rq) & (sectors_per_frame -1 )) || + (blk_rq_pos (rq) & (sectors_per_frame -1 )))return ide_stopped;/* use DMA, if possible */
@@ -868,8 +868,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, cmd.rq = rq;if (blk_fs_request (rq) || rq->data_len) { -ide_init_sg_cmd (&cmd,blk_fs_request (rq) ? (rq->nr_sectors <<9 ) - : rq->data_len); +ide_init_sg_cmd (&cmd,blk_fs_request (rq) ? + (blk_rq_sectors (rq) <<9 ) : rq->data_len);ide_map_sg (drive, &cmd); }
drivers/ide/ide-disk.c +4 -4
@@ -82,7 +82,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq, sector_t block) {ide_hwif_t *hwif = drive->hwif; -u16 nsectors = (u16 )rq->nr_sectors; +u16 nsectors = (u16 )blk_rq_sectors (rq);u8 lba48 = !!(drive->dev_flags &IDE_DFLAG_LBA48 );u8 dma = !!(drive->dev_flags &IDE_DFLAG_USING_DMA );struct ide_cmd cmd;
@@ -90,7 +90,7 @@ static ide_startstop_t __ide_do_rw_disk(ide_drive_t *drive, struct request *rq,ide_startstop_t rc;if ((hwif->host_flags &IDE_HFLAG_NO_LBA48_DMA ) && lba48 && dma) { -if (block + rq->nr_sectors >1ULL <<28 ) +if (block +blk_rq_sectors (rq) >1ULL <<28 ) dma =0 ;else lba48 =0 ;
@@ -195,9 +195,9 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,ledtrig_ide_activity (); -pr_debug ("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n" , +pr_debug ("%s: %sing: block=%llu, sectors=%u, buffer=0x%08lx\n" , drive->name,rq_data_dir (rq) ==READ ?"read" :"writ" , - (unsigned long long )block, rq->nr_sectors, + (unsigned long long )block,blk_rq_sectors (rq), (unsigned long )rq->buffer);if (hwif->rw_disk)
drivers/ide/ide-dma.c +1 -1
@@ -103,7 +103,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)ide_finish_cmd (drive, cmd, stat); else ide_complete_rq(drive, 0, - cmd->rq->nr_sectors << 9); + blk_rq_sectors(cmd->rq) << 9);return ide_stopped; } printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
drivers/ide/ide-floppy.c +3 -3
@@ -194,7 +194,7 @@ static void idefloppy_create_rw_cmd(ide_drive_t *drive, {struct ide_disk_obj *floppy = drive->driver_data;int block = sector / floppy->bs_factor; -int blocks = rq->nr_sectors / floppy->bs_factor; +int blocks =blk_rq_sectors (rq) / floppy->bs_factor;int cmd =rq_data_dir (rq);ide_debug_log (IDE_DBG_FUNC ,"block: %d, blocks: %d" , block, blocks);
@@ -259,8 +259,8 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive, goto out_end; }if (blk_fs_request (rq)) { -if (((long )rq->sector % floppy->bs_factor) || - (rq->nr_sectors % floppy->bs_factor)) { +if (((long )blk_rq_pos (rq) % floppy->bs_factor) || + (blk_rq_sectors (rq) % floppy->bs_factor)) { printk(KERN_ERR PFX "%s: unsupported r/w rq size\n", drive->name); goto out_end;
drivers/ide/ide-io.c +2 -2
@@ -279,7 +279,7 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,if (cmd) {if (cmd->protocol ==ATA_PROT_PIO ) { -ide_init_sg_cmd (cmd, rq->nr_sectors <<9 ); +ide_init_sg_cmd (cmd,blk_rq_sectors (rq) <<9 );ide_map_sg (drive, cmd); }
@@ -387,7 +387,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) drv = *(struct ide_driver **)rq->rq_disk->private_data; -return drv->do_request (drive, rq, rq->sector); +return drv->do_request (drive, rq,blk_rq_pos (rq)); }return do_special (drive); kill_rq:
drivers/ide/ide-lib.c +1 -1
@@ -114,7 +114,7 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)if (rq)printk (KERN_CONT ", sector=%llu" , - (unsigned long long )rq->sector); + (unsigned long long )blk_rq_pos (rq)); }printk (KERN_CONT "\n" ); }
drivers/ide/ide-tape.c +3 -3
@@ -586,7 +586,7 @@ static void ide_tape_create_rw_cmd(idetape_tape_t *tape, struct ide_atapi_pc *pc, struct request *rq, u8 opcode) { - unsigned int length = rq->nr_sectors; + unsigned int length = blk_rq_sectors(rq);ide_init_pc (pc);put_unaligned (cpu_to_be32 (length), (unsigned int *) &pc->c[1 ]);
@@ -617,8 +617,8 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,struct ide_cmd cmd;u8 stat; -debug_log (DBG_SENSE ,"sector: %llu, nr_sectors: %lu\n" - (unsigned long long)rq->sector, rq->nr_sectors); + debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n" + (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));if (!(blk_special_request (rq) ||blk_sense_request (rq))) {/* We do not support buffer cache originated requests. */
drivers/ide/ide-taskfile.c +1 -1
@@ -385,7 +385,7 @@ out_end:if ((cmd->tf_flags &IDE_TFLAG_FS ) ==0 )ide_finish_cmd (drive, cmd, stat);else -ide_complete_rq (drive,0 , cmd->rq->nr_sectors <<9 ); +ide_complete_rq (drive,0 ,blk_rq_sectors (cmd->rq) <<9 );return ide_stopped; out_err:ide_error_cmd (drive, cmd);
drivers/ide/pdc202xx_old.c +1 -1
@@ -177,7 +177,7 @@ static void pdc202xx_dma_start(ide_drive_t *drive)u8 clock =inb (high_16 +0x11 );outb (clock | (hwif->channel ?0x08 :0x02 ), high_16 +0x11 ); - word_count = (rq->nr_sectors <<8 ); + word_count = (blk_rq_sectors (rq) <<8 ); word_count = (rq_data_dir (rq) ==READ ) ? word_count |0x05000000 : word_count |0x06000000 ;
drivers/ide/tc86c001.c +1 -1
@@ -112,7 +112,7 @@ static void tc86c001_dma_start(ide_drive_t *drive)ide_hwif_t *hwif = drive->hwif;unsigned long sc_base = hwif->config_data;unsigned long twcr_port = sc_base + (drive->dn ?0x06 :0x04 ); -unsigned long nsectors = hwif->rq->nr_sectors; +unsigned long nsectors =blk_rq_sectors (hwif->rq);/* * We have to manually load the sector count and size into
drivers/ide/tx4939ide.c +1 -1
@@ -307,7 +307,7 @@ static int tx4939ide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)tx4939ide_writew (SECTOR_SIZE /2 , base, drive->dn ? TX4939IDE_Xfer_Cnt_2 : TX4939IDE_Xfer_Cnt_1); -tx4939ide_writew (cmd->rq->nr_sectors, base, TX4939IDE_Sec_Cnt); +tx4939ide_writew (blk_rq_sectors (cmd->rq), base, TX4939IDE_Sec_Cnt);return 0 ; }
Signature · 1 line
1.6.0.2
PATCH 7/10 block: drop request->hard_* and *nr_sectors
In reply to Tejun Heostruct request has had a few different ways to represent some properties of a request. ->hard_* represent block layer's view of the request progress (completion cursor) and the ones without the prefix are supposed to represent the issue cursor and allowed to be updated as necessary by the low level drivers. The thing is that as block layer supports partial completion, the two cursors really aren't necessary and only cause confusion. In addition, manual management of request detail from low level drivers is cumbersome and error-prone at the very least.
Another interesting duplicate fields are rq->[hard_]nr_sectors and rq->{hard_cur|current}_nr_sectors against rq->data_len and rq->bio->bi_size. This is more convoluted than the hard_ case.
rq->[hard_]nr_sectors are initialized for requests with bio but blk_rq_bytes() uses it only for !pc requests. rq->data_len is initialized for all request but blk_rq_bytes() uses it only for pc requests. This causes good amount of confusion throughout block layer and its drivers and determining the request length has been a bit of black magic which may or may not work depending on circumstances and what the specific LLD is actually doing.
rq->{hard_cur|current}_nr_sectors represent the number of sectors in the contiguous data area at the front. This is mainly used by drivers which transfers data by walking request segment-by-segment. This value always equals rq->bio->bi_size >> 9. However, data length for pc requests may not be multiple of 512 bytes and using this field becomes a bit confusing.
In general, having multiple fields to represent the same property leads only to confusion and subtle bugs. With recent block low level driver cleanups, no driver is accessing or manipulating these duplicate fields directly. Drop all the duplicates. Now rq->sector means the current sector, rq->data_len the current total length and rq->bio->bi_size the current segment length. Everything else is defined in terms of these three and available only through accessors.
* blk_recalc_rq_sectors() is collapsed into blk_update_request() and now handles pc and fs requests equally other than rq->sector update. This means that now pc requests can use partial completion too (no in-kernel user yet tho).
* bio_cur_sectors() is replaced with bio_cur_bytes() as block layer now uses byte count as the primary data length.
* blk_rq_pos() is now guranteed to be always correct. In-block users converted.
* blk_rq_bytes() is now guaranteed to be always valid as is blk_rq_sectors(). In-block users converted.
* blk_rq_sectors() is now guaranteed to equal blk_rq_bytes() >> 9. More convenient one is used.
[ Impact: API cleanup, single way to represent one property of a request ]
--- block/blk-core.c | 81 +++++++++++++++++----------------------------- block/blk-merge.c | 36 ++------------------ block/blk.h | 1 - block/cfq-iosched.c | 10 +++--- include/linux/bio.h | 6 ++-- include/linux/blkdev.h | 37 +++++++++------------ include/linux/elevator.h | 2 +- kernel/trace/blktrace.c | 16 ++++---- 8 files changed, 67 insertions(+), 122 deletions(-)
block/blk-core.c +30 -51
@@ -127,7 +127,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq)INIT_LIST_HEAD (&rq->timeout_list); rq->cpu =-1 ; rq->q = q; - rq->sector = rq->hard_sector = (sector_t) -1 ; + rq->sector = (sector_t) -1 ;INIT_HLIST_NODE (&rq->hash);RB_CLEAR_NODE (&rq->rb_node); rq->cmd = rq->__cmd;
@@ -189,8 +189,7 @@ void blk_dump_rq_flags(struct request *rq, char *msg) (unsigned long long )blk_rq_pos (rq), blk_rq_sectors(rq), blk_rq_cur_sectors(rq));printk (KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n" , - rq->bio, rq->biotail, - rq->buffer, rq->data_len); + rq->bio, rq->biotail, rq->buffer,blk_rq_bytes (rq));if (blk_pc_request (rq)) {printk (KERN_INFO " cdb: " );
@@ -1096,7 +1095,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) req->cmd_flags |=REQ_NOIDLE ; req->errors =0 ; - req->hard_sector = req->sector = bio->bi_sector; + req->sector = bio->bi_sector; req->ioprio =bio_prio (bio);blk_rq_bio_prep (req->q, req, bio); }
@@ -1113,14 +1112,13 @@ static inline bool queue_should_plug(struct request_queue *q)static int __make_request (struct request_queue *q,struct bio *bio) {struct request *req; -int el_ret, nr_sectors; +int el_ret; +unsigned int bytes = bio->bi_size;const unsigned short prio =bio_prio (bio);const int sync =bio_sync (bio);const int unplug =bio_unplug (bio);int rw_flags; - nr_sectors =bio_sectors (bio); -/* * low level driver can indicate that it wants pages above a * certain limit bounced to low memory (ie for highmem, or even
@@ -1145,7 +1143,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) req->biotail->bi_next = bio; req->biotail = bio; - req->nr_sectors = req->hard_nr_sectors += nr_sectors; + req->data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;
@@ -1171,10 +1169,8 @@ static int __make_request(struct request_queue *q, struct bio *bio)* not touch req->buffer either... */ req->buffer =bio_data (bio); - req->current_nr_sectors =bio_cur_sectors (bio); - req->hard_cur_sectors = req->current_nr_sectors; - req->sector = req->hard_sector = bio->bi_sector; - req->nr_sectors = req->hard_nr_sectors += nr_sectors; + req->sector = bio->bi_sector; + req->data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;
@@ -1557,7 +1553,7 @@ EXPORT_SYMBOL(submit_bio);int blk_rq_check_limits (struct request_queue *q,struct request *rq) {if (blk_rq_sectors (rq) > q->max_sectors || - rq->data_len > q->max_hw_sectors <<9 ) { +blk_rq_bytes (rq) > q->max_hw_sectors <<9 ) {printk (KERN_ERR "%s: over max size limit.\n" , __func__);return -EIO ; }
@@ -1675,35 +1671,6 @@ static void blk_account_io_done(struct request *req) } } -/** -* blk_rq_bytes - Returns bytes left to complete in the entire request -* @rq: the request being processed -**/ -unsigned int blk_rq_bytes (struct request *rq) -{ -if (blk_fs_request (rq)) -return blk_rq_sectors (rq) <<9 ; - -return rq->data_len; -} -EXPORT_SYMBOL_GPL (blk_rq_bytes); - -/** -* blk_rq_cur_bytes - Returns bytes left to complete in the current segment -* @rq: the request being processed -**/ -unsigned int blk_rq_cur_bytes (struct request *rq) -{ -if (blk_fs_request (rq)) -return rq->current_nr_sectors <<9 ; - -if (rq->bio) -return rq->bio->bi_size; - -return rq->data_len; -} -EXPORT_SYMBOL_GPL (blk_rq_cur_bytes); -struct request *elv_next_request (struct request_queue *q) {struct request *rq;
@@ -1736,7 +1703,7 @@ struct request *elv_next_request(struct request_queue *q)if (rq->cmd_flags &REQ_DONTPREP )break ; -if (q->dma_drain_size && rq->data_len) { +if (q->dma_drain_size &&blk_rq_bytes (rq)) {/* * make sure space for the drain appears we * know we can do this because max_hw_segments
@@ -1759,7 +1726,7 @@ struct request *elv_next_request(struct request_queue *q)* avoid resource deadlock. REQ_STARTED will * prevent other fs requests from passing this one. */ -if (q->dma_drain_size && rq->data_len && +if (q->dma_drain_size &&blk_rq_bytes (rq) && !(rq->cmd_flags &REQ_DONTPREP )) {/* * remove the space for the drain we added
@@ -1911,8 +1878,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)* can find how many bytes remain in the request * later. */ - req->nr_sectors = req->hard_nr_sectors =0 ; - req->current_nr_sectors = req->hard_cur_sectors =0 ; + req->data_len =0 ;return false; }
@@ -1926,8 +1892,25 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)bio_iovec (bio)->bv_len -= nr_bytes; } -blk_recalc_rq_sectors (req, total_bytes >>9 ); + req->data_len -= total_bytes; + req->buffer =bio_data (req->bio); + +/* update sector only for requests with clear definition of sector */ +if (blk_fs_request (req) ||blk_discard_rq (req)) + req->sector += total_bytes >>9 ; + +/* +* If total number of sectors is less than the first segment +* size, something has gone terribly wrong. +*/ +if (blk_rq_bytes (req) <blk_rq_cur_bytes (req)) { +printk (KERN_ERR "blk: request botched\n" ); + req->data_len =blk_rq_cur_bytes (req); + } + +/* recalculate the number of segments */ blk_recalc_rq_segments (req); +return true; }EXPORT_SYMBOL_GPL (blk_update_request);
@@ -2049,11 +2032,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, rq->nr_phys_segments =bio_phys_segments (q, bio); rq->buffer =bio_data (bio); } - rq->current_nr_sectors =bio_cur_sectors (bio); - rq->hard_cur_sectors = rq->current_nr_sectors; - rq->hard_nr_sectors = rq->nr_sectors =bio_sectors (bio); rq->data_len = bio->bi_size; - rq->bio = rq->biotail = bio;if (bio->bi_bdev)
block/blk-merge.c +4 -32
@@ -9,35 +9,6 @@#include "blk.h" -void blk_recalc_rq_sectors (struct request *rq,int nsect) -{ -if (blk_fs_request (rq) ||blk_discard_rq (rq)) { - rq->hard_sector += nsect; - rq->hard_nr_sectors -= nsect; - -/* -* Move the I/O submission pointers ahead if required. -*/ -if ((rq->nr_sectors >= rq->hard_nr_sectors) && - (rq->sector <= rq->hard_sector)) { - rq->sector = rq->hard_sector; - rq->nr_sectors = rq->hard_nr_sectors; - rq->hard_cur_sectors =bio_cur_sectors (rq->bio); - rq->current_nr_sectors = rq->hard_cur_sectors; - rq->buffer =bio_data (rq->bio); - } - -/* -* if total number of sectors is less than the first segment -* size, something has gone terribly wrong -*/ -if (rq->nr_sectors < rq->current_nr_sectors) { -printk (KERN_ERR "blk: request botched\n" ); - rq->nr_sectors = rq->current_nr_sectors; - } - } -} -static unsigned int __blk_recalc_rq_segments (struct request_queue *q,struct bio *bio) {
@@ -199,8 +170,9 @@ new_segment:if (unlikely (rq->cmd_flags &REQ_COPY_USER ) && - (rq->data_len & q->dma_pad_mask)) { -unsigned int pad_len = (q->dma_pad_mask & ~rq->data_len) +1 ; + (blk_rq_bytes (rq) & q->dma_pad_mask)) { +unsigned int pad_len = + (q->dma_pad_mask & ~blk_rq_bytes (rq)) +1 ; sg->length += pad_len; rq->extra_len += pad_len;
@@ -398,7 +370,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, req->biotail->bi_next = next->bio; req->biotail = next->biotail; - req->nr_sectors = req->hard_nr_sectors += next->hard_nr_sectors; + req->data_len +=blk_rq_bytes (next);elv_merge_requests (q, req, next);
block/blk.h +0 -1
@@ -101,7 +101,6 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,int attempt_back_merge (struct request_queue *q,struct request *rq);int attempt_front_merge (struct request_queue *q,struct request *rq);void blk_recalc_rq_segments (struct request *rq); -void blk_recalc_rq_sectors (struct request *rq,int nsect);void blk_queue_congestion_threshold (struct request_queue *q);
block/cfq-iosched.c +5 -5
@@ -579,9 +579,9 @@ cfq_prio_tree_lookup(struct cfq_data *cfqd, struct rb_root *root,* Sort strictly based on sector. Smallest to the left, * largest to the right. */ -if (sector > cfqq->next_rq->sector) +if (sector >blk_rq_pos (cfqq->next_rq)) n = &(*p)->rb_right; -else if (sector < cfqq->next_rq->sector) +else if (sector <blk_rq_pos (cfqq->next_rq)) n = &(*p)->rb_left;else break ;
@@ -611,8 +611,8 @@ static void cfq_prio_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq)return ; cfqq->p_root = &cfqd->prio_trees[cfqq->org_ioprio]; - __cfqq =cfq_prio_tree_lookup (cfqd, cfqq->p_root, cfqq->next_rq->sector, - &parent, &p); + __cfqq =cfq_prio_tree_lookup (cfqd, cfqq->p_root, +blk_rq_pos (cfqq->next_rq), &parent, &p);if (!__cfqq) {rb_link_node (&cfqq->p_node, parent, p);rb_insert_color (&cfqq->p_node, cfqq->p_root);
@@ -996,7 +996,7 @@ static struct cfq_queue *cfqq_close(struct cfq_data *cfqd,if (cfq_rq_close (cfqd, __cfqq->next_rq))return __cfqq; -if (__cfqq->next_rq->sector < sector) +if (blk_rq_pos (__cfqq->next_rq) < sector) node =rb_next (&__cfqq->p_node);else node =rb_prev (&__cfqq->p_node);
include/linux/bio.h +3 -3
@@ -218,12 +218,12 @@ struct bio {#define bio_sectors (bio) ((bio)->bi_size >> 9)#define bio_empty_barrier (bio) (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio)) -static inline unsigned int bio_cur_sectors (struct bio *bio) +static inline unsigned int bio_cur_bytes (struct bio *bio) {if (bio->bi_vcnt) -return bio_iovec (bio)->bv_len >>9 ; +return bio_iovec (bio)->bv_len;else /* dataless requests such as discard */ -return bio->bi_size >>9 ; +return bio->bi_size; }static inline void *bio_data (struct bio *bio)
include/linux/blkdev.h +16 -21
@@ -166,19 +166,8 @@ struct request {enum rq_cmd_type_bits cmd_type;unsigned long atomic_flags; -/* Maintain bio traversal state for part by part I/O submission. -* hard_* are block layer internals, no driver should touch them! -*/ - -sector_t sector;/* next sector to submit */ -sector_t hard_sector;/* next sector to complete */ -unsigned long nr_sectors;/* no. of sectors left to submit */ -unsigned long hard_nr_sectors;/* no. of sectors left to complete */ -/* no. of sectors left to submit in the current segment */ -unsigned int current_nr_sectors; - -/* no. of sectors left to complete in the current segment */ -unsigned int hard_cur_sectors; +sector_t sector;/* sector cursor */ +unsigned int data_len;/* total data len, don't access directly */ struct bio *bio;struct bio *biotail;
@@ -226,7 +215,6 @@ struct request {unsigned char __cmd[BLK_MAX_CDB ];unsigned char *cmd; -unsigned int data_len;unsigned int extra_len;/* length of alignment and padding */ unsigned int sense_len;unsigned int resid_len;/* residual count */
@@ -840,20 +828,27 @@ extern void blkdev_dequeue_request(struct request *req);*/ static inline sector_t blk_rq_pos (struct request *rq) { -return rq->hard_sector; +return rq->sector; +} + +static inline unsigned int blk_rq_bytes (struct request *rq) +{ +return rq->data_len; } -extern unsigned int blk_rq_bytes (struct request *rq); -extern unsigned int blk_rq_cur_bytes (struct request *rq); +static inline int blk_rq_cur_bytes (struct request *rq) +{ +return rq->bio ?bio_cur_bytes (rq->bio) :0 ; +}static inline unsigned int blk_rq_sectors (struct request *rq) { -return rq->hard_nr_sectors; +return blk_rq_bytes (rq) >>9 ; }static inline unsigned int blk_rq_cur_sectors (struct request *rq) { -return rq->hard_cur_sectors; +return blk_rq_cur_bytes (rq) >>9 ; }/*
@@ -928,7 +923,7 @@ static inline void blk_end_request_all(struct request *rq, int error)*/ static inline bool blk_end_request_cur (struct request *rq,int error) { -return blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return blk_end_request (rq, error,blk_rq_cur_bytes (rq)); }/**
@@ -981,7 +976,7 @@ static inline void __blk_end_request_all(struct request *rq, int error)*/ static inline bool __blk_end_request_cur (struct request *rq,int error) { -return __blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return __blk_end_request (rq, error,blk_rq_cur_bytes (rq)); }extern void blk_complete_request (struct request *);
include/linux/elevator.h +1 -1
@@ -171,7 +171,7 @@ enum { ELV_MQUEUE_MUST, }; -#define rq_end_sector (rq) ((rq)->sector + (rq)->nr_sectors) +#define rq_end_sector (rq) (blk_rq_pos(rq) + blk_rq_sectors(rq))#define rb_entry_rq (node) rb_entry((node), struct request, rb_node)/*
kernel/trace/blktrace.c +8 -8
@@ -642,12 +642,12 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq,if (blk_pc_request (rq)) { what |=BLK_TC_ACT (BLK_TC_PC ); -__blk_add_trace (bt,0 , rq->data_len, rw, what, rq->errors, - rq->cmd_len, rq->cmd); +__blk_add_trace (bt,0 ,blk_rq_bytes (rq), rw, + what, rq->errors, rq->cmd_len, rq->cmd); }else { what |=BLK_TC_ACT (BLK_TC_FS ); -__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_sectors (rq) <<9 , - rw, what, rq->errors,0 ,NULL ); +__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_bytes (rq), rw, + what, rq->errors,0 ,NULL ); } }
@@ -854,11 +854,11 @@ void blk_add_driver_data(struct request_queue *q,return ;if (blk_pc_request (rq)) -__blk_add_trace (bt,0 , rq->data_len,0 ,BLK_TA_DRV_DATA , - rq->errors, len, data); +__blk_add_trace (bt,0 ,blk_rq_bytes (rq),0 , +BLK_TA_DRV_DATA , rq->errors, len, data);else -__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_sectors (rq) <<9 , -0 ,BLK_TA_DRV_DATA , rq->errors, len, data); +__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_bytes (rq),0 , +BLK_TA_DRV_DATA , rq->errors, len, data); }EXPORT_SYMBOL_GPL (blk_add_driver_data);
Signature · 1 line
1.6.0.2
PATCH 8/10 block: cleanup rq->data_len usages
In reply to Tejun HeoWith recent unification of fields, it's now guaranteed that rq->data_len always equals blk_rq_bytes(). Convert all non-IDE direct users to accessors. IDE will be converted in a separate patch.
[ Impact: convert direct rq->data_len usages to blk_rq_bytes() ]
--- drivers/ata/libata-scsi.c | 2 +- drivers/block/ub.c | 8 ++++---- drivers/message/fusion/mptsas.c | 20 ++++++++++---------- drivers/message/i2o/i2o_block.c | 2 +- drivers/scsi/libsas/sas_expander.c | 8 ++++---- drivers/scsi/libsas/sas_host_smp.c | 18 +++++++++--------- drivers/scsi/mpt2sas/mpt2sas_transport.c | 21 +++++++++++---------- drivers/scsi/osd/osd_initiator.c | 4 ++-- drivers/scsi/scsi_lib.c | 13 ++++++------- drivers/scsi/scsi_tgt_lib.c | 2 +- fs/exofs/osd.c | 4 ++-- 11 files changed, 51 insertions(+), 51 deletions(-)
drivers/ata/libata-scsi.c +1 -1
@@ -1084,7 +1084,7 @@ static int atapi_drain_needed(struct request *rq)if (likely (!blk_pc_request (rq)))return 0 ; -if (!rq->data_len || (rq->cmd_flags &REQ_RW )) +if (!blk_rq_bytes (rq) || (rq->cmd_flags &REQ_RW ))return 0 ;return atapi_cmd_type (rq->cmd[0 ]) ==ATAPI_MISC ;
drivers/block/ub.c +4 -4
@@ -747,7 +747,7 @@ static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, {struct request *rq = urq->rq; -if (rq->data_len ==0 ) { +if (blk_rq_bytes (rq) ==0 ) { cmd->dir =UB_DIR_NONE ; }else {if (rq_data_dir (rq) ==WRITE )
@@ -762,7 +762,7 @@ static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun,memcpy (&cmd->cdb, rq->cmd, rq->cmd_len); cmd->cdb_len = rq->cmd_len; - cmd->len = rq->data_len; + cmd->len =blk_rq_bytes (rq);/* * To reapply this to every URB is not as incorrect as it looks.
@@ -783,8 +783,8 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)if (cmd->error ==0 ) {if (blk_pc_request (rq)) { -if (cmd->act_len < rq->data_len) - rq->resid_len = rq->data_len - cmd->act_len; +if (cmd->act_len <blk_rq_bytes (rq)) + rq->resid_len =blk_rq_bytes (rq) - cmd->act_len; scsi_status =0 ; }else {if (cmd->act_len != cmd->len) {
drivers/message/fusion/mptsas.c +10 -10
@@ -1277,8 +1277,8 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* do we need to support multiple segments? */ if (req->bio->bi_vcnt >1 || rsp->bio->bi_vcnt >1 ) {printk (MYIOC_s_ERR_FMT"%s: multiple segments req %u %u, rsp %u %u\n" , - ioc->name, __func__, req->bio->bi_vcnt, req->data_len, - rsp->bio->bi_vcnt, rsp->data_len); + ioc->name, __func__, req->bio->bi_vcnt,blk_rq_bytes (req), + rsp->bio->bi_vcnt,blk_rq_bytes (rsp));return -EINVAL ; }
@@ -1295,7 +1295,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, smpreq = (SmpPassthroughRequest_t *)mf;memset (smpreq,0 ,sizeof (*smpreq)); - smpreq->RequestDataLength =cpu_to_le16 (req->data_len -4 ); + smpreq->RequestDataLength =cpu_to_le16 (blk_rq_bytes (req) -4 ); smpreq->Function =MPI_FUNCTION_SMP_PASSTHROUGH ;if (rphy)
@@ -1321,10 +1321,10 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,MPI_SGE_FLAGS_END_OF_BUFFER |MPI_SGE_FLAGS_DIRECTION | mpt_addr_size()) << MPI_SGE_FLAGS_SHIFT; - flagsLength |= (req->data_len -4 ); + flagsLength |= (blk_rq_bytes (req) -4 ); dma_addr_out =pci_map_single (ioc->pcidev,bio_data (req->bio), - req->data_len,PCI_DMA_BIDIRECTIONAL ); +blk_rq_bytes (req),PCI_DMA_BIDIRECTIONAL );if (!dma_addr_out) goto put_mf;mpt_add_sge (psge, flagsLength, dma_addr_out);
@@ -1332,9 +1332,9 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* response */ flagsLength =MPT_SGE_FLAGS_SSIMPLE_READ ; - flagsLength |= rsp->data_len +4 ; + flagsLength |=blk_rq_bytes (rsp) +4 ; dma_addr_in =pci_map_single (ioc->pcidev,bio_data (rsp->bio), - rsp->data_len,PCI_DMA_BIDIRECTIONAL ); +blk_rq_bytes (rsp),PCI_DMA_BIDIRECTIONAL );if (!dma_addr_in) goto unmap;mpt_add_sge (psge, flagsLength, dma_addr_in);
@@ -1357,7 +1357,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;memcpy (req->sense, smprep,sizeof (*smprep)); req->sense_len =sizeof (*smprep); - rsp->resid_len = rsp->data_len - smprep->ResponseDataLength; + rsp->resid_len =blk_rq_bytes (rsp) - smprep->ResponseDataLength; }else {printk (MYIOC_s_ERR_FMT"%s: smp passthru reply failed to be returned\n" , ioc->name, __func__);
@@ -1365,10 +1365,10 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, } unmap:if (dma_addr_out) -pci_unmap_single (ioc->pcidev, dma_addr_out, req->data_len, +pci_unmap_single (ioc->pcidev, dma_addr_out,blk_rq_bytes (req),PCI_DMA_BIDIRECTIONAL );if (dma_addr_in) -pci_unmap_single (ioc->pcidev, dma_addr_in, rsp->data_len, +pci_unmap_single (ioc->pcidev, dma_addr_in,blk_rq_bytes (rsp),PCI_DMA_BIDIRECTIONAL ); put_mf:if (mf)
drivers/message/i2o/i2o_block.c +1 -1
@@ -430,7 +430,7 @@ static void i2o_block_end_request(struct request *req, int error,int leftover = (blk_rq_sectors (req) <<KERNEL_SECTOR_SHIFT );if (blk_pc_request (req)) - leftover = req->data_len; + leftover =blk_rq_bytes (req);if (error)blk_end_request (req, -EIO , leftover);
drivers/scsi/libsas/sas_expander.c +4 -4
@@ -1927,13 +1927,13 @@ int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,/* do we need to support multiple segments? */ if (req->bio->bi_vcnt >1 || rsp->bio->bi_vcnt >1 ) {printk ("%s: multiple segments req %u %u, rsp %u %u\n" , - __func__, req->bio->bi_vcnt, req->data_len, - rsp->bio->bi_vcnt, rsp->data_len); + __func__, req->bio->bi_vcnt,blk_rq_bytes (req), + rsp->bio->bi_vcnt,blk_rq_bytes (rsp));return -EINVAL ; } - ret =smp_execute_task (dev,bio_data (req->bio), req->data_len, -bio_data (rsp->bio), rsp->data_len); + ret =smp_execute_task (dev,bio_data (req->bio),blk_rq_bytes (req), +bio_data (rsp->bio),blk_rq_bytes (rsp));if (ret >0 ) {/* positive number is the untransferred residual */ rsp->resid_len = ret;
drivers/scsi/libsas/sas_host_smp.c +9 -9
@@ -137,21 +137,21 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,int error = -EINVAL ;/* eight is the minimum size for request and response frames */ -if (req->data_len <8 || rsp->data_len <8 ) +if (blk_rq_bytes (req) <8 ||blk_rq_bytes (rsp) <8 ) goto out; -if (bio_offset (req->bio) + req->data_len >PAGE_SIZE || -bio_offset (rsp->bio) + rsp->data_len >PAGE_SIZE ) { +if (bio_offset (req->bio) +blk_rq_bytes (req) >PAGE_SIZE || +bio_offset (rsp->bio) +blk_rq_bytes (rsp) >PAGE_SIZE ) {shost_printk (KERN_ERR , shost,"SMP request/response frame crosses page boundary" ); goto out; } - req_data =kzalloc (req->data_len,GFP_KERNEL ); + req_data =kzalloc (blk_rq_bytes (req),GFP_KERNEL );/* make sure frame can always be built ... we copy * back only the requested length */ - resp_data =kzalloc (max (rsp->data_len,128U ),GFP_KERNEL ); + resp_data =kzalloc (max (blk_rq_bytes (rsp),128U ),GFP_KERNEL );if (!req_data || !resp_data) { error = -ENOMEM ;
@@ -160,7 +160,7 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,local_irq_disable (); buf =kmap_atomic (bio_page (req->bio),KM_USER0 ) +bio_offset (req->bio); -memcpy (req_data, buf, req->data_len); +memcpy (req_data, buf,blk_rq_bytes (req));kunmap_atomic (buf -bio_offset (req->bio),KM_USER0 );local_irq_enable ();
@@ -176,8 +176,8 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req, resp_data[1 ] = req_data[1 ]; resp_data[2 ] =SMP_RESP_FUNC_UNK ; - req->resid_len = req->data_len; - rsp->resid_len = rsp->data_len; + req->resid_len =blk_rq_bytes (req); + rsp->resid_len =blk_rq_bytes (rsp);switch (req_data[1 ]) {case SMP_REPORT_GENERAL :
@@ -264,7 +264,7 @@ int sas_smp_host_handler(struct Scsi_Host *shost, struct request *req,local_irq_disable (); buf =kmap_atomic (bio_page (rsp->bio),KM_USER0 ) +bio_offset (rsp->bio); -memcpy (buf, resp_data, rsp->data_len); +memcpy (buf, resp_data,blk_rq_bytes (rsp));flush_kernel_dcache_page (bio_page (rsp->bio));kunmap_atomic (buf -bio_offset (rsp->bio),KM_USER0 );local_irq_enable ();
drivers/scsi/mpt2sas/mpt2sas_transport.c +11 -10
@@ -1041,7 +1041,7 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,if (req->bio->bi_vcnt >1 || rsp->bio->bi_vcnt >1 ) {printk (MPT2SAS_ERR_FMT "%s: multiple segments req %u %u, " "rsp %u %u\n" , ioc->name, __func__, req->bio->bi_vcnt, - req->data_len, rsp->bio->bi_vcnt, rsp->data_len); +blk_rq_bytes (req), rsp->bio->bi_vcnt,blk_rq_bytes (rsp));return -EINVAL ; }
@@ -1104,7 +1104,7 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, *((u64 *)&mpi_request->SASAddress) = (rphy) ?cpu_to_le64 (rphy->identify.sas_address) :cpu_to_le64 (ioc->sas_hba.sas_address); - mpi_request->RequestDataLength =cpu_to_le16 (req->data_len -4 ); + mpi_request->RequestDataLength =cpu_to_le16 (blk_rq_bytes (req) -4 ); psge = &mpi_request->SGL;/* WRITE sgel first */
@@ -1112,13 +1112,13 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_HOST_TO_IOC); sgl_flags = sgl_flags <<MPI2_SGE_FLAGS_SHIFT ; dma_addr_out =pci_map_single (ioc->pdev,bio_data (req->bio), - req->data_len,PCI_DMA_BIDIRECTIONAL ); +blk_rq_bytes (req),PCI_DMA_BIDIRECTIONAL );if (!dma_addr_out) {mpt2sas_base_free_smid (ioc,le16_to_cpu (smid)); goto unmap; } - ioc->base_add_sg_single (psge, sgl_flags | (req->data_len -4 ), + ioc->base_add_sg_single (psge, sgl_flags | (blk_rq_bytes (req) -4 ), dma_addr_out);/* incr sgel */
@@ -1129,14 +1129,14 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,MPI2_SGE_FLAGS_LAST_ELEMENT |MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_END_OF_LIST); sgl_flags = sgl_flags <<MPI2_SGE_FLAGS_SHIFT ; - dma_addr_in =pci_map_single (ioc->pdev,bio_data (rsp->bio), - rsp->data_len,PCI_DMA_BIDIRECTIONAL ); + dma_addr_in =pci_map_single (ioc->pdev,bio_data (rsp->bio), +blk_rq_bytes (rsp),PCI_DMA_BIDIRECTIONAL );if (!dma_addr_in) {mpt2sas_base_free_smid (ioc,le16_to_cpu (smid)); goto unmap; } - ioc->base_add_sg_single (psge, sgl_flags | (rsp->data_len +4 ), + ioc->base_add_sg_single (psge, sgl_flags | (blk_rq_bytes (rsp) +4 ), dma_addr_in); dtransportprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s - "
@@ -1170,7 +1170,8 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,memcpy (req->sense, mpi_reply,sizeof (*mpi_reply)); req->sense_len =sizeof (*mpi_reply); - rsp->resid_len = rsp->data_len - mpi_reply->ResponseDataLength; + rsp->resid_len =blk_rq_bytes (rsp) - + mpi_reply->ResponseDataLength; }else {dtransportprintk (ioc,printk (MPT2SAS_DEBUG_FMT "%s - no reply\n" , ioc->name, __func__));
@@ -1186,10 +1187,10 @@ transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy, unmap:if (dma_addr_out) -pci_unmap_single (ioc->pdev, dma_addr_out, req->data_len, +pci_unmap_single (ioc->pdev, dma_addr_out,blk_rq_bytes (req),PCI_DMA_BIDIRECTIONAL );if (dma_addr_in) -pci_unmap_single (ioc->pdev, dma_addr_in, rsp->data_len, +pci_unmap_single (ioc->pdev, dma_addr_in,blk_rq_bytes (rsp),PCI_DMA_BIDIRECTIONAL ); out:
drivers/scsi/osd/osd_initiator.c +2 -2
@@ -1299,7 +1299,7 @@ int osd_finalize_request(struct osd_request *or,return ret; }OSD_DEBUG ("out bytes=%llu (bytes_req=%u)\n" , -_LLU (or->out.total_bytes), or->out.req->data_len); +_LLU (or->out.total_bytes),blk_rq_bytes (or->out.req)); }if (or->in.bio) { ret =blk_rq_append_bio (or->request->q, or->in.req, or->in.bio);
@@ -1308,7 +1308,7 @@ int osd_finalize_request(struct osd_request *or,return ret; }OSD_DEBUG ("in bytes=%llu (bytes_req=%u)\n" , -_LLU (or->in.total_bytes), or->in.req->data_len); +_LLU (or->in.total_bytes),blk_rq_bytes (or->in.req)); } or->out.pad_buff = sg_out_pad_buffer;
drivers/scsi/scsi_lib.c +6 -7
@@ -682,14 +682,13 @@ EXPORT_SYMBOL(scsi_release_buffers);static void scsi_end_bidi_request (struct scsi_cmnd *cmd) {struct request *req = cmd->request; -unsigned int dlen = req->data_len; -unsigned int next_dlen = req->next_rq->data_len; req->resid_len =scsi_out (cmd)->resid; req->next_rq->resid_len =scsi_in (cmd)->resid;/* The req and req->next_rq have not been completed */ -BUG_ON (blk_end_bidi_request (req,0 , dlen, next_dlen)); +BUG_ON (blk_end_bidi_request (req,0 ,blk_rq_bytes (req), +blk_rq_bytes (req->next_rq)));scsi_release_buffers (cmd);
@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;return BLKPREP_OK ;
@@ -1087,21 +1086,21 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)if (unlikely (ret))return ret; }else { -BUG_ON (req->data_len); +BUG_ON (blk_rq_bytes (req));memset (&cmd->sdb,0 ,sizeof (cmd->sdb)); req->buffer =NULL ; } cmd->cmd_len = req->cmd_len; -if (!req->data_len) +if (!blk_rq_bytes (req)) cmd->sc_data_direction =DMA_NONE ;else if (rq_data_dir (req) ==WRITE ) cmd->sc_data_direction =DMA_TO_DEVICE ;else cmd->sc_data_direction =DMA_FROM_DEVICE ; - cmd->transfersize = req->data_len; + cmd->transfersize =blk_rq_bytes (req); cmd->allowed = req->retries;return BLKPREP_OK ; }
drivers/scsi/scsi_tgt_lib.c +1 -1
@@ -387,7 +387,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,* we use REQ_TYPE_BLOCK_PC so scsi_init_io doesn't set the * length for us. */ - cmd->sdb.length = rq->data_len; + cmd->sdb.length =blk_rq_bytes (rq);return 0 ;
fs/exofs/osd.c +2 -2
@@ -50,10 +50,10 @@ int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid)/* FIXME: should be include in osd_sense_info */ if (in_resid) - *in_resid = or->in.req ? or->in.req->data_len :0 ; + *in_resid = or->in.req ?blk_rq_bytes (or->in.req) :0 ;if (out_resid) - *out_resid = or->out.req ? or->out.req->data_len :0 ; + *out_resid = or->out.req ?blk_rq_bytes (or->out.req) :0 ;return ret; }
Signature · 1 line
1.6.0.2
PATCH 9/10 ide: cleanup rq->data_len usages
In reply to Tejun HeoWith recent unification of fields, it's now guaranteed that rq->data_len always equals blk_rq_bytes(). Convert all direct users to accessors.
[ Impact: convert direct rq->data_len usages to blk_rq_bytes() ]
--- drivers/ide/ide-atapi.c | 4 ++-- drivers/ide/ide-cd.c | 25 +++++++------------------ drivers/ide/ide-floppy.c | 4 ++-- drivers/ide/ide-io.c | 2 +- 4 files changed, 12 insertions(+), 23 deletions(-)
drivers/ide/ide-atapi.c +2 -2
@@ -255,7 +255,7 @@ void ide_retry_pc(ide_drive_t *drive)ide_init_pc (pc);memcpy (pc->c, sense_rq->cmd,12 ); pc->buf =bio_data (sense_rq->bio);/* pointer to mapped address */ - pc->req_xfer = sense_rq->data_len; + pc->req_xfer =blk_rq_bytes (sense_rq);if (drive->media == ide_tape)set_bit (IDE_AFLAG_IGNORE_DSC , &drive->atapi_flags);
@@ -303,7 +303,7 @@ int ide_cd_get_xferlen(struct request *rq)return 32768 ; else if (blk_sense_request(rq) || blk_pc_request(rq) || rq->cmd_type == REQ_TYPE_ATA_PC) - return rq->data_len; + return blk_rq_bytes(rq); else return 0; }
drivers/ide/ide-cd.c +7 -18
@@ -577,7 +577,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)struct request *rq = hwif->rq;ide_expiry_t *expiry =NULL ;int dma_error =0 , dma, thislen, uptodate =0 ; -int write = (rq_data_dir (rq) ==WRITE ) ?1 :0 , rc =0 , nsectors; +int write = (rq_data_dir (rq) ==WRITE ) ?1 :0 , rc =0 ;int sense =blk_sense_request (rq);unsigned int timeout;u16 len;
@@ -707,9 +707,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) out_end:if (blk_pc_request (rq) && rc ==0 ) { -if (blk_end_request (rq,0 , rq->data_len)) -BUG (); - +blk_end_request_all (rq,0 ); hwif->rq =NULL ; }else {if (sense && uptodate)
@@ -727,22 +725,14 @@ out_end:ide_cd_error_cmd (drive, cmd);/* make sure it's fully ended */ -if (blk_pc_request (rq)) - nsectors = (rq->data_len +511 ) >>9 ; -else - nsectors =blk_rq_sectors (rq); - -if (nsectors ==0 ) - nsectors =1 ; -if (blk_fs_request (rq) ==0 ) { - rq->resid_len = rq->data_len - + rq->resid_len =blk_rq_bytes (rq) - (cmd->nbytes - cmd->nleft);if (uptodate ==0 && (cmd->tf_flags &IDE_TFLAG_WRITE )) rq->resid_len += cmd->last_xfer_len; } -ide_complete_rq (drive, uptodate ?0 : -EIO , nsectors <<9 ); +ide_complete_rq (drive, uptodate ?0 : -EIO ,blk_rq_bytes (rq));if (sense && rc ==2 )ide_error (drive,"request sense failure" , stat);
@@ -819,7 +809,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)*/ alignment =queue_dma_alignment (q) | q->dma_pad_mask;if ((unsigned long )buf & alignment - || rq->data_len & q->dma_pad_mask + ||blk_rq_bytes (rq) & q->dma_pad_mask ||object_is_on_stack (buf)) drive->dma =0 ; }
@@ -867,9 +857,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, cmd.rq = rq; -if (blk_fs_request (rq) || rq->data_len) { -ide_init_sg_cmd (&cmd,blk_fs_request (rq) ? - (blk_rq_sectors (rq) <<9 ) : rq->data_len); +if (blk_fs_request (rq) ||blk_rq_bytes (rq)) { +ide_init_sg_cmd (&cmd,blk_rq_bytes (rq));ide_map_sg (drive, &cmd); }
drivers/ide/ide-floppy.c +2 -2
@@ -220,14 +220,14 @@ static void idefloppy_blockpc_cmd(struct ide_disk_obj *floppy,ide_init_pc (pc);memcpy (pc->c, rq->cmd,sizeof (pc->c)); pc->rq = rq; -if (rq->data_len) { +if (blk_rq_bytes (rq)) { pc->flags |=PC_FLAG_DMA_OK ;if (rq_data_dir (rq) ==WRITE ) pc->flags |=PC_FLAG_WRITING ; }/* pio will be performed by ide_pio_bytes() which handles sg fine */ pc->buf =NULL ; - pc->req_xfer = pc->buf_size = rq->data_len; + pc->req_xfer = pc->buf_size =blk_rq_bytes (rq); } static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
drivers/ide/ide-io.c +1 -1
@@ -116,7 +116,7 @@ void ide_complete_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat, u8 err)unsigned int ide_rq_bytes (struct request *rq) {if (blk_pc_request (rq)) -return rq->data_len; +return blk_rq_bytes (rq);else return blk_rq_cur_sectors (rq) <<9 ; }
Signature · 1 line
1.6.0.2
PATCH 10/10 block: hide request sector and data_len
In reply to Tejun HeoBlock low level drivers for some reason have been pretty good at abusing block layer API. Especially struct request's fields tend to get violated in all possible ways. Make it clear that low level drivers MUST NOT access or manipulate rq->sector and rq->data_len directly by prefixing them with double underscores.
This change is also necessary to break build of out-of-tree codes which assume the previous block API where internal fields can be manipulated and rq->data_len carries residual count on completion.
[ Impact: hide internal fields, block API change ]
--- block/blk-core.c | 20 ++++++++++---------- block/blk-map.c | 2 +- block/blk-merge.c | 2 +- include/linux/blkdev.h | 9 +++++---- 4 files changed, 17 insertions(+), 16 deletions(-)
block/blk-core.c +10 -10
@@ -127,7 +127,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq)INIT_LIST_HEAD (&rq->timeout_list); rq->cpu =-1 ; rq->q = q; - rq->sector = (sector_t) -1 ; + rq->__sector = (sector_t) -1 ;INIT_HLIST_NODE (&rq->hash);RB_CLEAR_NODE (&rq->rb_node); rq->cmd = rq->__cmd;
@@ -1095,7 +1095,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) req->cmd_flags |=REQ_NOIDLE ; req->errors =0 ; - req->sector = bio->bi_sector; + req->__sector = bio->bi_sector; req->ioprio =bio_prio (bio);blk_rq_bio_prep (req->q, req, bio); }
@@ -1143,7 +1143,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) req->biotail->bi_next = bio; req->biotail = bio; - req->data_len += bytes; + req->__data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;
@@ -1169,8 +1169,8 @@ static int __make_request(struct request_queue *q, struct bio *bio)* not touch req->buffer either... */ req->buffer =bio_data (bio); - req->sector = bio->bi_sector; - req->data_len += bytes; + req->__sector = bio->bi_sector; + req->__data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;
@@ -1878,7 +1878,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)* can find how many bytes remain in the request * later. */ - req->data_len =0 ; + req->__data_len =0 ;return false; }
@@ -1892,12 +1892,12 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)bio_iovec (bio)->bv_len -= nr_bytes; } - req->data_len -= total_bytes; + req->__data_len -= total_bytes; req->buffer =bio_data (req->bio);/* update sector only for requests with clear definition of sector */ if (blk_fs_request (req) ||blk_discard_rq (req)) - req->sector += total_bytes >>9 ; + req->__sector += total_bytes >>9 ;/* * If total number of sectors is less than the first segment
@@ -1905,7 +1905,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)*/ if (blk_rq_bytes (req) <blk_rq_cur_bytes (req)) {printk (KERN_ERR "blk: request botched\n" ); - req->data_len =blk_rq_cur_bytes (req); + req->__data_len =blk_rq_cur_bytes (req); }/* recalculate the number of segments */
@@ -2032,7 +2032,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, rq->nr_phys_segments =bio_phys_segments (q, bio); rq->buffer =bio_data (bio); } - rq->data_len = bio->bi_size; + rq->__data_len = bio->bi_size; rq->bio = rq->biotail = bio;if (bio->bi_bdev)
block/blk-map.c +1 -1
@@ -20,7 +20,7 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq, rq->biotail->bi_next = bio; rq->biotail = bio; - rq->data_len += bio->bi_size; + rq->__data_len += bio->bi_size; }return 0 ; }
block/blk-merge.c +1 -1
@@ -370,7 +370,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, req->biotail->bi_next = next->bio; req->biotail = next->biotail; - req->data_len +=blk_rq_bytes (next); + req->__data_len +=blk_rq_bytes (next);elv_merge_requests (q, req, next);
include/linux/blkdev.h +5 -4
@@ -166,8 +166,9 @@ struct request {enum rq_cmd_type_bits cmd_type;unsigned long atomic_flags; -sector_t sector;/* sector cursor */ -unsigned int data_len;/* total data len, don't access directly */ +/* the following two fields are internal, NEVER access directly */ +sector_t __sector;/* sector cursor */ +unsigned int __data_len;/* total data len */ struct bio *bio;struct bio *biotail;
@@ -828,12 +829,12 @@ extern void blkdev_dequeue_request(struct request *req);*/ static inline sector_t blk_rq_pos (struct request *rq) { -return rq->sector; +return rq->__sector; }static inline unsigned int blk_rq_bytes (struct request *rq) { -return rq->data_len; +return rq->__data_len; }static inline int blk_rq_cur_bytes (struct request *rq)
Signature · 1 line
1.6.0.2
Re: [PATCH 04/10] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones
In reply to Tejun HeoQuoted 5 lines · Tejun Heo
Implement accessors -
blk_rq_pos(),blk_rq_sectors()andblk_rq_cur_sectors()which returnrq->sector,rq->hard_nr_sectorsandrq->hard_cur_sectorsrespectively and convert direct references of the said fields to the accessors.
Quoted 8 lines
This is in preparation of request data length handling cleanup.
[ Impact: cleanup ]
Signed-off-by Tejun Heo <[email protected]>Cc Geert Uytterhoeven <[email protected]>drivers/block/ps3disk.c | 2 +-
Quoted 6 lines
include/linux/blkdev.h +0
-0@@ -832,13 +832,30 @@ static inline void blk_run_address_space(struct address_space *mapping)extern void blkdev_dequeue_request (struct request *req);/*
include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 841
Quoted 10 lines
include/linux/blkdev.h +6
-3-* blk_end_request() takes bytes instead of sectors as a complete size. -* blk_rq_bytes() returns bytes left to complete in the entire request. -* blk_rq_cur_bytes() returns bytes left to complete in the current segment. +* blk_rq_pos() : the current sector +* blk_rq_bytes() : bytes left in the entire request +* blk_rq_cur_bytes() : bytes left in the current segment +* blk_rq_sectors() : sectors left in the entire request +* blk_rq_cur_sectors() : sectors left in the current segment */ +static inline sector_t blk_rq_pos (struct request *rq)
^ const?
include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 849
Quoted 8 lines
include/linux/blkdev.h +5
-0+{ +return rq->hard_sector; +} +extern unsigned int blk_rq_bytes (struct request *rq);extern unsigned int blk_rq_cur_bytes (struct request *rq); +static inline unsigned int blk_rq_sectors (struct request *rq)
^ const?
include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 854
Quoted 5 lines
include/linux/blkdev.h +5
-0+{ +return rq->hard_nr_sectors; +} + +static inline unsigned int blk_rq_cur_sectors (struct request *rq)
^ const?
include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 858
Quoted 4 lines
include/linux/blkdev.h +4
-0+{ +return rq->hard_cur_sectors; +} +
With kind regards,
Geert Uytterhoeven
Software Architect
Techsoft Centre
Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: [email protected] Internet: http://www.sony-europe.com/
A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 05/10] block: convert to pos and nr_sectors accessors
In reply to Tejun HeoQuoted 8 lines · Tejun Heo
With recent cleanups, there is no place where low level driver directly manipulates request fields. This means that the 'hard' request fields always equal the !hard fields. Convert all
rq->sectors,nr_sectorsandcurrent_nr_sectorsreferences to accessors.[ Impact: use pos and
nr_sectorsaccessors ]
Quoted 8 lines
Signed-off-by Tejun Heo <[email protected]>Cc Geert Uytterhoeven <[email protected]>drivers/block/amiflop.c | 6 ++-- drivers/block/ataflop.c | 10 +++--- drivers/block/ps3disk.c | 9 ++--- drivers/block/swim3.c | 34 ++++++++++++---------- drivers/block/z2ram.c | 6 ++--
Looks OK, so
drivers/block/z2ram.c static void do_z2_request(struct request_queue *q) · line 75
Quoted 12 lines
drivers/block/z2ram.c +2
-2@@ -71,12 +71,12 @@ static void do_z2_request(struct request_queue *q) {struct request *req;while ((req =elv_next_request (q)) !=NULL ) { -unsigned long start = req->sector <<9 ; -unsigned long len = req->current_nr_sectors <<9 ; +unsigned long start =blk_rq_pos (req) <<9 ; +unsigned long len =blk_rq_cur_sectors (req) <<9 ;
^^^^^^^^^^^^^
I guess this one can become `unsigned int' now, as:
static inline unsigned int blk_rq_cur_sectors(struct request *rq)
{
return blk_rq_cur_bytes(rq) >> 9;
}and blk_rq_cur_bytes(rq) returns int', so it must fit in an int' anyway?
With kind regards,
Geert Uytterhoeven
Software Architect
Techsoft Centre
Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: [email protected] Internet: http://www.sony-europe.com/
A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 04/10] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones
In reply to Geert UytterhoevenQuoted 20 lines
Quoted 1 line
+static inline
sector_tblk_rq_pos(struct request *rq)^ const?include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 849
Quoted 8 lines
include/linux/blkdev.h +5
-0+{ +return rq->hard_sector; +} +extern unsigned int blk_rq_bytes (struct request *rq);extern unsigned int blk_rq_cur_bytes (struct request *rq); +static inline unsigned int blk_rq_sectors (struct request *rq)^ const?include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 854
Quoted 5 lines
include/linux/blkdev.h +5
-0+{ +return rq->hard_nr_sectors; +} + +static inline unsigned int blk_rq_cur_sectors (struct request *rq)^ const?
Quoted 4 lines
include/linux/blkdev.h static inline void blk_run_address_space(struct address_space *mapping) · line 858
Quoted 4 lines
include/linux/blkdev.h +4
-0+{ +return rq->hard_cur_sectors; +} +
consts and acked-by added.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 05/10] block: convert to pos and nr_sectors accessors
In reply to Geert UytterhoevenHello,
Quoted 13 lines · Geert Uytterhoeven
drivers/block/z2ram.c static void do_z2_request(struct request_queue *q) · line 75
Quoted 12 lines
drivers/block/z2ram.c +2
-2@@ -71,12 +71,12 @@ static void do_z2_request(struct request_queue *q) {struct request *req;while ((req =elv_next_request (q)) !=NULL ) { -unsigned long start = req->sector <<9 ; -unsigned long len = req->current_nr_sectors <<9 ; +unsigned long start =blk_rq_pos (req) <<9 ; +unsigned long len =blk_rq_cur_sectors (req) <<9 ;^^^^^^^^^^^^^
Quoted 8 lines
I guess this one can become `unsigned int' now, as:
static inline unsigned int
blk_rq_cur_sectors(struct request *rq){ return blk_rq_cur_bytes(rq) >> 9; }and
blk_rq_cur_bytes(rq)returnsint', so it must fit in anint' anyway?
Yeap, it should fit. Given the way len is used there and the previous usage had the same type promotion there, I think it's better to leave the unsigned long alone there.
Acked-by added. Thanks.
Signature · 1 line
tejun
Re: [PATCH 04/10] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones
In reply to Tejun HeoQuoted 2 lines · On Wed, 29 Apr 2009 18:13:42 +0900 Tejun Heo <[email protected]> wrote:
drivers/block/viodasd.c | 6 +++---
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
James Bottomley
maintainerRe: [PATCH 03/10] block: add rq->resid_len
In reply to Tejun HeoQuoted 22 lines · Tejun Heo
rq->data_lenserved two purposes - the length of data buffer on issue and the residual count on completion. This duality creates some headaches.First of all, block layer and low level drivers can't really determine what
rq->data_lencontains while a request is executing. It could be the total request length or it coulde be anything else one of the lower layers is using to keep track of residual count. This complicates things becauseblk_rq_bytes()and thus [__]blk_end_request_all() relies onrq->data_lenfor PC commands. Drivers which want to report residual count should first cache the total request length, updaterq->data_lenand then complete the request with the cached data length.Secondly, it makes requests default to reporting full residual count, ie. reporting that no data transfer occurred. The residual count is an exception not the norm; however, the driver should clear
rq->data_lento zero to signify the normal cases while leaving it alone means no data transfer occurred at all. This reverse default behavior complicates code unnecessarily and renders block PC on some drivers (ide-tape/floppy) unuseable.
Quoted 6 lines
This patch adds
rq->resid_lenwhich is used only for residual count.While at it, remove now unnecessasry
blk_rq_bytes()caching inide_pc_intr()asrq->data_lenis not changed anymore.[ Impact: cleanup residual count handling, report 0 resid by default ]
This looks good (although I'd like to test it first).
Might it not be better to have an accessor setting resid_len? All the other patches in the series insulate users from the actual members of struct request by accessors, so this is a bit the odd man out.
James
Re: [PATCH 05/10] block: convert to pos and nr_sectors accessors
In reply to Tejun HeoQuoted 9 lines · Tejun Heo
With recent cleanups, there is no place where low level driver directly manipulates request fields. This means that the 'hard' request fields always equal the !hard fields. Convert all
rq->sectors,nr_sectorsandcurrent_nr_sectorsreferences to accessors.[ Impact: use pos and
nr_sectorsaccessors ]---
[...]
Quoted 1 line
drivers/block/xsysace.c | 17 ++++++-----
g.
Re: [PATCH 04/10] block: implement blk_rq_pos/[cur_]sectors() and convert obvious ones
In reply to Tejun HeoQuoted 9 lines · Tejun Heo
Implement accessors -
blk_rq_pos(),blk_rq_sectors()andblk_rq_cur_sectors()which returnrq->sector,rq->hard_nr_sectorsandrq->hard_cur_sectorsrespectively and convert direct references of the said fields to the accessors.This is in preparation of request data length handling cleanup.
[ Impact: cleanup ]
---
[...]
Quoted 1 line
drivers/block/xsysace.c | 10 +++++-----
g.
Signature · 6 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 03/10] block: add rq->resid_len
In reply to James BottomleyHello, James.
Quoted 1 line · James Bottomley
This looks good (although I'd like to test it first).
Yeah, this will need quite a bit of testing.
Quoted 4 lines
Might it not be better to have an accessor setting
resid_len? All the other patches in the series insulate users from the actual members of struct request by accessors, so this is a bit the odd man out.
I actually think it's better to expose resid_len in this case as the semantics of the field is - initialized to zero on issue, contains residual count on completion and whatever it contains inbetween is upto the low level driver. Request position or length are different as they must contain well defined values throughout request processing and both block layer and low level driver should agree on what they mean.
Fancy words aside, it basically boils down to allowing llds to do either "rq->resid_len = blk_rq_bytes() - xferred" on completion or "rq->resid_len = blk_rq_bytes()" on issue and "rq->resid_len -= increments" while processing.
It would be better to check that the value is sane on completion tho.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 02/10] ide-tape: don't initialize rq->sector for rw requests
In reply to Tejun HeoQuoted 7 lines · Tejun Heo
rq->sectoris set to thetape->first_framebut it's never actually used and not even in the correct unit (512 byte sectors). Don't set it.[ Impact: cleanup ]
Signed-off-by Tejun Heo <[email protected]>
Signature · 2 lines
Regards/Gruss,
Boris.Re: [PATCH 03/10] block: add rq->resid_len
In reply to Tejun HeoQuoted 20 lines · Tejun Heo
Hello, James.
Quoted 1 line · James Bottomley
This looks good (although I'd like to test it first).
Yeah, this will need quite a bit of testing.
Quoted 4 lines
Might it not be better to have an accessor setting
resid_len? All the other patches in the series insulate users from the actual members of struct request by accessors, so this is a bit the odd man out.I actually think it's better to expose
resid_lenin this case as the semantics of the field is - initialized to zero on issue, contains residual count on completion and whatever it contains inbetween is upto the low level driver. Request position or length are different as they must contain well defined values throughout request processing and both block layer and low level driver should agree on what they mean.
Quoted 4 lines
Fancy words aside, it basically boils down to allowing llds to do either "
rq->resid_len=blk_rq_bytes()- xferred" on completion or "rq->resid_len=blk_rq_bytes()" on issue and "rq->resid_len-= increments" while processing.
Actually, the second one sounds more natural: resid_len == data_len on issue and decrementing while travelling through block layer and LLDD, while resid_len == 0 in issue might get confused somewhere.
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and rq->resid_len is much more cleaner, IMHO.
/me testing...
Signature · 2 lines
Regards/Gruss,
Boris.Re: [PATCH 03/10] block: add rq->resid_len
Quoted 8 lines · Borislav Petkov
Quoted 4 lines
Fancy words aside, it basically boils down to allowing llds to do either "
rq->resid_len=blk_rq_bytes()- xferred" on completion or "rq->resid_len=blk_rq_bytes()" on issue and "rq->resid_len-= increments" while processing.Actually, the second one sounds more natural:
resid_len==data_lenon issue and decrementing while travelling through block layer and LLDD, whileresid_len== 0 in issue might get confused somewhere.
Yeap, it depends on how the specific low level driver is doing it.
Quoted 5 lines
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and
rq->resid_lenis much more cleaner, IMHO./me testing...
AFAICT, residual count handling in ide was most broken. This patch doesn't fix anything other than making it report 0 resid_len on SG_IO which is usually better than reporting full residual count. The only place inside ide where residual count is used in the tape driver to determine actually transferred size. That part works okay with the patch applied.
Hmmm... maybe it's about time to finally clean up residual count handling in ide and libata, which BTW doesn't do anything about it at the moment.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 03/10] block: add rq->resid_len
In reply to Borislav PetkovQuoted 8 lines · Borislav Petkov
Quoted 4 lines
Fancy words aside, it basically boils down to allowing llds to do either "
rq->resid_len=blk_rq_bytes()- xferred" on completion or "rq->resid_len=blk_rq_bytes()" on issue and "rq->resid_len-= increments" while processing.Actually, the second one sounds more natural:
resid_len==data_lenon issue and decrementing while travelling through block layer and LLDD, whileresid_len== 0 in issue might get confused somewhere.
Yeap, it depends on how the specific low level driver is doing it.
Quoted 5 lines
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and
rq->resid_lenis much more cleaner, IMHO./me testing...
AFAICT, residual count handling in ide was most broken. This patch doesn't fix anything other than making it report 0 resid_len on SG_IO which is usually better than reporting full residual count. The only place inside ide where residual count is used in the tape driver to determine actually transferred size. That part works okay with the patch applied.
Hmmm... maybe it's about time to finally clean up residual count handling in ide and libata, which BTW doesn't do anything about it at the moment.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 03/10] block: add rq->resid_len
In reply to Tejun HeoQuoted 12 lines · Tejun Heo
Quoted 8 lines · Borislav Petkov
Quoted 4 lines
Fancy words aside, it basically boils down to allowing llds to do either "
rq->resid_len=blk_rq_bytes()- xferred" on completion or "rq->resid_len=blk_rq_bytes()" on issue and "rq->resid_len-= increments" while processing.Actually, the second one sounds more natural:
resid_len==data_lenon issue and decrementing while travelling through block layer and LLDD, whileresid_len== 0 in issue might get confused somewhere.Yeap, it depends on how the specific low level driver is doing it.
Quoted 7 lines
Quoted 5 lines
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and
rq->resid_lenis much more cleaner, IMHO./me testing...
AFAICT, residual count handling in ide was most broken.
Tell me about it :).
Quoted 9 lines
This patch doesn't fix anything other than making it report 0
resid_lenonSG_IOwhich is usually better than reporting full residual count. The only place inside ide where residual count is used in the tape driver to determine actually transferred size. That part works okay with the patch applied.Hmmm... maybe it's about time to finally clean up residual count handling in ide and libata, which BTW doesn't do anything about it at the moment.
Completely agreed. This doesn't do anything about it right now but with rq->resid_len in place I could get rid of a bunch of pc->xferred, cmd->nleft and similar on-stack structs we've been introducing, and use solely an rq in the LLD. I'll get to do some experimenting tomorrow and whip up some cleanup patches in order to see how it could look exactly. Stay tuned.
Thanks.
Signature · 2 lines
Regards/Gruss,
Boris.Re: [PATCH 03/10] block: add rq->resid_len
Quoted 6 lines · Borislav Petkov
Quoted 6 lines
Quoted 5 lines
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and
rq->resid_lenis much more cleaner, IMHO./me testing...
AFAICT, residual count handling in ide was most broken.
Oooh... It was "mostly broken" not "most broken". Where went my l and y?
Quoted 12 lines
Tell me about it :).
Quoted 9 lines
This patch doesn't fix anything other than making it report 0
resid_lenonSG_IOwhich is usually better than reporting full residual count. The only place inside ide where residual count is used in the tape driver to determine actually transferred size. That part works okay with the patch applied.Hmmm... maybe it's about time to finally clean up residual count handling in ide and libata, which BTW doesn't do anything about it at the moment.
Quoted 6 lines
Completely agreed. This doesn't do anything about it right now but with
rq->resid_lenin place I could get rid of a bunch ofpc->xferred,cmd->nleftand similar on-stack structs we've been introducing, and use solely an rq in the LLD. I'll get to do some experimenting tomorrow and whip up some cleanup patches in order to see how it could look exactly. Stay tuned.
Yay, cool. :-)
Signature · 1 line
tejun
Re: [PATCH 03/10] block: add rq->resid_len
In reply to Borislav PetkovQuoted 6 lines · Borislav Petkov
Quoted 6 lines
Quoted 5 lines
And I like it too, we've been coming up with all sorts of hacks in ide-atapi wrt to residual completion and accounting of what got xferred already and
rq->resid_lenis much more cleaner, IMHO./me testing...
AFAICT, residual count handling in ide was most broken.
Oooh... It was "mostly broken" not "most broken". Where went my l and y?
Quoted 12 lines
Tell me about it :).
Quoted 9 lines
This patch doesn't fix anything other than making it report 0
resid_lenonSG_IOwhich is usually better than reporting full residual count. The only place inside ide where residual count is used in the tape driver to determine actually transferred size. That part works okay with the patch applied.Hmmm... maybe it's about time to finally clean up residual count handling in ide and libata, which BTW doesn't do anything about it at the moment.
Quoted 6 lines
Completely agreed. This doesn't do anything about it right now but with
rq->resid_lenin place I could get rid of a bunch ofpc->xferred,cmd->nleftand similar on-stack structs we've been introducing, and use solely an rq in the LLD. I'll get to do some experimenting tomorrow and whip up some cleanup patches in order to see how it could look exactly. Stay tuned.
Yay, cool. :-)
Signature · 1 line
tejun
Re: [PATCH 07/10] block: drop request->hard_* and *nr_sectors
In reply to Tejun HeoQuoted 223 lines · Tejun Heo
struct request has had a few different ways to represent some properties of a request. ->hard_* represent block layer's view of the request progress (completion cursor) and the ones without the prefix are supposed to represent the issue cursor and allowed to be updated as necessary by the low level drivers. The thing is that as block layer supports partial completion, the two cursors really aren't necessary and only cause confusion. In addition, manual management of request detail from low level drivers is cumbersome and error-prone at the very least.
Another interesting duplicate fields are rq->[hard_]nr_sectors and rq->{hard_cur|current}_nr_sectors against
rq->data_lenandrq->bio->bi_size. This is more convoluted than thehard_case.rq->[hard_]nr_sectors are initialized for requests with bio but
blk_rq_bytes()uses it only for !pc requests.rq->data_lenis initialized for all request butblk_rq_bytes()uses it only for pc requests. This causes good amount of confusion throughout block layer and its drivers and determining the request length has been a bit of black magic which may or may not work depending on circumstances and what the specific LLD is actually doing.rq->{hard_cur|current}_nr_sectors represent the number of sectors in the contiguous data area at the front. This is mainly used by drivers which transfers data by walking request segment-by-segment. This value always equals
rq->bio->bi_size>> 9. However, data length for pc requests may not be multiple of 512 bytes and using this field becomes a bit confusing.In general, having multiple fields to represent the same property leads only to confusion and subtle bugs. With recent block low level driver cleanups, no driver is accessing or manipulating these duplicate fields directly. Drop all the duplicates. Now
rq->sectormeans the current sector,rq->data_lenthe current total length andrq->bio->bi_sizethe current segment length. Everything else is defined in terms of these three and available only through accessors.*
blk_recalc_rq_sectors()is collapsed intoblk_update_request()and now handles pc and fs requests equally other thanrq->sectorupdate. This means that now pc requests can use partial completion too (no in-kernel user yet tho).*
bio_cur_sectors()is replaced withbio_cur_bytes()as block layer now uses byte count as the primary data length.*
blk_rq_pos()is now guranteed to be always correct. In-block users converted.*
blk_rq_bytes()is now guaranteed to be always valid as isblk_rq_sectors(). In-block users converted.*
blk_rq_sectors()is now guaranteed to equalblk_rq_bytes()>> 9. More convenient one is used.[ Impact: API cleanup, single way to represent one property of a request ]
Signed-off-by Tejun Heo <[email protected]>Cc Boaz Harrosh <[email protected]>--- block/blk-core.c | 81 +++++++++++++++++----------------------------- block/blk-merge.c | 36 ++------------------ block/blk.h | 1 - block/cfq-iosched.c | 10 +++--- include/linux/bio.h | 6 ++-- include/linux/blkdev.h | 37 +++++++++------------ include/linux/elevator.h | 2 +- kernel/trace/blktrace.c | 16 ++++---- 8 files changed, 67 insertions(+), 122 deletions(-)block/blk-core.c +17
-47@@ -127,7 +127,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq)INIT_LIST_HEAD (&rq->timeout_list); rq->cpu =-1 ; rq->q = q; - rq->sector = rq->hard_sector = (sector_t) -1 ; + rq->sector = (sector_t) -1 ;INIT_HLIST_NODE (&rq->hash);RB_CLEAR_NODE (&rq->rb_node); rq->cmd = rq->__cmd;@@ -189,8 +189,7 @@ void blk_dump_rq_flags(struct request *rq, char *msg) (unsigned long long )blk_rq_pos (rq), blk_rq_sectors(rq), blk_rq_cur_sectors(rq));printk (KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n" , - rq->bio, rq->biotail, - rq->buffer, rq->data_len); + rq->bio, rq->biotail, rq->buffer,blk_rq_bytes (rq));if (blk_pc_request (rq)) {printk (KERN_INFO " cdb: " );@@ -1096,7 +1095,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) req->cmd_flags |=REQ_NOIDLE ; req->errors =0 ; - req->hard_sector = req->sector = bio->bi_sector; + req->sector = bio->bi_sector; req->ioprio =bio_prio (bio);blk_rq_bio_prep (req->q, req, bio); }@@ -1113,14 +1112,13 @@ static inline bool queue_should_plug(struct request_queue *q)static int __make_request (struct request_queue *q,struct bio *bio) {struct request *req; -int el_ret, nr_sectors; +int el_ret; +unsigned int bytes = bio->bi_size;const unsigned short prio =bio_prio (bio);const int sync =bio_sync (bio);const int unplug =bio_unplug (bio);int rw_flags; - nr_sectors =bio_sectors (bio); -/* * low level driver can indicate that it wants pages above a * certain limit bounced to low memory (ie for highmem, or even @@ -1145,7 +1143,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) req->biotail->bi_next = bio; req->biotail = bio; - req->nr_sectors = req->hard_nr_sectors += nr_sectors; + req->data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;@@ -1171,10 +1169,8 @@ static int __make_request(struct request_queue *q, struct bio *bio)* not touch req->buffer either... */ req->buffer =bio_data (bio); - req->current_nr_sectors =bio_cur_sectors (bio); - req->hard_cur_sectors = req->current_nr_sectors; - req->sector = req->hard_sector = bio->bi_sector; - req->nr_sectors = req->hard_nr_sectors += nr_sectors; + req->sector = bio->bi_sector; + req->data_len += bytes; req->ioprio =ioprio_best (req->ioprio, prio);if (!blk_rq_cpu_valid (req)) req->cpu = bio->bi_comp_cpu;@@ -1557,7 +1553,7 @@ EXPORT_SYMBOL(submit_bio);int blk_rq_check_limits (struct request_queue *q,struct request *rq) {if (blk_rq_sectors (rq) > q->max_sectors || - rq->data_len > q->max_hw_sectors <<9 ) { +blk_rq_bytes (rq) > q->max_hw_sectors <<9 ) {printk (KERN_ERR "%s: over max size limit.\n" , __func__);return -EIO ; }@@ -1675,35 +1671,6 @@ static void blk_account_io_done(struct request *req) } } -/** -* blk_rq_bytes - Returns bytes left to complete in the entire request -* @rq: the request being processed -**/ -unsigned int blk_rq_bytes (struct request *rq) -{ -if (blk_fs_request (rq)) -return blk_rq_sectors (rq) <<9 ; - -return rq->data_len; -} -EXPORT_SYMBOL_GPL (blk_rq_bytes); - -/** -* blk_rq_cur_bytes - Returns bytes left to complete in the current segment -* @rq: the request being processed -**/ -unsigned int blk_rq_cur_bytes (struct request *rq) -{ -if (blk_fs_request (rq)) -return rq->current_nr_sectors <<9 ; - -if (rq->bio) -return rq->bio->bi_size; - -return rq->data_len; -} -EXPORT_SYMBOL_GPL (blk_rq_cur_bytes); -struct request *elv_next_request (struct request_queue *q) {struct request *rq;@@ -1736,7 +1703,7 @@ struct request *elv_next_request(struct request_queue *q)if (rq->cmd_flags &REQ_DONTPREP )break ; -if (q->dma_drain_size && rq->data_len) { +if (q->dma_drain_size &&blk_rq_bytes (rq)) {/* * make sure space for the drain appears we * know we can do this because max_hw_segments @@ -1759,7 +1726,7 @@ struct request *elv_next_request(struct request_queue *q)* avoid resource deadlock. REQ_STARTED will * prevent other fs requests from passing this one. */ -if (q->dma_drain_size && rq->data_len && +if (q->dma_drain_size &&blk_rq_bytes (rq) && !(rq->cmd_flags &REQ_DONTPREP )) {/* * remove the space for the drain we added @@ -1911,8 +1878,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)* can find how many bytes remain in the request * later. */ - req->nr_sectors = req->hard_nr_sectors =0 ; - req->current_nr_sectors = req->hard_cur_sectors =0 ; + req->data_len =0 ;return false; }@@ -1926,8 +1892,25 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)bio_iovec (bio)->bv_len -= nr_bytes; } -blk_recalc_rq_sectors (req, total_bytes >>9 ); + req->data_len -= total_bytes; + req->buffer =bio_data (req->bio); + +/* update sector only for requests with clear definition of sector */ +if (blk_fs_request (req) ||blk_discard_rq (req))
block/blk-core.c bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) · line 1909
Quoted 10 lines
block/blk-core.c +10
-0+ req->sector += total_bytes >>9 ; + +/* +* If total number of sectors is less than the first segment +* size, something has gone terribly wrong. +*/ +if (blk_rq_bytes (req) <blk_rq_cur_bytes (req)) { +printk (KERN_ERR "blk: request botched\n" ); + req->data_len =blk_rq_cur_bytes (req); + }
What happens in the last bio/segment? Is it not allowed with block_pc commands that blk_rq_bytes(req) (was data_len) be smaller then sum_bytes(bio-chain)? Also I never understood the drain is it not appended to the last bio? I thought it is costumery in the Kernel to allow mapping longer then actual length?
Maybe you would want blk_rq_cur_bytes(req) to return the minimum of the two, and let bio's be longer then bytes requested. (ie. reverse above logic)
Quoted 273 lines
block/blk-core.c +3
-4+ +/* recalculate the number of segments */ blk_recalc_rq_segments (req); +return true; }EXPORT_SYMBOL_GPL (blk_update_request);@@ -2049,11 +2032,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, rq->nr_phys_segments =bio_phys_segments (q, bio); rq->buffer =bio_data (bio); } - rq->current_nr_sectors =bio_cur_sectors (bio); - rq->hard_cur_sectors = rq->current_nr_sectors; - rq->hard_nr_sectors = rq->nr_sectors =bio_sectors (bio); rq->data_len = bio->bi_size; - rq->bio = rq->biotail = bio;if (bio->bi_bdev)block/blk-merge.c +4
-32@@ -9,35 +9,6 @@#include "blk.h" -void blk_recalc_rq_sectors (struct request *rq,int nsect) -{ -if (blk_fs_request (rq) ||blk_discard_rq (rq)) { - rq->hard_sector += nsect; - rq->hard_nr_sectors -= nsect; - -/* -* Move the I/O submission pointers ahead if required. -*/ -if ((rq->nr_sectors >= rq->hard_nr_sectors) && - (rq->sector <= rq->hard_sector)) { - rq->sector = rq->hard_sector; - rq->nr_sectors = rq->hard_nr_sectors; - rq->hard_cur_sectors =bio_cur_sectors (rq->bio); - rq->current_nr_sectors = rq->hard_cur_sectors; - rq->buffer =bio_data (rq->bio); - } - -/* -* if total number of sectors is less than the first segment -* size, something has gone terribly wrong -*/ -if (rq->nr_sectors < rq->current_nr_sectors) { -printk (KERN_ERR "blk: request botched\n" ); - rq->nr_sectors = rq->current_nr_sectors; - } - } -} -static unsigned int __blk_recalc_rq_segments (struct request_queue *q,struct bio *bio) {@@ -199,8 +170,9 @@ new_segment:if (unlikely (rq->cmd_flags &REQ_COPY_USER ) && - (rq->data_len & q->dma_pad_mask)) { -unsigned int pad_len = (q->dma_pad_mask & ~rq->data_len) +1 ; + (blk_rq_bytes (rq) & q->dma_pad_mask)) { +unsigned int pad_len = + (q->dma_pad_mask & ~blk_rq_bytes (rq)) +1 ; sg->length += pad_len; rq->extra_len += pad_len;@@ -398,7 +370,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, req->biotail->bi_next = next->bio; req->biotail = next->biotail; - req->nr_sectors = req->hard_nr_sectors += next->hard_nr_sectors; + req->data_len +=blk_rq_bytes (next);elv_merge_requests (q, req, next);block/blk.h +0
-1@@ -101,7 +101,6 @@ int ll_front_merge_fn(struct request_queue *q, struct request *req,int attempt_back_merge (struct request_queue *q,struct request *rq);int attempt_front_merge (struct request_queue *q,struct request *rq);void blk_recalc_rq_segments (struct request *rq); -void blk_recalc_rq_sectors (struct request *rq,int nsect);void blk_queue_congestion_threshold (struct request_queue *q);block/cfq-iosched.c +5
-5@@ -579,9 +579,9 @@ cfq_prio_tree_lookup(struct cfq_data *cfqd, struct rb_root *root,* Sort strictly based on sector. Smallest to the left, * largest to the right. */ -if (sector > cfqq->next_rq->sector) +if (sector >blk_rq_pos (cfqq->next_rq)) n = &(*p)->rb_right; -else if (sector < cfqq->next_rq->sector) +else if (sector <blk_rq_pos (cfqq->next_rq)) n = &(*p)->rb_left;else break ;@@ -611,8 +611,8 @@ static void cfq_prio_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq)return ; cfqq->p_root = &cfqd->prio_trees[cfqq->org_ioprio]; - __cfqq =cfq_prio_tree_lookup (cfqd, cfqq->p_root, cfqq->next_rq->sector, - &parent, &p); + __cfqq =cfq_prio_tree_lookup (cfqd, cfqq->p_root, +blk_rq_pos (cfqq->next_rq), &parent, &p);if (!__cfqq) {rb_link_node (&cfqq->p_node, parent, p);rb_insert_color (&cfqq->p_node, cfqq->p_root);@@ -996,7 +996,7 @@ static struct cfq_queue *cfqq_close(struct cfq_data *cfqd,if (cfq_rq_close (cfqd, __cfqq->next_rq))return __cfqq; -if (__cfqq->next_rq->sector < sector) +if (blk_rq_pos (__cfqq->next_rq) < sector) node =rb_next (&__cfqq->p_node);else node =rb_prev (&__cfqq->p_node);include/linux/bio.h +3
-3@@ -218,12 +218,12 @@ struct bio {#define bio_sectors (bio) ((bio)->bi_size >> 9)#define bio_empty_barrier (bio) (bio_barrier(bio) && !bio_has_data(bio) && !bio_discard(bio)) -static inline unsigned int bio_cur_sectors (struct bio *bio) +static inline unsigned int bio_cur_bytes (struct bio *bio) {if (bio->bi_vcnt) -return bio_iovec (bio)->bv_len >>9 ; +return bio_iovec (bio)->bv_len;else /* dataless requests such as discard */ -return bio->bi_size >>9 ; +return bio->bi_size; }static inline void *bio_data (struct bio *bio)include/linux/blkdev.h +16
-21@@ -166,19 +166,8 @@ struct request {enum rq_cmd_type_bits cmd_type;unsigned long atomic_flags; -/* Maintain bio traversal state for part by part I/O submission. -* hard_* are block layer internals, no driver should touch them! -*/ - -sector_t sector;/* next sector to submit */ -sector_t hard_sector;/* next sector to complete */ -unsigned long nr_sectors;/* no. of sectors left to submit */ -unsigned long hard_nr_sectors;/* no. of sectors left to complete */ -/* no. of sectors left to submit in the current segment */ -unsigned int current_nr_sectors; - -/* no. of sectors left to complete in the current segment */ -unsigned int hard_cur_sectors; +sector_t sector;/* sector cursor */ +unsigned int data_len;/* total data len, don't access directly */ struct bio *bio;struct bio *biotail;@@ -226,7 +215,6 @@ struct request {unsigned char __cmd[BLK_MAX_CDB ];unsigned char *cmd; -unsigned int data_len;unsigned int extra_len;/* length of alignment and padding */ unsigned int sense_len;unsigned int resid_len;/* residual count */ @@ -840,20 +828,27 @@ extern void blkdev_dequeue_request(struct request *req);*/ static inline sector_t blk_rq_pos (struct request *rq) { -return rq->hard_sector; +return rq->sector; +} + +static inline unsigned int blk_rq_bytes (struct request *rq) +{ +return rq->data_len; } -extern unsigned int blk_rq_bytes (struct request *rq); -extern unsigned int blk_rq_cur_bytes (struct request *rq); +static inline int blk_rq_cur_bytes (struct request *rq) +{ +return rq->bio ?bio_cur_bytes (rq->bio) :0 ; +}static inline unsigned int blk_rq_sectors (struct request *rq) { -return rq->hard_nr_sectors; +return blk_rq_bytes (rq) >>9 ; }static inline unsigned int blk_rq_cur_sectors (struct request *rq) { -return rq->hard_cur_sectors; +return blk_rq_cur_bytes (rq) >>9 ; }/* @@ -928,7 +923,7 @@ static inline void blk_end_request_all(struct request *rq, int error)*/ static inline bool blk_end_request_cur (struct request *rq,int error) { -return blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return blk_end_request (rq, error,blk_rq_cur_bytes (rq)); }/** @@ -981,7 +976,7 @@ static inline void __blk_end_request_all(struct request *rq, int error)*/ static inline bool __blk_end_request_cur (struct request *rq,int error) { -return __blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return __blk_end_request (rq, error,blk_rq_cur_bytes (rq)); }extern void blk_complete_request (struct request *);include/linux/elevator.h +1
-1@@ -171,7 +171,7 @@ enum { ELV_MQUEUE_MUST, }; -#define rq_end_sector (rq) ((rq)->sector + (rq)->nr_sectors) +#define rq_end_sector (rq) (blk_rq_pos(rq) + blk_rq_sectors(rq))#define rb_entry_rq (node) rb_entry((node), struct request, rb_node)/* kernel/trace/blktrace.c +4
-6@@ -642,12 +642,12 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq,if (blk_pc_request (rq)) { what |=BLK_TC_ACT (BLK_TC_PC ); -__blk_add_trace (bt,0 , rq->data_len, rw, what, rq->errors, - rq->cmd_len, rq->cmd); +__blk_add_trace (bt,0 ,blk_rq_bytes (rq), rw, + what, rq->errors, rq->cmd_len, rq->cmd); }else { what |=BLK_TC_ACT (BLK_TC_FS ); -__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_sectors (rq) <<9 , - rw, what, rq->errors,0 ,NULL ); +__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_bytes (rq), rw, + what, rq->errors,0 ,NULL ); } }@@ -854,11 +854,11 @@ void blk_add_driver_data(struct request_queue *q,return ;if (blk_pc_request (rq)) -__blk_add_trace (bt,0 , rq->data_len,0 ,BLK_TA_DRV_DATA , - rq->errors, len, data);
kernel/trace/blktrace.c void blk_add_driver_data(struct request_queue *q, · line 864
Quoted 10 lines
kernel/trace/blktrace.c +4
-2+__blk_add_trace (bt,0 ,blk_rq_bytes (rq),0 , +BLK_TA_DRV_DATA , rq->errors, len, data); else -__blk_add_trace (bt,blk_rq_pos (rq),blk_rq_sectors (rq) <<9 , -0 ,BLK_TA_DRV_DATA , rq->errors, len, data); + __blk_add_trace(bt, blk_rq_pos(rq), blk_rq_bytes(rq), 0, + BLK_TA_DRV_DATA, rq->errors, len, data); }EXPORT_SYMBOL_GPL (blk_add_driver_data);
Thanks, very^3 nice stuff
Boaz
Re: [PATCH 08/10] block: cleanup rq->data_len usages
In reply to Tejun HeoQuoted 16 lines · Tejun Heo
With recent unification of fields, it's now guaranteed that
rq->data_lenalways equalsblk_rq_bytes(). Convert all non-IDE direct users to accessors. IDE will be converted in a separate patch.[ Impact: convert direct
rq->data_lenusages toblk_rq_bytes()]Signed-off-by Tejun Heo <[email protected]>Cc Pete Zaitcev <[email protected]>Cc Eric Moore <[email protected]>Cc Markus Lidel <[email protected]>Cc Darrick J. Wong <[email protected]>Cc James Bottomley <[email protected]>Cc Eric Moore <[email protected]>Cc Boaz Harrosh <[email protected]>Cc FUJITA Tomonori <[email protected]>---
<snip>
Quoted 2 lines
drivers/scsi/osd/osd_initiator.c | 4 ++-- fs/exofs/osd.c | 4 ++--
<snip>
Quoted 14 lines
drivers/scsi/osd/osd_initiator.c +1
-1@@ -1299,7 +1299,7 @@ int osd_finalize_request(struct osd_request *or,return ret; }OSD_DEBUG ("out bytes=%llu (bytes_req=%u)\n" , -_LLU (or->out.total_bytes), or->out.req->data_len); +_LLU (or->out.total_bytes),blk_rq_bytes (or->out.req)); }if (or->in.bio) { ret =blk_rq_append_bio (or->request->q, or->in.req, or->in.bio);
drivers/scsi/osd/osd_initiator.c int osd_finalize_request(struct osd_request *or, · line 1314
Quoted 8 lines
drivers/scsi/osd/osd_initiator.c +1
-1@@ -1308,7 +1308,7 @@ int osd_finalize_request(struct osd_request *or,return ret; }OSD_DEBUG ("in bytes=%llu (bytes_req=%u)\n" , -_LLU (or->in.total_bytes), or->in.req->data_len); +_LLU (or->in.total_bytes),blk_rq_bytes (or->in.req)); } or->out.pad_buff = sg_out_pad_buffer;
Sorry about this stupid debug-print. Leftover from the learning days Ack for this bit.
Quoted 9 lines
drivers/scsi/scsi_lib.c +0
-1@@ -682,14 +682,13 @@ EXPORT_SYMBOL(scsi_release_buffers);static void scsi_end_bidi_request (struct scsi_cmnd *cmd) {struct request *req = cmd->request; -unsigned int dlen = req->data_len;
drivers/scsi/scsi_lib.c EXPORT_SYMBOL(scsi_release_buffers); · line 692
Quoted 10 lines
drivers/scsi/scsi_lib.c +2
-2-unsigned int next_dlen = req->next_rq->data_len; req->resid_len =scsi_out (cmd)->resid; req->next_rq->resid_len =scsi_in (cmd)->resid;/* The req and req->next_rq have not been completed */ -BUG_ON (blk_end_bidi_request (req,0 , dlen, next_dlen)); +BUG_ON (blk_end_bidi_request (req,0 ,blk_rq_bytes (req), +blk_rq_bytes (req->next_rq)));
Just blk_end_request_all() actually. If you let blk_end_request_all also do bidi
drivers/scsi/scsi_lib.c EXPORT_SYMBOL(scsi_release_buffers); · line 694
Quoted 2 lines
drivers/scsi/scsi_lib.c +0
-0scsi_release_buffers (cmd);
and then it can be in-lined into caller, where blk_pc_request(req) just do blk_end_request_all regardless (and only the residual setting is conditional)
I'll send a patch to scsi_lib later once this settles a bit.
drivers/scsi/scsi_lib.c static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb, · line 970
Quoted 8 lines
drivers/scsi/scsi_lib.c +1
-1@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;
Is this true. I thought they must be the same now. I was actually anticipating this if() removed.
Quoted 44 lines
drivers/scsi/scsi_lib.c +3
-3return BLKPREP_OK ;@@ -1087,21 +1086,21 @@ int scsi_setup_blk_pc_cmnd(struct scsi_device *sdev, struct request *req)if (unlikely (ret))return ret; }else { -BUG_ON (req->data_len); +BUG_ON (blk_rq_bytes (req));memset (&cmd->sdb,0 ,sizeof (cmd->sdb)); req->buffer =NULL ; } cmd->cmd_len = req->cmd_len; -if (!req->data_len) +if (!blk_rq_bytes (req)) cmd->sc_data_direction =DMA_NONE ;else if (rq_data_dir (req) ==WRITE ) cmd->sc_data_direction =DMA_TO_DEVICE ;else cmd->sc_data_direction =DMA_FROM_DEVICE ; - cmd->transfersize = req->data_len; + cmd->transfersize =blk_rq_bytes (req); cmd->allowed = req->retries;return BLKPREP_OK ; }drivers/scsi/scsi_tgt_lib.c +1
-1@@ -387,7 +387,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,* we use REQ_TYPE_BLOCK_PC so scsi_init_io doesn't set the * length for us. */ - cmd->sdb.length = rq->data_len; + cmd->sdb.length =blk_rq_bytes (rq);return 0 ;fs/exofs/osd.c +0
-0
fs/exofs/osd.c int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid) · line 53
Quoted 5 lines
fs/exofs/osd.c +1
-1@@ -50,10 +50,10 @@ int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid)/* FIXME: should be include in osd_sense_info */ if (in_resid) - *in_resid = or->in.req ? or->in.req->data_len :0 ; + *in_resid = or->in.req ?blk_rq_bytes (or->in.req) :0 ;
+ *in_resid = or->in.req ? or->in.req->resid_len : 0;
fs/exofs/osd.c int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid) · line 56
Quoted 4 lines
fs/exofs/osd.c +1
-1if (out_resid) - *out_resid = or->out.req ? or->out.req->data_len :0 ; + *out_resid = or->out.req ?blk_rq_bytes (or->out.req) :0 ;
+ *out_resid = or->out.req ? or->out.req->resid_len : 0;
fs/exofs/osd.c int exofs_check_ok_resid(struct osd_request *or, u64 *in_resid, u64 *out_resid) · line 57
Quoted 3 lines
fs/exofs/osd.c +0
-0return ret; }
OK This segment is wrong. It should be moved to the residual count patch (PATCH 3/10) the assignment into *in_resid/*out_resid should shourly triggered a warning ;-)
Thanks
Boaz
James Bottomley
maintainerRe: [PATCH 08/10] block: cleanup rq->data_len usages
Quoted 10 lines · Boaz Harrosh
Review static int scsi_init_sgtable(struct request
Quoted 1 line
(quoted diff) +0
-0@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request*req, struct
scsi_data_buffer*sdb,drivers/scsi/scsi_lib.c static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb, · line 970
Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-1BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;
Quoted 2 lines
Is this true. I thought they must be the same now. I was actually anticipating this
if()removed.
Me too ... there's one of these in scsi_lib.c as well.
The difference comes because filesystem requests are always in sectors, but BLOCK_PC requests are always in bytes .... we should be able to wrap the accessors so they do the correct conversions.
James
On Wednesday 29 April 2009 11:13:38 Tejun Heo wrote:
[...]
Quoted 9 lines
As the patchset contains several block-ide sync points, I think it's best to apply this series in unified series. SCSI also received good amount of changes. If there's a tree I can pull from which won't be rebased, please let me know. If SCSI tree is gonna pull block tree after merge, that will be fine too.
All changed llds have been compile tested, mid-high layer
resid_lenhandling has been verified and nothing broke during my test runs with ide and libata.
on drivers/ide parts and block ones (FWIW)
Re: [PATCH 05/10] block: convert to pos and nr_sectors accessors
In reply to a message not in the archiveQuoted 10 lines · Adrian McMenamin
Quoted 6 lines · Tejun Heo
With recent cleanups, there is no place where low level driver directly manipulates request fields. This means that the 'hard' request fields always equal the !hard fields. Convert all
rq->sectors,nr_sectorsandcurrent_nr_sectorsreferences to accessors.Tested-by Adrian McMenamin <[email protected]>Acked-by Adrian McMenamin <[email protected]>
Apologies, my sendmail was setup badly after a recent mail server crash so this bounced alot. Hopefully it will reach everybody this time.
Re: [PATCH 08/10] block: cleanup rq->data_len usages
In reply to James BottomleyQuoted 11 lines · James Bottomley
Quoted 10 lines · Boaz Harrosh
Review static int scsi_init_sgtable(struct request
Quoted 1 line
(quoted diff) +0
-0@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request*req, struct
scsi_data_buffer*sdb,Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-1BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;
Quoted 8 lines
Quoted 2 lines
Is this true. I thought they must be the same now. I was actually anticipating this
if()removed.Me too ... there's one of these in
scsi_lib.cas well.The difference comes because filesystem requests are always in sectors, but
BLOCK_PCrequests are always in bytes .... we should be able to wrap the accessors so they do the correct conversions.
blk_rq_bytes() already takes care of this, it can be used on any type request. So just kill the if/else.
Signature · 1 line
Jens Axboe
Quoted 5 lines · Tejun Heo
Hello,
Upon ack, please pull from the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gitblock-unify-sector-and-data_len
Looks sane. When you have collected acks and made suggested changes, please repost it and I'll integrate it.
Note that I wont be very responsive the next week or so, taking care of a new aspiring kernel hacker.
Signature · 1 line
Jens Axboe
Re: [PATCH 08/10] block: cleanup rq->data_len usages
In reply to James BottomleyQuoted 10 lines · James Bottomley
Quoted 9 lines · Boaz Harrosh
Review static int scsi_init_sgtable(struct request
Quoted 1 line
(quoted diff) +0
-0@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request*req, struct
scsi_data_buffer*sdb,Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-1BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;
Quoted 4 lines
Quoted 2 lines
Is this true. I thought they must be the same now. I was actually anticipating this
if()removed.Me too ... there's one of these in
scsi_lib.cas well.
Not until the next patch. It's probably safe for scsi to make the switch here but I wanted to do the transition in two logical steps -
1. make all users use accessors in the defined manner without affecting anything else 2. knowing #1 is true for all low level drivers, unify implementation inside block layer. I had a following patch which tried to do sweep conversion of all llds (which is guaranteed to be safe after #2 has happened) but it looked like more trouble than worth and seems like best left to each subsystem, so please go ahead and clean up subsystems on top of this patchset. :-)
Quoted 3 lines
The difference comes because filesystem requests are always in sectors, but
BLOCK_PCrequests are always in bytes .... we should be able to wrap the accessors so they do the correct conversions.
After this series is applied, blk_rq_bytes() >> 9 == blk_rq_sectors() is guaranteed (note that blk_rq_sectors() << 9 might not equal blk_rq_bytes() if the data transfer length isn't multiple of 512), so the above if can be removed. I just didn't want to make the conversion (probably safe for scsi) before the actual unification.
Thanks.
Signature · 1 line
tejun
Re: [PATCH 08/10] block: cleanup rq->data_len usages
In reply to Boaz HarroshHello, Boaz.
Quoted 8 lines · Boaz Harrosh
drivers/scsi/scsi_lib.c EXPORT_SYMBOL(scsi_release_buffers); · line 691
Quoted 5 lines
drivers/scsi/scsi_lib.c +2
-1/* The req and req->next_rq have not been completed */ -BUG_ON (blk_end_bidi_request (req,0 , dlen, next_dlen)); +BUG_ON (blk_end_bidi_request (req,0 ,blk_rq_bytes (req), +blk_rq_bytes (req->next_rq)));Just
blk_end_request_all()actually. If you letblk_end_request_allalso do bidi
I wrote in the other reply but I don't want to make any other change than converting direct accesses to accessors in this patch, so that we can _know_ this patch is safe. Patches in this series are already all over the place. But, yeah, cleaning this up would be great. Care to send a patch?
Quoted 8 lines
Quoted 2 lines
scsi_release_buffers(cmd);and then it can be in-lined into caller, where
blk_pc_request(req)just doblk_end_request_allregardless (and only the residual setting is conditional)I'll send a patch to
scsi_liblater once this settles a bit.
Ah.. cool. :-)
Quoted 11 lines
drivers/scsi/scsi_lib.c static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb, · line 970
Quoted 8 lines
drivers/scsi/scsi_lib.c +1
-1@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb,BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;Is this true. I thought they must be the same now. I was actually anticipating this
if()removed.
Replied in the other reply.
Quoted 15 lines
Quoted 4 lines
fs/exofs/osd.c +0
-0/* FIXME: should be include in osd_sense_info */ fs/exofs/osd.c +1
-1if (in_resid) - *in_resid = or->in.req ? or->in.req->data_len :0 ; + *in_resid = or->in.req ?blk_rq_bytes (or->in.req) :0 ;(quoted diff) +1
-0+ *in_resid = or->in.req ? or->in.req->resid_len : 0;Quoted 5 lines
fs/exofs/osd.c +1
-1if (out_resid) - *out_resid = or->out.req ? or->out.req->data_len :0 ; + *out_resid = or->out.req ?blk_rq_bytes (or->out.req) :0 ;(quoted diff) +1
-0+ *out_resid = or->out.req ? or->out.req->resid_len : 0;Quoted 2 lines
Quoted 6 lines
Quoted 2 lines
return ret;
}OK This segment is wrong. It should be moved to the residual count patch (PATCH 3/10) the assignment into *in_resid/*out_resid should shourly triggered a warning ;-)
Ah... thanks a lot for spotting it. Will fix.
Thanks.
Signature · 1 line
tejun
Hello,
Quoted 9 lines · Jens Axboe
Quoted 5 lines · Tejun Heo
Hello,
Upon ack, please pull from the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gitblock-unify-sector-and-data_lenLooks sane. When you have collected acks and made suggested changes, please repost it and I'll integrate it.
Will do.
Quoted 2 lines
Note that I wont be very responsive the next week or so, taking care of a new aspiring kernel hacker.
Alright. I'm not getting a lot of work done past few days either cuz I purchased fallout3 and still have a serious score to settle with the old man.
Thanks and have fun with the newbie. :-)
Signature · 1 line
tejun
Re: [PATCH 08/10] block: cleanup rq->data_len usages
In reply to Tejun HeoQuoted 29 lines · Tejun Heo
Quoted 10 lines · James Bottomley
Quoted 9 lines · Boaz Harrosh
Review static int scsi_init_sgtable(struct request
Quoted 1 line
(quoted diff) +0
-0@@ -966,7 +965,7 @@ static int scsi_init_sgtable(struct request*req, struct
scsi_data_buffer*sdb,Quoted 7 lines
drivers/scsi/scsi_lib.c +1
-1BUG_ON (count > sdb->table.nents); sdb->table.nents = count;if (blk_pc_request (req)) - sdb->length = req->data_len; + sdb->length =blk_rq_bytes (req);else sdb->length =blk_rq_sectors (req) <<9 ;Quoted 3 lines
Quoted 2 lines
Is this true. I thought they must be the same now. I was actually anticipating this
if()removed.Me too ... there's one of these in
scsi_lib.cas well.Not until the next patch. It's probably safe for scsi to make the switch here but I wanted to do the transition in two logical steps -
1. make all users use accessors in the defined manner without affecting anything else 2. knowing #1 is true for all low level drivers, unify implementation inside block layer. I had a following patch which tried to do sweep conversion of all llds (which is guaranteed to be safe after #2 has happened) but it looked like more trouble than worth and seems like best left to each subsystem, so please go ahead and clean up subsystems on top of this patchset. :-)Quoted 3 lines
The difference comes because filesystem requests are always in sectors, but
BLOCK_PCrequests are always in bytes .... we should be able to wrap the accessors so they do the correct conversions.
Quoted 8 lines
After this series is applied,
blk_rq_bytes()>> 9 ==blk_rq_sectors()is guaranteed (note thatblk_rq_sectors()<< 9 might not equalblk_rq_bytes()if the data transfer length isn't multiple of 512), so the above if can be removed. I just didn't want to make the conversion (probably safe for scsi) before the actual unification.Thanks.
OK, NP. But in this case please note on the side all the places you think might be suspect for blk_rq_bytes()/blk_rq_sectors() cosolidation and post the list. Because it is now that you are going over the code and it is now that you touch exactly all these places.
You could even put a "TODO:" comments on all these places in this patch. So to draw later patches that audit and remove the TODO:.
(Or in trivial places like above that are safe even before these patches, just
convert them silently, in the sense of least traffic)
But sure I will see what I can help and send patches for. Tell me when you think this is stable enough for me to add patches on top of.
Thanks
Boaz
Re: [PATCH 08/10] block: cleanup rq->data_len usages
Hello,
Quoted 7 lines · Boaz Harrosh
OK, NP. But in this case please note on the side all the places you think might be suspect for blk_rq_bytes()/blk_rq_sectors() cosolidation and post the list. Because it is now that you are going over the code and it is now that you touch exactly all these places.
You could even put a "TODO:" comments on all these places in this patch. So to draw later patches that audit and remove the TODO:.
Heh... okay. I'll add a patch for the sweep conversion.
Quoted 2 lines
(Or in trivial places like above that are safe even before these patches, just convert them silently, in the sense of least traffic)
I really don't want to do that. Things which might look trivial often break things and this part of API has been quite fragile, so I'd rather put those changes after the actual unification for, if nothing else, documentation.
Quoted 3 lines
But sure I will see what I can help and send patches for. Tell me when you think this is stable enough for me to add patches on top of.
Yeap, I just finished saving the wasteland, so the refreshed patchset will be posted later today. :-)
Thanks.
Signature · 1 line
tejun
Re: [PATCH 07/10] block: drop request->hard_* and *nr_sectors
In reply to Boaz HarroshHello, Boaz.
Quoted 14 lines · Boaz Harrosh
Quoted 14 lines
block/blk-core.c +9
-1@@ -1926,8 +1892,25 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)bio_iovec (bio)->bv_len -= nr_bytes; } -blk_recalc_rq_sectors (req, total_bytes >>9 ); + req->data_len -= total_bytes; + req->buffer =bio_data (req->bio); + +/* update sector only for requests with clear definition of sector */ +if (blk_fs_request (req) ||blk_discard_rq (req)) + req->sector += total_bytes >>9 ; + +/* +* If total number of sectors is less than the first segment
Quoted 8 lines
block/blk-core.c bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) · line 1909
Quoted 6 lines
block/blk-core.c +6
-0+* size, something has gone terribly wrong. +*/ +if (blk_rq_bytes (req) <blk_rq_cur_bytes (req)) { +printk (KERN_ERR "blk: request botched\n" ); + req->data_len =blk_rq_cur_bytes (req); + }What happens in the last bio/segment?
Can you please elaborate a bit? Nothing really changes for the last bio/segment.
Quoted 2 lines
Is it not allowed with
block_pccommands thatblk_rq_bytes(req)(wasdata_len) be smaller thensum_bytes(bio-chain)?
Well, before, it wasn't well defined. For PC requests w/o bio, any completion was full completion which isn't exactly data_len being allowed to be shorter than actual data length but more like data_len being completely ignored. If a PC request has bio, the request should be completed with full bio data length. After recent changes, all PC requests use bio and thus should fully complete the PC requests and this patch doesn't change anything about that.
Quoted 3 lines
Also I never understood the drain is it not appended to the last bio? I thought it is costumery in the Kernel to allow mapping longer then actual length?
drain is implemented in slightly hacky way. All that's guaranteed is extra room in the mapped sgl. bio never sees it.
Quoted 3 lines
Maybe you would want
blk_rq_cur_bytes(req)to return the minimum of the two, and let bio's be longer then bytes requested. (ie. reverse above logic)
No, blk_rq_bytes() == sum of bio_rq_cur_bytes() of all bios in the request and must NEVER be shorter than bio_rq_cur_bytes() by definition.
Thanks.
Signature · 1 line
tejun