Patch "md/raid1: free the r1bio before waiting for blocked rdev" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    md/raid1: free the r1bio before waiting for blocked rdev

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     md-raid1-free-the-r1bio-before-waiting-for-blocked-r.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 1c25c10a5eb0a12dbb9139f1085b4cdd39c4f80a
Author: Xueshi Hu <xueshi.hu@xxxxxxxxxx>
Date:   Mon Aug 14 21:53:55 2023 +0800

    md/raid1: free the r1bio before waiting for blocked rdev
    
    [ Upstream commit 992db13a4aee766c8bfbf046ad15c2db5fa7cab8 ]
    
    Raid1 reshape will change mempool and r1conf::raid_disks which are
    needed to free r1bio. allow_barrier() make a concurrent raid1_reshape()
    possible. So, free the in-flight r1bio before waiting blocked rdev.
    
    Fixes: 6bfe0b499082 ("md: support blocking writes to an array on device failure")
    Reviewed-by: Yu Kuai <yukuai3@xxxxxxxxxx>
    Signed-off-by: Xueshi Hu <xueshi.hu@xxxxxxxxxx>
    Link: https://lore.kernel.org/r/20230814135356.1113639-3-xueshi.hu@xxxxxxxxxx
    Signed-off-by: Song Liu <song@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index ac64c587191b9..433db7007f88b 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1370,6 +1370,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
 		return;
 	}
 
+ retry_write:
 	r1_bio = alloc_r1bio(mddev, bio);
 	r1_bio->sectors = max_write_sectors;
 
@@ -1385,7 +1386,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
 	 */
 
 	disks = conf->raid_disks * 2;
- retry_write:
 	blocked_rdev = NULL;
 	rcu_read_lock();
 	max_sectors = r1_bio->sectors;
@@ -1465,7 +1465,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
 		for (j = 0; j < i; j++)
 			if (r1_bio->bios[j])
 				rdev_dec_pending(conf->mirrors[j].rdev, mddev);
-		r1_bio->state = 0;
+		free_r1bio(r1_bio);
 		allow_barrier(conf, bio->bi_iter.bi_sector);
 
 		if (bio->bi_opf & REQ_NOWAIT) {



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux