Commit 3d7faae4 authored by Yu Kuai's avatar Yu Kuai Committed by Li Lingfeng
Browse files

md/raid1-10: factor out a helper to add bio to plug 

mainline inclusion
from mainline-v6.5-rc1
commit 5ec6ca14
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8UKFJ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=5ec6ca140a034682e421e2e808ef5ddfdfd65242



----------------------------------------

The code in raid1 and raid10 is identical, prepare to limit the number
of plugged bios.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230529131106.2123367-3-yukuai1@huaweicloud.com



Conflicts:
  Commit 309dca30 ("block: store a block_device pointer in struct bio")
  changed "mbio->bi_disk" to "mbio->bi_bdev";
  Commit 2e94275e ("md/raid1: use rdev in raid1_write_request directly")
  changed "conf->mirrors[i].rdev" to "rdev";
  Commit cb1802ff ("md/raid10: Use the new blk_opf_t type") changed the
  type of "do_sync" and "do_fua".
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent ae96d604

drivers/md/raid1-10.c

+16 −0
Original line number Diff line number Diff line
@@ -109,3 +109,19 @@ static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp, 
		size -= len;

	} while (idx++ < RESYNC_PAGES && size > 0);

}



static inline bool raid1_add_bio_to_plug(struct mddev *mddev, struct bio *bio,

				      blk_plug_cb_fn unplug)

{

	struct raid1_plug_cb *plug = NULL;

	struct blk_plug_cb *cb = blk_check_plugged(unplug, mddev,

						   sizeof(*plug));



	if (!cb)

		return false;



	plug = container_of(cb, struct raid1_plug_cb, cb);

	bio_list_add(&plug->pending, bio);



	return true;

}

drivers/md/raid1.c

+1 −10
Original line number Diff line number Diff line
@@ -1319,8 +1319,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
	struct bitmap *bitmap = mddev->bitmap;

	unsigned long flags;

	struct md_rdev *blocked_rdev;

	struct blk_plug_cb *cb;

	struct raid1_plug_cb *plug = NULL;

	int first_clone;

	int max_sectors;

	bool write_behind = false;
@@ -1539,14 +1537,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
		/* flush_pending_writes() needs access to the rdev so...*/

		mbio->bi_disk = (void *)conf->mirrors[i].rdev;



		cb = blk_check_plugged(raid1_unplug, mddev, sizeof(*plug));

		if (cb)

			plug = container_of(cb, struct raid1_plug_cb, cb);

		else

			plug = NULL;

		if (plug) {

			bio_list_add(&plug->pending, mbio);

		} else {

		if (!raid1_add_bio_to_plug(mddev, mbio, raid1_unplug)) {

			spin_lock_irqsave(&conf->device_lock, flags);

			bio_list_add(&conf->pending_bio_list, mbio);

			spin_unlock_irqrestore(&conf->device_lock, flags);

drivers/md/raid10.c

+1 −10
Original line number Diff line number Diff line
@@ -1239,8 +1239,6 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio, 
	const unsigned long do_sync = (bio->bi_opf & REQ_SYNC);

	const unsigned long do_fua = (bio->bi_opf & REQ_FUA);

	unsigned long flags;

	struct blk_plug_cb *cb;

	struct raid1_plug_cb *plug = NULL;

	struct r10conf *conf = mddev->private;

	struct md_rdev *rdev;

	int devnum = r10_bio->devs[n_copy].devnum;
@@ -1274,14 +1272,7 @@ static void raid10_write_one_disk(struct mddev *mddev, struct r10bio *r10_bio, 


	atomic_inc(&r10_bio->remaining);



	cb = blk_check_plugged(raid10_unplug, mddev, sizeof(*plug));

	if (cb)

		plug = container_of(cb, struct raid1_plug_cb, cb);

	else

		plug = NULL;

	if (plug) {

		bio_list_add(&plug->pending, mbio);

	} else {

	if (!raid1_add_bio_to_plug(mddev, mbio, raid10_unplug)) {

		spin_lock_irqsave(&conf->device_lock, flags);

		bio_list_add(&conf->pending_bio_list, mbio);

		spin_unlock_irqrestore(&conf->device_lock, flags);