Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a10308 authored by Ming Lei's avatar Ming Lei Committed by Shaohua Li
Browse files

md: fast clone bio in bio_clone_mddev() 



Firstly bio_clone_mddev() is used in raid normal I/O and isn't
in resync I/O path.

Secondly all the direct access to bvec table in raid happens on
resync I/O except for write behind of raid1, in which we still
use bio_clone() for allocating new bvec table.

So this patch replaces bio_clone() with bio_clone_fast()
in bio_clone_mddev().

Also kill bio_clone_mddev() and call bio_clone_fast() directly, as
suggested by Christoph Hellwig.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent ed7ef732

drivers/md/faulty.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static void faulty_make_request(struct mddev *mddev, struct bio *bio) 
		}

	}

	if (failit) {

		struct bio *b = bio_clone_mddev(bio, GFP_NOIO, mddev);

		struct bio *b = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);



		b->bi_bdev = conf->rdev->bdev;

		b->bi_private = bio;

drivers/md/md.c

+0 −7
Original line number Diff line number Diff line
@@ -190,13 +190,6 @@ struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, 
}

EXPORT_SYMBOL_GPL(bio_alloc_mddev);



struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,

			    struct mddev *mddev)

{

	return bio_clone_bioset(bio, gfp_mask, mddev->bio_set);

}

EXPORT_SYMBOL_GPL(bio_clone_mddev);



/*

 * We have a system wide 'event count' that is incremented

 * on any 'interesting' event, and readers of /proc/mdstat

drivers/md/md.h

+0 −2
Original line number Diff line number Diff line
@@ -673,8 +673,6 @@ extern void md_rdev_clear(struct md_rdev *rdev); 


extern void mddev_suspend(struct mddev *mddev);

extern void mddev_resume(struct mddev *mddev);

extern struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask,

				   struct mddev *mddev);

extern struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs,

				   struct mddev *mddev);

drivers/md/raid1.c

+6 −4
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio, 
	r1_bio->read_disk = rdisk;

	r1_bio->start_next_window = 0;



	read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev);

	read_bio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

	bio_trim(read_bio, r1_bio->sector - bio->bi_iter.bi_sector,

		 max_sectors);
@@ -1376,7 +1376,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
		}



		if (!mbio) {

			mbio = bio_clone_mddev(bio, GFP_NOIO, mddev);

			mbio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

			bio_trim(mbio, offset, max_sectors);

		}
@@ -2286,7 +2286,8 @@ static int narrow_write_error(struct r1bio *r1_bio, int i) 


			wbio->bi_vcnt = vcnt;

		} else {

			wbio = bio_clone_mddev(r1_bio->master_bio, GFP_NOIO, mddev);

			wbio = bio_clone_fast(r1_bio->master_bio, GFP_NOIO,

					      mddev->bio_set);

		}



		bio_set_op_attrs(wbio, REQ_OP_WRITE, 0);
@@ -2424,7 +2425,8 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio) 
		const unsigned long do_sync

			= r1_bio->master_bio->bi_opf & REQ_SYNC;

		r1_bio->read_disk = disk;

		bio = bio_clone_mddev(r1_bio->master_bio, GFP_NOIO, mddev);

		bio = bio_clone_fast(r1_bio->master_bio, GFP_NOIO,

				     mddev->bio_set);

		bio_trim(bio, r1_bio->sector - bio->bi_iter.bi_sector,

			 max_sectors);

		r1_bio->bios[r1_bio->read_disk] = bio;

drivers/md/raid10.c

+5 −6
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, 
	}

	slot = r10_bio->read_slot;



	read_bio = bio_clone_mddev(bio, GFP_NOIO, mddev);

	read_bio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

	bio_trim(read_bio, r10_bio->sector - bio->bi_iter.bi_sector,

		 max_sectors);
@@ -1406,7 +1406,7 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio, 
		int d = r10_bio->devs[i].devnum;

		if (r10_bio->devs[i].bio) {

			struct md_rdev *rdev = conf->mirrors[d].rdev;

			mbio = bio_clone_mddev(bio, GFP_NOIO, mddev);

			mbio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

			bio_trim(mbio, r10_bio->sector - bio->bi_iter.bi_sector,

				 max_sectors);

			r10_bio->devs[i].bio = mbio;
@@ -1457,7 +1457,7 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio, 
				smp_mb();

				rdev = conf->mirrors[d].rdev;

			}

			mbio = bio_clone_mddev(bio, GFP_NOIO, mddev);

			mbio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

			bio_trim(mbio, r10_bio->sector - bio->bi_iter.bi_sector,

				 max_sectors);

			r10_bio->devs[i].repl_bio = mbio;
@@ -2565,7 +2565,7 @@ static int narrow_write_error(struct r10bio *r10_bio, int i) 
		if (sectors > sect_to_write)

			sectors = sect_to_write;

		/* Write at 'sector' for 'sectors' */

		wbio = bio_clone_mddev(bio, GFP_NOIO, mddev);

		wbio = bio_clone_fast(bio, GFP_NOIO, mddev->bio_set);

		bio_trim(wbio, sector - bio->bi_iter.bi_sector, sectors);

		wsector = r10_bio->devs[i].addr + (sector - r10_bio->sector);

		wbio->bi_iter.bi_sector = wsector +
@@ -2641,8 +2641,7 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio) 
			   mdname(mddev),

			   bdevname(rdev->bdev, b),

			   (unsigned long long)r10_bio->sector);

	bio = bio_clone_mddev(r10_bio->master_bio,

			      GFP_NOIO, mddev);

	bio = bio_clone_fast(r10_bio->master_bio, GFP_NOIO, mddev->bio_set);

	bio_trim(bio, r10_bio->sector - bio->bi_iter.bi_sector, max_sectors);

	r10_bio->devs[slot].bio = bio;

	r10_bio->devs[slot].rdev = rdev;