Skip to contentSkip to conversation

btrfs:remove redundant index_rbio_pages in raid56_rmw_stripe

PATCH In review Flint.Wang 3 participants 7 messages Sep 29, 2022 Btrfs file system

lore
Share & tools
lore

Flint.Wang

author
#0 lore raw

PATCH 1/1 btrfs:remove redundant index_rbio_pages in raid56_rmw_stripe

The index_rbio_pages in raid56_rmw_stripe is redundant. It is invoked in finish_rmw anyway.

---
 fs/btrfs/raid56.c | 2 --
 1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -2
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
 	if (ret)
 		goto cleanup;
 
-	index_rbio_pages(rbio);
-
 	atomic_set(&rbio->error, 0);
 	/* Build a list of bios to read all the missing data sectors. */
 	for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;
Signature · 1 line
2.37.0
author
#1 lore raw
Quoted 13 lines · Flint.Wang

The index_rbio_pages in raid56_rmw_stripe is redundant. It is invoked in finish_rmw anyway.

---
 fs/btrfs/raid56.c | 2 --
 1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -0
index f6395e8288d69..44266b2c5b86e 100644

fs/btrfs/raid56.c static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio) · line 1551

Quoted 8 lines
fs/btrfs/raid56.c +0 -2
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
 	if (ret)
 		goto cleanup;
 
-	index_rbio_pages(rbio);
-
 	atomic_set(&rbio->error, 0);
 	/* Build a list of bios to read all the missing data sectors. */
 	for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;

Hi Qu,

I am doing some experiment on the destroy RMW. It seems the index_rbio_pages in raid56_rmw_stripe is redundant. We will do it in finish_rmw anyway.

Thanks,
Flint

#2 lore raw
In reply to Flint.Wang
Quoted 1 line · Flint.Wang

The index_rbio_pages in raid56_rmw_stripe is redundant.

index_rbio_pages() is to populate the rbio->bio_sectors array.

In raid56_rmw_stripe() we later calls sector_in_rbio(), which will check if a sector is belonging to bio_lists.

If not called, all sector will be returned using the sectors in rbio->bio_sectors, not using the sectors in bio lists.

Have you tried your patch with fstests runs?

IMHO it should fail a lot of very basic writes in RAID56.

Thanks,
Qu

Quoted 20 lines

It is invoked in finish_rmw anyway.

---
  fs/btrfs/raid56.c | 2 --
  1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -2
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
  	if (ret)
  		goto cleanup;
 
-	index_rbio_pages(rbio);
-
  	atomic_set(&rbio->error, 0);
  	/* Build a list of bios to read all the missing data sectors. */
  	for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;
#3 lore raw
Quoted 5 lines · Qu Wenruo
Quoted 1 line · Flint.Wang

   The index_rbio_pages in raid56_rmw_stripe is redundant.

Quoted 7 lines

index_rbio_pages() is to populate the rbio->bio_sectors array.

In raid56_rmw_stripe() we later calls sector_in_rbio(), which will check if a sector is belonging to bio_lists.

If not called, all sector will be returned using the sectors in rbio->bio_sectors, not using the sectors in bio lists.

Have you tried your patch with fstests runs?

Well, for raid56_rmw_stripe() it's fine, as without the index_rbio_pages() call, we just read all the sectors from the disk.

This would include the new pages from bio lists.

It would only cause extra IO, but since they can all be merged into one 64K stripe, it should not cause performance problem.

Furthermore it would read all old sectors from disk, allowing us later to do the verification before doing the writes.

But it should really contain a more detailed explanation.

Thanks,
Qu

Quoted 26 lines

IMHO it should fail a lot of very basic writes in RAID56.

Thanks,
Qu

Quoted 20 lines

   It is invoked in finish_rmw anyway.

---
  fs/btrfs/raid56.c | 2 --

  1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -2
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct 
 btrfs_raid_bio *rbio)
       if (ret)
           goto cleanup;
-    index_rbio_pages(rbio);
-
       atomic_set(&rbio->error, 0);
       /* Build a list of bios to read all the missing data sectors. */
       for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;
author
#4 lore raw

Hi Qu,

Thanks for your reply.
Here is my plan about destructive RMW.

1. Read all the stripes in through raid56_rmw_stripe.
2. Do xor operation in finish_rmw.
3. If the xor result matches, nothing happened.
4. If the xor result mismatches, we can recover the data or trigger some user space progress to fix the data corruption.

But here are some problems.
1. If the stripe is new allocated, the check will fail.
2. Is it convient for kernel get checksum in finish_rmw and recover data?

Thanks,
Flint

Quoted 53 lines · Qu Wenruo
Quoted 5 lines · Qu Wenruo
Quoted 1 line · Flint.Wang

   The index_rbio_pages in raid56_rmw_stripe is redundant.

Quoted 7 lines

index_rbio_pages() is to populate the rbio->bio_sectors array.

In raid56_rmw_stripe() we later calls sector_in_rbio(), which will check if a sector is belonging to bio_lists.

If not called, all sector will be returned using the sectors in rbio->bio_sectors, not using the sectors in bio lists.

Have you tried your patch with fstests runs?

Well, for raid56_rmw_stripe() it's fine, as without the index_rbio_pages() call, we just read all the sectors from the disk.

This would include the new pages from bio lists.

It would only cause extra IO, but since they can all be merged into one 64K stripe, it should not cause performance problem.

Furthermore it would read all old sectors from disk, allowing us later to do the verification before doing the writes.

But it should really contain a more detailed explanation.

Thanks,
Qu

Quoted 25 lines

IMHO it should fail a lot of very basic writes in RAID56.

Thanks,
Qu

Quoted 19 lines

   It is invoked in finish_rmw anyway.

---
  fs/btrfs/raid56.c | 2 --

  1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -2
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
       if (ret)
           goto cleanup;
-    index_rbio_pages(rbio);
-
       atomic_set(&rbio->error, 0);
       /* Build a list of bios to read all the missing data sectors. */
       for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;
#5 lore raw
Quoted 4 lines · hmsjwzb

Hi Qu,

Thanks for your reply.
Here is my plan about destructive RMW.

The overall idea is fine, but some details need to be addressed.

Quoted 2 lines

1. Read all the stripes in through raid56_rmw_stripe.

Note that, even we reached raid56_rmw_stripe(), we may still be a full stripe write (due to substripe writes merged into one full stripe).

In that case, we should not waste IO to read any stripe.

That's what your patch lacks.
(Also all the comments should be updated since you changed the behavior)

Quoted 1 line

2. Do xor operation in finish_rmw.

You may want to do the verification/recovery all before finish_rmw().

The function finish_rmw() is currently the last step of RMW.

Quoted 2 lines

3. If the xor result matches, nothing happened.
4. If the xor result mismatches, we can recover the data or trigger some user space progress to fix the data corruption.

For now just focus on the recover part, no need to bother user space.

Quoted 3 lines

But here are some problems.
1. If the stripe is new allocated, the check will fail.

For now we should focus on data recovery only (metadata will be much more complex), and for data we will need to grab checksum for the full stripe anyway.

So in newly allocated case, there will be no checksum, thus no need to really do any recovery, we just trust all data which doesn't has no checksum.

Quoted 1 line

2. Is it convient for kernel get checksum in finish_rmw and recover data?

If not convenient, you'll need to be creative to grab the checksum.

But from what I see, if you pre-fetch the checksum for the full stripe at raid56_parity_write() timing, it should be fine.

Thanks,
Qu

Quoted 58 lines

Thanks,
Flint

Quoted 53 lines · Qu Wenruo
Quoted 5 lines · Qu Wenruo
Quoted 1 line · Flint.Wang

   The index_rbio_pages in raid56_rmw_stripe is redundant.

Quoted 7 lines

index_rbio_pages() is to populate the rbio->bio_sectors array.

In raid56_rmw_stripe() we later calls sector_in_rbio(), which will check if a sector is belonging to bio_lists.

If not called, all sector will be returned using the sectors in rbio->bio_sectors, not using the sectors in bio lists.

Have you tried your patch with fstests runs?

Well, for raid56_rmw_stripe() it's fine, as without the index_rbio_pages() call, we just read all the sectors from the disk.

This would include the new pages from bio lists.

It would only cause extra IO, but since they can all be merged into one 64K stripe, it should not cause performance problem.

Furthermore it would read all old sectors from disk, allowing us later to do the verification before doing the writes.

But it should really contain a more detailed explanation.

Thanks,
Qu

Quoted 25 lines

IMHO it should fail a lot of very basic writes in RAID56.

Thanks,
Qu

Quoted 19 lines

   It is invoked in finish_rmw anyway.

---
   fs/btrfs/raid56.c | 2 --
   1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -2
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
       if (ret)
           goto cleanup;
-    index_rbio_pages(rbio);
-
       atomic_set(&rbio->error, 0);
       /* Build a list of bios to read all the missing data sectors. */
       for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;
author
#6 lore raw
In reply to Qu Wenruo

Hi Qu,

I test this patch with fstests runs ?

Four btrfs cases failed.

	btrfs/219	btrfs/249	btrfs/253	btrfs/254

Thanks,
Flint

Quoted 37 lines · Qu Wenruo
Quoted 1 line · Flint.Wang

   The index_rbio_pages in raid56_rmw_stripe is redundant.

index_rbio_pages() is to populate the rbio->bio_sectors array.

In raid56_rmw_stripe() we later calls sector_in_rbio(), which will check if a sector is belonging to bio_lists.

If not called, all sector will be returned using the sectors in rbio->bio_sectors, not using the sectors in bio lists.

Have you tried your patch with fstests runs?

IMHO it should fail a lot of very basic writes in RAID56.

Thanks,
Qu

Quoted 19 lines

   It is invoked in finish_rmw anyway.

---
  fs/btrfs/raid56.c | 2 --

  1 file changed, 2 deletions(-)
fs/btrfs/raid56.c +0 -1
index f6395e8288d69..44266b2c5b86e 100644
@@ -1546,8 +1546,6 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
       if (ret)
           goto cleanup;
   -    index_rbio_pages(rbio);
-
       atomic_set(&rbio->error, 0);
       /* Build a list of bios to read all the missing data sectors. */
       for (total_sector_nr = 0; total_sector_nr < nr_data_sectors;