Commit a298fedc authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] md: Use new single page bio splitting for raid0 and linear

Sometimes raid0 and linear are required to take a single page bio that
spans two devices.  We use bio_split to split such a bio into two.

The the same time, bio.h is included by linux/raid/md.h so
we don't included it elsewhere anymore.

We also modify the mergeable_bvec functions to allow a bvec
that doesn't fit if it is the first bvec to be added to
the bio, and be careful never to return a negative length from a
bvec_mergable funciton.
parent 7a3cdc64
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/raid/md.h> #include <linux/raid/md.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/bio.h>
#include <linux/raid/linear.h> #include <linux/raid/linear.h>
#define MAJOR_NR MD_MAJOR #define MAJOR_NR MD_MAJOR
...@@ -67,7 +66,18 @@ static int linear_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio ...@@ -67,7 +66,18 @@ static int linear_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio
dev0 = which_dev(mddev, bio->bi_sector); dev0 = which_dev(mddev, bio->bi_sector);
maxsectors = (dev0->size << 1) - (bio->bi_sector - (dev0->offset<<1)); maxsectors = (dev0->size << 1) - (bio->bi_sector - (dev0->offset<<1));
return (maxsectors - bio_sectors) << 9; if (maxsectors < bio_sectors)
maxsectors = 0;
else
maxsectors -= bio_sectors;
if (maxsectors <= (PAGE_SIZE >> 9 ) && bio_sectors == 0)
return biovec->bv_len;
/* The bytes available at this offset could be really big,
* so we cap at 2^31 to avoid overflow */
if (maxsectors > (1 << (31-9)))
return 1<<31;
return maxsectors << 9;
} }
static int linear_run (mddev_t *mddev) static int linear_run (mddev_t *mddev)
...@@ -209,6 +219,23 @@ static int linear_make_request (request_queue_t *q, struct bio *bio) ...@@ -209,6 +219,23 @@ static int linear_make_request (request_queue_t *q, struct bio *bio)
bio_io_error(bio, bio->bi_size); bio_io_error(bio, bio->bi_size);
return 0; return 0;
} }
if (unlikely(bio->bi_sector + (bio->bi_size >> 9) >
(tmp_dev->offset + tmp_dev->size)<<1)) {
/* This bio crosses a device boundary, so we have to
* split it.
*/
struct bio_pair *bp;
bp = bio_split(bio, bio_split_pool,
(bio->bi_sector + (bio->bi_size >> 9) -
(tmp_dev->offset + tmp_dev->size))<<1);
if (linear_make_request(q, &bp->bio1))
generic_make_request(&bp->bio1);
if (linear_make_request(q, &bp->bio2))
generic_make_request(&bp->bio2);
bio_pair_release(bp);
return 0;
}
bio->bi_bdev = tmp_dev->rdev->bdev; bio->bi_bdev = tmp_dev->rdev->bdev;
bio->bi_sector = bio->bi_sector - (tmp_dev->offset << 1) + tmp_dev->rdev->data_offset; bio->bi_sector = bio->bi_sector - (tmp_dev->offset << 1) + tmp_dev->rdev->data_offset;
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <linux/raid/md.h> #include <linux/raid/md.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/bio.h>
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#include <linux/buffer_head.h> /* for invalidate_bdev */ #include <linux/buffer_head.h> /* for invalidate_bdev */
#include <linux/suspend.h> #include <linux/suspend.h>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/raid/multipath.h> #include <linux/raid/multipath.h>
#include <linux/bio.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <asm/atomic.h> #include <asm/atomic.h>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/raid/raid0.h> #include <linux/raid/raid0.h>
#include <linux/bio.h>
#define MAJOR_NR MD_MAJOR #define MAJOR_NR MD_MAJOR
#define MD_DRIVER #define MD_DRIVER
...@@ -179,15 +178,17 @@ static int create_strip_zones (mddev_t *mddev) ...@@ -179,15 +178,17 @@ static int create_strip_zones (mddev_t *mddev)
static int raid0_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *biovec) static int raid0_mergeable_bvec(request_queue_t *q, struct bio *bio, struct bio_vec *biovec)
{ {
mddev_t *mddev = q->queuedata; mddev_t *mddev = q->queuedata;
sector_t sector; sector_t sector = bio->bi_sector;
unsigned int chunk_sectors; int max;
unsigned int bio_sectors; unsigned int chunk_sectors = mddev->chunk_size >> 9;
unsigned int bio_sectors = bio->bi_size >> 9;
chunk_sectors = mddev->chunk_size >> 9;
sector = bio->bi_sector; max = (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9;
bio_sectors = bio->bi_size >> 9; if (max < 0) max = 0; /* bio_add cannot handle a negative return */
if (max <= biovec->bv_len && bio_sectors == 0)
return (chunk_sectors - ((sector & (chunk_sectors - 1)) + bio_sectors)) << 9; return biovec->bv_len;
else
return max;
} }
static int raid0_run (mddev_t *mddev) static int raid0_run (mddev_t *mddev)
...@@ -322,9 +323,23 @@ static int raid0_make_request (request_queue_t *q, struct bio *bio) ...@@ -322,9 +323,23 @@ static int raid0_make_request (request_queue_t *q, struct bio *bio)
hash = conf->hash_table + x; hash = conf->hash_table + x;
} }
if (unlikely(chunk_size < (block & (chunk_size - 1)) + (bio->bi_size >> 10))) {
struct bio_pair *bp;
/* Sanity check -- queue functions should prevent this happening */ /* Sanity check -- queue functions should prevent this happening */
if (unlikely(chunk_size < (block & (chunk_size - 1)) + (bio->bi_size >> 10))) if (bio->bi_vcnt != 1 ||
bio->bi_idx != 0)
goto bad_map; goto bad_map;
/* This is a one page bio that upper layers
* refuse to split for us, so we need to split it.
*/
bp = bio_split(bio, bio_split_pool, (chunk_size - (block & (chunk_size - 1)))<<1 );
if (raid0_make_request(q, &bp->bio1))
generic_make_request(&bp->bio1);
if (raid0_make_request(q, &bp->bio2))
generic_make_request(&bp->bio2);
bio_pair_release(bp);
return 0;
}
if (!hash) if (!hash)
goto bad_hash; goto bad_hash;
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
*/ */
#include <linux/raid/raid1.h> #include <linux/raid/raid1.h>
#include <linux/bio.h>
#define MAJOR_NR MD_MAJOR #define MAJOR_NR MD_MAJOR
#define MD_DRIVER #define MD_DRIVER
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/raid/raid5.h> #include <linux/raid/raid5.h>
#include <linux/bio.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/atomic.h> #include <asm/atomic.h>
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/blkpg.h> #include <linux/blkpg.h>
#include <linux/bio.h>
/* /*
* 'md_p.h' holds the 'physical' layout of RAID devices * 'md_p.h' holds the 'physical' layout of RAID devices
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _MULTIPATH_H #define _MULTIPATH_H
#include <linux/raid/md.h> #include <linux/raid/md.h>
#include <linux/bio.h>
struct multipath_info { struct multipath_info {
mdk_rdev_t *rdev; mdk_rdev_t *rdev;
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
#include <linux/raid/md.h> #include <linux/raid/md.h>
#include <linux/raid/xor.h> #include <linux/raid/xor.h>
#include <linux/bio.h>
/* /*
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment