Commit 6ddca75c authored by Mariusz Tkaczyk's avatar Mariusz Tkaczyk Committed by Li Lingfeng
Browse files

md: drop queue limitation for RAID1 and RAID10 

mainline inclusion
from mainline-v5.17-rc1
commit a92ce0fe
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=a92ce0feffeed8b91f02dac85246d1205e4a64b6

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

As suggested by Neil Brown[1], this limitation seems to be
deprecated.

With plugging in use, writes are processed behind the raid thread
and conf->pending_count is not increased. This limitation occurs only
if caller doesn't use plugs.

It can be avoided and often it is (with plugging). There are no reports
that queue is growing to enormous size so remove queue limitation for
non-plugged IOs too.

[1] https://lore.kernel.org/linux-raid/162496301481.7211.18031090130574610495@noble.neil.brown.name



Signed-off-by: default avatarMariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent c609299e

drivers/md/raid1-10.c

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ 


#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)



/* When there are this many requests queue to be written by

 * the raid thread, we become 'congested' to provide back-pressure

 * for writeback.

 */

static int max_queued_requests = 1024;



/* for managing resync I/O pages */

struct resync_pages {

	void		*raid_bio;

drivers/md/raid1.c

+0 −7
Original line number Diff line number Diff line
@@ -1360,12 +1360,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
	r1_bio = alloc_r1bio(mddev, bio);

	r1_bio->sectors = max_write_sectors;



	if (conf->pending_count >= max_queued_requests) {

		md_wakeup_thread(mddev->thread);

		raid1_log(mddev, "wait queued");

		wait_event(conf->wait_barrier,

			   conf->pending_count < max_queued_requests);

	}

	/* first select target devices under rcu_lock and

	 * inc refcount on their rdev.  Record them by setting

	 * bios[x] to bio
@@ -3431,4 +3425,3 @@ MODULE_ALIAS("md-personality-3"); /* RAID1 */ 
MODULE_ALIAS("md-raid1");

MODULE_ALIAS("md-level-1");

module_param(max_queued_requests, int, S_IRUGO|S_IWUSR);

drivers/md/raid10.c

+0 −7
Original line number Diff line number Diff line
@@ -1343,12 +1343,6 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio, 
		conf->reshape_safe = mddev->reshape_position;

	}



	if (conf->pending_count >= max_queued_requests) {

		md_wakeup_thread(mddev->thread);

		raid10_log(mddev, "wait queued");

		wait_event(conf->wait_barrier,

			   conf->pending_count < max_queued_requests);

	}

	/* first select target devices under rcu_lock and

	 * inc refcount on their rdev.  Record them by setting

	 * bios[x] to bio
@@ -4974,4 +4968,3 @@ MODULE_ALIAS("md-personality-9"); /* RAID10 */ 
MODULE_ALIAS("md-raid10");

MODULE_ALIAS("md-level-10");

module_param(max_queued_requests, int, S_IRUGO|S_IWUSR);