2013-09-22 07:51:47

by Chao Yu

Subject: [f2fs-dev] [PATCH] f2fs: avoid allocating failure in bio_alloc

This patch add macro MAX_BIO_BLOCKS to limit value of npages in
f2fs_bio_alloc, it can avoid allocating failure in bio_alloc caused by
npages is larger than BIO_MAX_PAGES.

Signed-off-by: Yu Chao <[email protected]>
---
fs/f2fs/segment.c | 4 +++-
fs/f2fs/segment.h | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 09af9c7..bd79bbe 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -657,6 +657,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi,
struct page *page,
block_t blk_addr, enum page_type type)
{
struct block_device *bdev = sbi->sb->s_bdev;
+ int bio_blocks;

verify_block_addr(sbi, blk_addr);

@@ -676,7 +677,8 @@ retry:
goto retry;
}

- sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi));
+ bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
+ sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks);
sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi,
blk_addr);
sbi->bio[type]->bi_private = priv;
/*
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index bdd10ea..7f94d78 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -90,6 +90,8 @@
(blk_addr << ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
#define SECTOR_TO_BLOCK(sbi, sectors) \
(sectors >> ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
+#define MAX_BIO_BLOCKS(max_hw_blocks) \
+ (min((int)max_hw_blocks, BIO_MAX_PAGES))

/* during checkpoint, bio_private is used to synchronize the last bio */
struct bio_private {
---

2013-09-23 01:55:52

by Gu Zheng

Subject: Re: [f2fs-dev] [PATCH] f2fs: avoid allocating failure in bio_alloc

On 09/22/2013 03:50 PM, Chao Yu wrote:

> This patch add macro MAX_BIO_BLOCKS to limit value of npages in
> f2fs_bio_alloc, it can avoid allocating failure in bio_alloc caused by
> npages is larger than BIO_MAX_PAGES.
>
> Signed-off-by: Yu Chao <[email protected]>


Reviewed-by: Gu Zheng <[email protected]>

> ---
> fs/f2fs/segment.c | 4 +++-
> fs/f2fs/segment.h | 2 ++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
> index 09af9c7..bd79bbe 100644
> --- a/fs/f2fs/segment.c
> +++ b/fs/f2fs/segment.c
> @@ -657,6 +657,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi,
> struct page *page,
> block_t blk_addr, enum page_type type)
> {
> struct block_device *bdev = sbi->sb->s_bdev;
> + int bio_blocks;
>
> verify_block_addr(sbi, blk_addr);
>
> @@ -676,7 +677,8 @@ retry:
> goto retry;
> }
>
> - sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi));
> + bio_blocks = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
> + sbi->bio[type] = f2fs_bio_alloc(bdev, bio_blocks);
> sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi,
> blk_addr);
> sbi->bio[type]->bi_private = priv;
> /*
> diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
> index bdd10ea..7f94d78 100644
> --- a/fs/f2fs/segment.h
> +++ b/fs/f2fs/segment.h
> @@ -90,6 +90,8 @@
> (blk_addr << ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
> #define SECTOR_TO_BLOCK(sbi, sectors) \
> (sectors >> ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
> +#define MAX_BIO_BLOCKS(max_hw_blocks) \
> + (min((int)max_hw_blocks, BIO_MAX_PAGES))
>
> /* during checkpoint, bio_private is used to synchronize the last bio */
> struct bio_private {
> ---
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>