Linux-Fsdevel Archive on lore.kernel.org
help / color / mirror / Atom feed
* [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false
@ 2020-09-09  3:14 Ritesh Harjani
  2020-09-09  3:36 ` Ming Lei
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Ritesh Harjani @ 2020-09-09  3:14 UTC (permalink / raw)
  To: linux-block, axboe
  Cc: linux-fsdevel, linux-xfs, linux-kernel, hch, Ritesh Harjani,
	Shivaprasad G Bhat, Anju T Sudhakar

If we hit the UINT_MAX limit of bio->bi_iter.bi_size and so we are anyway
not merging this page in this bio, then it make sense to make same_page
also as false before returning.

Without this patch, we hit below WARNING in iomap.
This mostly happens with very large memory system and / or after tweaking
vm dirty threshold params to delay writeback of dirty data.

WARNING: CPU: 18 PID: 5130 at fs/iomap/buffered-io.c:74 iomap_page_release+0x120/0x150
 CPU: 18 PID: 5130 Comm: fio Kdump: loaded Tainted: G        W         5.8.0-rc3 #6
 Call Trace:
  __remove_mapping+0x154/0x320 (unreliable)
  iomap_releasepage+0x80/0x180
  try_to_release_page+0x94/0xe0
  invalidate_inode_page+0xc8/0x110
  invalidate_mapping_pages+0x1dc/0x540
  generic_fadvise+0x3c8/0x450
  xfs_file_fadvise+0x2c/0xe0 [xfs]
  vfs_fadvise+0x3c/0x60
  ksys_fadvise64_64+0x68/0xe0
  sys_fadvise64+0x28/0x40
  system_call_exception+0xf8/0x1c0
  system_call_common+0xf0/0x278

Fixes: cc90bc68422 ("block: fix "check bi_size overflow before merge"")
Suggested-by: Christoph Hellwig <hch@infradead.org>
Reported-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
RESEND: added "fixes" tag

 block/bio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/bio.c b/block/bio.c
index a7366c02c9b5..675ecd81047b 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -877,8 +877,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
 		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
 
 		if (page_is_mergeable(bv, page, len, off, same_page)) {
-			if (bio->bi_iter.bi_size > UINT_MAX - len)
+			if (bio->bi_iter.bi_size > UINT_MAX - len) {
+				*same_page = false;
 				return false;
+			}
 			bv->bv_len += len;
 			bio->bi_iter.bi_size += len;
 			return true;
-- 
2.25.4


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false
  2020-09-09  3:14 [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false Ritesh Harjani
@ 2020-09-09  3:36 ` Ming Lei
  2020-09-09  6:01 ` Christoph Hellwig
  2020-09-09 14:19 ` Jens Axboe
  2 siblings, 0 replies; 4+ messages in thread
From: Ming Lei @ 2020-09-09  3:36 UTC (permalink / raw)
  To: Ritesh Harjani
  Cc: linux-block, Jens Axboe, Linux FS Devel,
	open list:XFS FILESYSTEM, Linux Kernel Mailing List,
	Christoph Hellwig, Shivaprasad G Bhat, Anju T Sudhakar

On Wed, Sep 9, 2020 at 11:16 AM Ritesh Harjani <riteshh@linux.ibm.com> wrote:
>
> If we hit the UINT_MAX limit of bio->bi_iter.bi_size and so we are anyway
> not merging this page in this bio, then it make sense to make same_page
> also as false before returning.
>
> Without this patch, we hit below WARNING in iomap.
> This mostly happens with very large memory system and / or after tweaking
> vm dirty threshold params to delay writeback of dirty data.
>
> WARNING: CPU: 18 PID: 5130 at fs/iomap/buffered-io.c:74 iomap_page_release+0x120/0x150
>  CPU: 18 PID: 5130 Comm: fio Kdump: loaded Tainted: G        W         5.8.0-rc3 #6
>  Call Trace:
>   __remove_mapping+0x154/0x320 (unreliable)
>   iomap_releasepage+0x80/0x180
>   try_to_release_page+0x94/0xe0
>   invalidate_inode_page+0xc8/0x110
>   invalidate_mapping_pages+0x1dc/0x540
>   generic_fadvise+0x3c8/0x450
>   xfs_file_fadvise+0x2c/0xe0 [xfs]
>   vfs_fadvise+0x3c/0x60
>   ksys_fadvise64_64+0x68/0xe0
>   sys_fadvise64+0x28/0x40
>   system_call_exception+0xf8/0x1c0
>   system_call_common+0xf0/0x278
>
> Fixes: cc90bc68422 ("block: fix "check bi_size overflow before merge"")
> Suggested-by: Christoph Hellwig <hch@infradead.org>
> Reported-by: Shivaprasad G Bhat <sbhat@linux.ibm.com>
> Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
> Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
> ---
> RESEND: added "fixes" tag
>
>  block/bio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index a7366c02c9b5..675ecd81047b 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -877,8 +877,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
>                 struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
>
>                 if (page_is_mergeable(bv, page, len, off, same_page)) {
> -                       if (bio->bi_iter.bi_size > UINT_MAX - len)
> +                       if (bio->bi_iter.bi_size > UINT_MAX - len) {
> +                               *same_page = false;
>                                 return false;
> +                       }
>                         bv->bv_len += len;
>                         bio->bi_iter.bi_size += len;
>                         return true;

Reviewed-by: Ming Lei <ming.lei@redhat.com>

-- 
Ming Lei

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false
  2020-09-09  3:14 [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false Ritesh Harjani
  2020-09-09  3:36 ` Ming Lei
@ 2020-09-09  6:01 ` Christoph Hellwig
  2020-09-09 14:19 ` Jens Axboe
  2 siblings, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2020-09-09  6:01 UTC (permalink / raw)
  To: Ritesh Harjani
  Cc: linux-block, axboe, linux-fsdevel, linux-xfs, linux-kernel, hch,
	Shivaprasad G Bhat, Anju T Sudhakar

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false
  2020-09-09  3:14 [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false Ritesh Harjani
  2020-09-09  3:36 ` Ming Lei
  2020-09-09  6:01 ` Christoph Hellwig
@ 2020-09-09 14:19 ` Jens Axboe
  2 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2020-09-09 14:19 UTC (permalink / raw)
  To: Ritesh Harjani, linux-block
  Cc: linux-fsdevel, linux-xfs, linux-kernel, hch, Shivaprasad G Bhat,
	Anju T Sudhakar

On 9/8/20 9:14 PM, Ritesh Harjani wrote:
> If we hit the UINT_MAX limit of bio->bi_iter.bi_size and so we are anyway
> not merging this page in this bio, then it make sense to make same_page
> also as false before returning.
> 
> Without this patch, we hit below WARNING in iomap.
> This mostly happens with very large memory system and / or after tweaking
> vm dirty threshold params to delay writeback of dirty data.
> 
> WARNING: CPU: 18 PID: 5130 at fs/iomap/buffered-io.c:74 iomap_page_release+0x120/0x150
>  CPU: 18 PID: 5130 Comm: fio Kdump: loaded Tainted: G        W         5.8.0-rc3 #6
>  Call Trace:
>   __remove_mapping+0x154/0x320 (unreliable)
>   iomap_releasepage+0x80/0x180
>   try_to_release_page+0x94/0xe0
>   invalidate_inode_page+0xc8/0x110
>   invalidate_mapping_pages+0x1dc/0x540
>   generic_fadvise+0x3c8/0x450
>   xfs_file_fadvise+0x2c/0xe0 [xfs]
>   vfs_fadvise+0x3c/0x60
>   ksys_fadvise64_64+0x68/0xe0
>   sys_fadvise64+0x28/0x40
>   system_call_exception+0xf8/0x1c0
>   system_call_common+0xf0/0x278

Applied, thanks.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-09-09 17:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09  3:14 [RESEND PATCH 1/1] block: Set same_page to false in __bio_try_merge_page if ret is false Ritesh Harjani
2020-09-09  3:36 ` Ming Lei
2020-09-09  6:01 ` Christoph Hellwig
2020-09-09 14:19 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).