[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
 fs/btrfs/compression.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 9a023ae0f98b..30d82cdf128c 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -352,7 +352,7 @@ static void end_compressed_bio_write(struct bio *bio)
 	btrfs_record_physical_zoned(inode, cb->start, bio);
 	btrfs_writepage_endio_finish_ordered(BTRFS_I(inode), NULL,
 			cb->start, cb->start + cb->len - 1,
-			bio->bi_status == BLK_STS_OK);
+			!cb->errors);
 
 	end_compressed_writeback(inode, cb);
 	/* note, our inode could be gone now */
-- 
2.32.0

Re: [PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[David Sterba]

On Fri, Jul 09, 2021 at 11:29:22AM -0500, Goldwyn Rodrigues wrote:
> In compression write endio sequence, the range which the compressed_bio
> writes is marked as uptodate if the last bio of the compressed (sub)bios
> is completed successfully. There could be previous bio which may
> have failed which is recorded in cb->errors.
> 
> Set the writeback range as uptodate only if cb->errors is zero, as opposed
> to checking only the last bio's status.
> 
> Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> ---
>  fs/btrfs/compression.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> index 9a023ae0f98b..30d82cdf128c 100644
> --- a/fs/btrfs/compression.c
> +++ b/fs/btrfs/compression.c
> @@ -352,7 +352,7 @@ static void end_compressed_bio_write(struct bio *bio)
>  	btrfs_record_physical_zoned(inode, cb->start, bio);
>  	btrfs_writepage_endio_finish_ordered(BTRFS_I(inode), NULL,
>  			cb->start, cb->start + cb->len - 1,
> -			bio->bi_status == BLK_STS_OK);
> +			!cb->errors);

Right, that would only test the last bio. Have been able to reproduce
it?

Anyway, added to misc-next, thanks.

Re: [PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

On 16:34 22/07, David Sterba wrote:
> On Fri, Jul 09, 2021 at 11:29:22AM -0500, Goldwyn Rodrigues wrote:
> > In compression write endio sequence, the range which the compressed_bio
> > writes is marked as uptodate if the last bio of the compressed (sub)bios
> > is completed successfully. There could be previous bio which may
> > have failed which is recorded in cb->errors.
> > 
> > Set the writeback range as uptodate only if cb->errors is zero, as opposed
> > to checking only the last bio's status.
> > 
> > Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
> > ---
> >  fs/btrfs/compression.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
> > index 9a023ae0f98b..30d82cdf128c 100644
> > --- a/fs/btrfs/compression.c
> > +++ b/fs/btrfs/compression.c
> > @@ -352,7 +352,7 @@ static void end_compressed_bio_write(struct bio *bio)
> >  	btrfs_record_physical_zoned(inode, cb->start, bio);
> >  	btrfs_writepage_endio_finish_ordered(BTRFS_I(inode), NULL,
> >  			cb->start, cb->start + cb->len - 1,
> > -			bio->bi_status == BLK_STS_OK);
> > +			!cb->errors);
> 
> Right, that would only test the last bio. Have been able to reproduce
> it?
> 

No, I don't have a reproducer. Just observed it while reading the code.

> Anyway, added to misc-next, thanks.

Thanks.

-- 
Goldwyn

Re: [PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Sasha Levin]

On Mon, Aug 02, 2021 at 09:32:06AM -0500, Goldwyn Rodrigues wrote:
>For: v4.19
>Git-commit: 240246f6b913b0c23733cfd2def1d283f8cc9bbe
>
>In compression write endio sequence, the range which the compressed_bio
>writes is marked as uptodate if the last bio of the compressed (sub)bios
>is completed successfully. There could be previous bio which may
>have failed which is recorded in cb->errors.
>
>Set the writeback range as uptodate only if cb->errors is zero, as opposed
>to checking only the last bio's status.
>
>Backporting notes: in all versions up to 4.4 the last argument is always
>replaced by "!cb->errors".
>
>Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
>Reviewed-by: David Sterba <dsterba@suse.com>
>Signed-off-by: David Sterba <dsterba@suse.com>

I've queued up this and the other backports, thanks!

-- 
Thanks,
Sasha

[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

For: v4.19
Git-commit: 240246f6b913b0c23733cfd2def1d283f8cc9bbe

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Backporting notes: in all versions up to 4.4 the last argument is always
replaced by "!cb->errors".

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index c71e534ca7ef..919c033b9e31 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -270,8 +270,7 @@ static void end_compressed_bio_write(struct bio *bio)
 					 cb->start,
 					 cb->start + cb->len - 1,
 					 NULL,
-					 bio->bi_status ?
-					 BLK_STS_OK : BLK_STS_NOTSUPP);
+					 !cb->errors);
 	cb->compressed_pages[0]->mapping = NULL;
 
 	end_compressed_writeback(inode, cb);

-- 
Goldwyn

[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

Git-commit: 240246f6b913b0c23733cfd2def1d283f8cc9bbe
For: v4.14

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Backporting notes: in all versions up to 4.4 the last argument is always
replaced by "!cb->errors".

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index ccd9c709375e..24341c97c13f 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -286,7 +286,7 @@ static void end_compressed_bio_write(struct bio *bio)
 					 cb->start,
 					 cb->start + cb->len - 1,
 					 NULL,
-					 bio->bi_status ? 0 : 1);
+					 !cb->errors);
 	cb->compressed_pages[0]->mapping = NULL;
 
 	end_compressed_writeback(inode, cb);

-- 
Goldwyn

[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

Git-commit: 240246f6b913b0c23733cfd2def1d283f8cc9bbe
For: v4.9

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Backporting notes: in all versions up to 4.4 the last argument is always
replaced by "!cb->errors".

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index d4d8b7e36b2f..2534e44cfd40 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -290,7 +290,7 @@ static void end_compressed_bio_write(struct bio *bio)
 					 cb->start,
 					 cb->start + cb->len - 1,
 					 NULL,
-					 bio->bi_error ? 0 : 1);
+					 !cb->errors);
 	cb->compressed_pages[0]->mapping = NULL;
 
 	end_compressed_writeback(inode, cb);

-- 
Goldwyn

[PATCH] btrfs: mark compressed range uptodate only if all bio succeed

[Goldwyn Rodrigues]

Git-commit: 240246f6b913b0c23733cfd2def1d283f8cc9bbe
For: v4.4

In compression write endio sequence, the range which the compressed_bio
writes is marked as uptodate if the last bio of the compressed (sub)bios
is completed successfully. There could be previous bio which may
have failed which is recorded in cb->errors.

Set the writeback range as uptodate only if cb->errors is zero, as opposed
to checking only the last bio's status.

Backporting notes: in all versions up to 4.4 the last argument is always
replaced by "!cb->errors".

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index bae05c5c75ba..92601775ec5e 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -290,7 +290,7 @@ static void end_compressed_bio_write(struct bio *bio)
 					 cb->start,
 					 cb->start + cb->len - 1,
 					 NULL,
-					 bio->bi_error ? 0 : 1);
+					 !cb->errors);
 	cb->compressed_pages[0]->mapping = NULL;
 
 	end_compressed_writeback(inode, cb);

-- 
Goldwyn