block bits for 2.6.30-rc3
Subsystems (3)
Hi,
Resending this pull request since I added a few more bits to it today, so that you know what the diffstat is going to look like.
So changes since the pull request yesterday:
- Include the dm timeout fix. Requests that did not get removed from the timeout list by the timeout handler were left on the on-stack list.
- A umem queue locking fix. With the conversion to unlocked queue flag tests, umem was fixed up but queue lock assignment was missing.
- Two CFQ bug fixes for the cooperative task detection. These could cause either an oops in cfq-iosched, or in the rbtree code.
Please pull these fixes from:
git://git.kernel.dk/linux-2.6-block.git for-linus
Alexander Beregalov (1):
pktcdvd.h should include mempool.h
Bartlomiej Zolnierkiewicz (1):
block: enable by default support for large devices and files on 32-bit archs
Hannes Reinecke (1):
block: fix intermittent dm timeout based oops
Jeff Moyer (2):
cfq-iosched: make seek_mean converge more quickly
cfq-iosched: use the default seek distance when there aren't enough seek samples
Jens Axboe (4):
block: make blk_abort_queue() ignore non-request based devices
cfq-iosched: clear ->prio_trees[] on cfqd alloc
cfq-iosched: fix bug with aliased request and cooperation detection
cfq-iosched: cache prio_tree root in cfqq->p_root
Jerome Marchand (1):
block: simplify I/O stat accounting
Sage Weil (1):
umem: fix request_queue lock warning
Tejun Heo (6):
scatterlist: make sure sg_miter_next() doesn't return 0 sized mappings
block: fix SG_IO vector request data length handling
block: fix queue bounce limit setting
bio: fix bio_kmalloc()
bio: use bio_kmalloc() in copy/map functions
block: include empty disks in /proc/diskstats
block/Kconfig | 11 +++-- block/blk-core.c | 6 ++- block/blk-merge.c | 5 ++- block/blk-settings.c | 20 ++++--- block/blk-sysfs.c | 4 -- block/blk-timeout.c | 13 +++++ block/blk.h | 7 +-- block/cfq-iosched.c | 66 ++++++++++++++++--------- block/genhd.c | 12 +++-- block/scsi_ioctl.c | 13 +++++- drivers/block/umem.c | 1 + fs/bio.c | 124 +++++++++++++++++++++------------------------- include/linux/bio.h | 1 + include/linux/blkdev.h | 3 + include/linux/genhd.h | 1 + include/linux/pktcdvd.h | 1 + lib/scatterlist.c | 9 ++- 17 files changed, 173 insertions(+), 124 deletions(-)
block/Kconfig +7 -4
@@ -26,6 +26,7 @@ if BLOCK config LBD bool "Support for large block devices and files" depends on !64BIT + default y help Enable block devices or files of size 2TB and larger.
@@ -38,11 +39,13 @@ config LBD The ext4 filesystem requires that this feature be enabled in order to support filesystems that have the huge_file feature - enabled. Otherwise, it will refuse to mount any filesystems - that use the huge_file feature, which is enabled by default - by mke2fs.ext4. The GFS2 filesystem also requires this feature. + enabled. Otherwise, it will refuse to mount in the read-write + mode any filesystems that use the huge_file feature, which is + enabled by default by mke2fs.ext4. - If unsure, say N. + The GFS2 filesystem also requires this feature. + + If unsure, say Y. config BLK_DEV_BSG bool "Block layer SG support v4 (EXPERIMENTAL)"
block/blk-core.c +4 -2
@@ -643,7 +643,7 @@ static inline void blk_free_request(struct request_queue *q, struct request *rq) }static struct request * -blk_alloc_request (struct request_queue *q,int rw,int priv,gfp_t gfp_mask) +blk_alloc_request (struct request_queue *q,int flags,int priv,gfp_t gfp_mask) {struct request *rq =mempool_alloc (q->rq.rq_pool, gfp_mask);
@@ -652,7 +652,7 @@ blk_alloc_request(struct request_queue *q, int rw, int priv, gfp_t gfp_mask)blk_rq_init (q, rq); - rq->cmd_flags = rw |REQ_ALLOCED ; + rq->cmd_flags = flags |REQ_ALLOCED ;if (priv) {if (unlikely (elv_set_request (q, rq, gfp_mask))) {
@@ -792,6 +792,8 @@ static struct request *get_request(struct request_queue *q, int rw_flags,if (priv) rl->elvpriv++; +if (blk_queue_io_stat (q)) + rw_flags |=REQ_IO_STAT ;spin_unlock_irq (q->queue_lock); rq =blk_alloc_request (q, rw_flags, priv, gfp_mask);
block/blk-merge.c +4 -1
@@ -402,7 +402,10 @@ static int attempt_merge(struct request_queue *q, struct request *req,elv_merge_requests (q, req, next); -blk_account_io_merge (req); +/* +* 'next' is going away, so update stats accordingly +*/ +blk_account_io_merge (next); req->ioprio =ioprio_best (req->ioprio, next->ioprio);if (blk_rq_cpu_valid (next))
block/blk-settings.c +11 -9
@@ -156,26 +156,28 @@ EXPORT_SYMBOL(blk_queue_make_request);/** * blk_queue_bounce_limit - set bounce buffer limit for queue -* @q: the request queue for the device -* @dma_addr: bus address limit +* @q: the request queue for the device +* @dma_mask: the maximum address the device can handle * * Description: * Different hardware can have different requirements as to what pages * it can do I/O directly to. A low level driver can call * blk_queue_bounce_limit to have lower memory pages allocated as bounce -* buffers for doing I/O to pages residing above @dma_addr. +* buffers for doing I/O to pages residing above @dma_mask. **/ -void blk_queue_bounce_limit (struct request_queue *q,u64 dma_addr) +void blk_queue_bounce_limit (struct request_queue *q,u64 dma_mask) { -unsigned long b_pfn = dma_addr >>PAGE_SHIFT ; +unsigned long b_pfn = dma_mask >>PAGE_SHIFT ;int dma =0 ; q->bounce_gfp =GFP_NOIO ;#if BITS_PER_LONG ==64 -/* Assume anything <= 4GB can be handled by IOMMU. -Actually some IOMMUs can handle everything, but I don't -know of a way to test this here. */ -if (b_pfn < (min_t (u64,0x100000000UL ,BLK_BOUNCE_HIGH ) >>PAGE_SHIFT )) +/* +* Assume anything <= 4GB can be handled by IOMMU. Actually +* some IOMMUs can handle everything, but I don't know of a +* way to test this here. +*/ +if (b_pfn < (min_t (u64,0xffffffffUL ,BLK_BOUNCE_HIGH ) >>PAGE_SHIFT )) dma =1 ; q->bounce_pfn = max_low_pfn;#else
block/blk-sysfs.c +0 -4
@@ -209,14 +209,10 @@ static ssize_t queue_iostats_store(struct request_queue *q, const char *page,ssize_t ret =queue_var_store (&stats, page, count);spin_lock_irq (q->queue_lock); -elv_quiesce_start (q); -if (stats)queue_flag_set (QUEUE_FLAG_IO_STAT , q);else queue_flag_clear (QUEUE_FLAG_IO_STAT , q); - -elv_quiesce_end (q);spin_unlock_irq (q->queue_lock);return ret;
block/blk-timeout.c +13 -0
@@ -211,6 +211,12 @@ void blk_abort_queue(struct request_queue *q)struct request *rq, *tmp;LIST_HEAD (list); +/* +* Not a request based block device, nothing to abort +*/ +if (!q->request_fn) +return ; +spin_lock_irqsave (q->queue_lock, flags);elv_abort_queue (q);
@@ -224,6 +230,13 @@ void blk_abort_queue(struct request_queue *q)list_for_each_entry_safe (rq, tmp, &list, timeout_list)blk_abort_request (rq); +/* +* Occasionally, blk_abort_request() will return without +* deleting the element from the list. Make sure we add those back +* instead of leaving them on the local stack list. +*/ +list_splice (&list, &q->timeout_list); +spin_unlock_irqrestore (q->queue_lock, flags); }
block/blk.h +1 -6
@@ -114,12 +114,7 @@ static inline int blk_cpu_to_group(int cpu)static inline int blk_do_io_stat (struct request *rq) { -struct gendisk *disk = rq->rq_disk; - -if (!disk || !disk->queue) -return 0 ; - -return blk_queue_io_stat (disk->queue) && (rq->cmd_flags &REQ_ELVPRIV ); +return rq->rq_disk &&blk_rq_io_stat (rq); }#endif
block/cfq-iosched.c +43 -23
157 lines not on this page · raw message
block/genhd.c +8 -4
@@ -98,7 +98,7 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,if (flags &DISK_PITER_REVERSE ) piter->idx = ptbl->len -1 ; -else if (flags &DISK_PITER_INCL_PART0 ) +else if (flags & (DISK_PITER_INCL_PART0 |DISK_PITER_INCL_EMPTY_PART0 )) piter->idx =0 ;else piter->idx =1 ;
@@ -134,7 +134,8 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter)/* determine iteration parameters */ if (piter->flags &DISK_PITER_REVERSE ) { inc =-1 ; -if (piter->flags &DISK_PITER_INCL_PART0 ) +if (piter->flags & (DISK_PITER_INCL_PART0 | +DISK_PITER_INCL_EMPTY_PART0 )) end =-1 ;else end =0 ;
@@ -150,7 +151,10 @@ struct hd_struct *disk_part_iter_next(struct disk_part_iter *piter) part =rcu_dereference (ptbl->part[piter->idx]);if (!part)continue ; -if (!(piter->flags &DISK_PITER_INCL_EMPTY ) && !part->nr_sects) +if (!part->nr_sects && + !(piter->flags &DISK_PITER_INCL_EMPTY ) && + !(piter->flags &DISK_PITER_INCL_EMPTY_PART0 && + piter->idx ==0 ))continue ;get_device (part_to_dev (part));
@@ -1011,7 +1015,7 @@ static int diskstats_show(struct seq_file *seqf, void *v)"\n\n"); */ -disk_part_iter_init (&piter, gp,DISK_PITER_INCL_PART0 ); +disk_part_iter_init (&piter, gp,DISK_PITER_INCL_EMPTY_PART0 );while ((hd =disk_part_iter_next (&piter))) { cpu =part_stat_lock ();part_round_stats (cpu, hd);
block/scsi_ioctl.c +12 -1
@@ -290,6 +290,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,if (hdr->iovec_count) {const int size =sizeof (struct sg_iovec ) * hdr->iovec_count; +size_t iov_data_len;struct sg_iovec *iov; iov =kmalloc (size,GFP_KERNEL );
@@ -304,8 +305,18 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk, goto out; } +/* SG_IO howto says that the shorter of the two wins */ + iov_data_len =iov_length ((struct iovec *)iov, + hdr->iovec_count); +if (hdr->dxfer_len < iov_data_len) { + hdr->iovec_count =iov_shorten ((struct iovec *)iov, + hdr->iovec_count, + hdr->dxfer_len); + iov_data_len = hdr->dxfer_len; + } + ret =blk_rq_map_user_iov (q, rq,NULL , iov, hdr->iovec_count, - hdr->dxfer_len,GFP_KERNEL ); + iov_data_len,GFP_KERNEL );kfree (iov); }else if (hdr->dxfer_len) ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len,
drivers/block/umem.c +1 -0
@@ -906,6 +906,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev, goto failed_alloc;blk_queue_make_request (card->queue, mm_make_request); + card->queue->queue_lock = &card->lock; card->queue->queuedata = card; card->queue->unplug_fn = mm_unplug_device;
fs/bio.c +57 -67
185 lines not on this page · raw message
include/linux/bio.h +1 -0
@@ -132,6 +132,7 @@ struct bio {* top 4 bits of bio flags indicate the pool this bio came from */ #define BIO_POOL_BITS (4) +#define BIO_POOL_NONE ((1UL << BIO_POOL_BITS) - 1)#define BIO_POOL_OFFSET (BITS_PER_LONG - BIO_POOL_BITS)#define BIO_POOL_MASK (1UL << BIO_POOL_OFFSET)#define BIO_POOL_IDX (bio) ((bio)->bi_flags >> BIO_POOL_OFFSET)
include/linux/blkdev.h +3 -0
@@ -118,6 +118,7 @@ enum rq_flag_bits { __REQ_COPY_USER,/* contains copies of user pages */ __REQ_INTEGRITY,/* integrity metadata has been remapped */ __REQ_NOIDLE,/* Don't anticipate more IO after this one */ + __REQ_IO_STAT,/* account I/O stat */ __REQ_NR_BITS, /* stops here */ };
@@ -145,6 +146,7 @@ enum rq_flag_bits {#define REQ_COPY_USER (1 << __REQ_COPY_USER)#define REQ_INTEGRITY (1 << __REQ_INTEGRITY)#define REQ_NOIDLE (1 << __REQ_NOIDLE) +#define REQ_IO_STAT (1 << __REQ_IO_STAT)#define BLK_MAX_CDB 16
@@ -598,6 +600,7 @@ enum { blk_failfast_transport(rq) || \ blk_failfast_driver(rq))#define blk_rq_started (rq) ((rq)->cmd_flags & REQ_STARTED) +#define blk_rq_io_stat (rq) ((rq)->cmd_flags & REQ_IO_STAT)#define blk_account_rq (rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq)))
include/linux/genhd.h +1 -0
@@ -214,6 +214,7 @@ static inline void disk_put_part(struct hd_struct *part)#define DISK_PITER_REVERSE (1 << 0)/* iterate in the reverse direction */ #define DISK_PITER_INCL_EMPTY (1 << 1)/* include 0-sized parts */ #define DISK_PITER_INCL_PART0 (1 << 2)/* include partition 0 */ +#define DISK_PITER_INCL_EMPTY_PART0 (1 << 3)/* include empty partition 0 */ struct disk_part_iter {struct gendisk *disk;
include/linux/pktcdvd.h +1 -0
@@ -113,6 +113,7 @@ struct pkt_ctrl_command {#include <linux/cdrom.h> #include <linux/kobject.h> #include <linux/sysfs.h> +#include <linux/mempool.h> /* default bio write queue congestion marks */ #define PKT_WRITE_CONGESTION_ON 10000
lib/scatterlist.c +6 -3
@@ -347,9 +347,12 @@ bool sg_miter_next(struct sg_mapping_iter *miter)sg_miter_stop (miter);/* get to the next sg if necessary. __offset is adjusted by stop */ -if (miter->__offset == miter->__sg->length && --miter->__nents) { - miter->__sg =sg_next (miter->__sg); - miter->__offset =0 ; +while (miter->__offset == miter->__sg->length) { +if (--miter->__nents) { + miter->__sg =sg_next (miter->__sg); + miter->__offset =0 ; + }else +return false; }/* map the next page */
Signature · 1 line
Jens Axboe
Quoted 2 lines · Jens Axboe
Bartlomiej Zolnierkiewicz (1):
block: enable by default support for large devices and files on 32-bit archs
Although I strongly support this change -- is this really appropriate for -rc3?
I know it's only a one-line Kconfig change, but still... this does not seem to fall into the category of "regression fix."
Jeff
Quoted 9 lines · Jeff Garzik
Quoted 2 lines · Jens Axboe
Bartlomiej Zolnierkiewicz (1):
block: enable by default support for large devices and files on 32-bit archsAlthough I strongly support this change -- is this really appropriate for -rc3?
I know it's only a one-line
Kconfigchange, but still... this does not seem to fall into the category of "regression fix."
It was sitting for about a month before being included, but yes it is probably something that should have gone in before -rc1. I'll defer to Linus, I can easily postpone it to 2.6.31-rc1 it need be.
Signature · 1 line
Jens Axboe