Skip to contentSkip to conversation

f2fs: limit nr_iovecs in bio_alloc

PATCH In review Chao Yu 2 participants 3 messages Sep 13, 2013

Subsystems (2)
lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 1/1 f2fs: limit nr_iovecs in bio_alloc

This patch add macro MAX_BIO_BLOCKS to limit value of npages in f2fs_bio_alloc,
it can avoid to return NULL in bio_alloc caused by npages is larger than UIO_MAXIOV.

---

 fs/f2fs/segment.c |    4 +++-
 fs/f2fs/segment.h |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +0 -0
index 09af9c7..bd79bbe 100644
@@ -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;
                /*
fs/f2fs/segment.h +3 -0
index bdd10ea..9cc95eb 100644
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/blkdev.h>
+#include <linux/uio.h>
 
 /* constant macro */
 #define NULL_SEGNO                     ((unsigned int)(~0))
@@ -90,6 +91,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_BLOCK(max_hw_blocks)                                   \
+       (min((int)max_hw_blocks, UIO_MAXIOV))
 
 /* during checkpoint, bio_private is used to synchronize the last bio */
 struct bio_private {

---

#1 lore raw

Did this patch pass the basic build? There seems have a typo regarding MAX_BIO_BLOCK.

--
Jin

Quoted 63 lines · Chao Yu

This patch add macro MAX_BIO_BLOCKS to limit value of npages in f2fs_bio_alloc,
it can avoid to return NULL in bio_alloc caused by npages is larger than UIO_MAXIOV.

---

 fs/f2fs/segment.c |    4 +++-
 fs/f2fs/segment.h |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +3 -1
index 09af9c7..bd79bbe 100644
@@ -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;
                /*
fs/f2fs/segment.h +3 -2
index bdd10ea..9cc95eb 100644
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/blkdev.h>
+#include <linux/uio.h>
 
 /* constant macro */
 #define NULL_SEGNO                     ((unsigned int)(~0))
@@ -90,6 +91,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_BLOCK(max_hw_blocks)                                   \
+       (min((int)max_hw_blocks, UIO_MAXIOV))
 
 /* 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/

author
#2 lore raw
Quoted 5 lines

-----Original Message-----
From: Jin Xu [mailto:[email protected]]
Sent: Friday, September 13, 2013 7:49 PM
To: Chao Yu
Cc: ???; [email protected];

[email protected];

Quoted 6 lines

[email protected]; 谭姝
Subject: Re: [f2fs-dev][PATCH] f2fs: limit nr_iovecs in bio_alloc

Did this patch pass the basic build? There seems have a typo regarding MAX_BIO_BLOCK.

I am so sorry about that.I miss the 'S' when merging the code by handwriting from build path to git branch path.
I will check the patch carefully and resubmit it.

Thanks for reminding!

Quoted 26 lines

--
Jin

Quoted 15 lines · Chao Yu

This patch add macro MAX_BIO_BLOCKS to limit value of npages in f2fs_bio_alloc, it can avoid to return NULL in bio_alloc caused by npages is larger than UIO_MAXIOV.

---

 fs/f2fs/segment.c |    4 +++-
 fs/f2fs/segment.h |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)
fs/f2fs/segment.c index renamed from fs/f2fs/segment.c +0 -0

09af9c7..bd79bbe 100644

fs/f2fs/segment.c static void submit_write_page(struct f2fs_sb_info · line 658

Quoted 2 lines
fs/f2fs/segment.c +0 -0
@@ -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)

Quoted 4 lines
fs/f2fs/segment.c +1 -0
 {
        struct block_device *bdev = sbi->sb->s_bdev;
+       int bio_blocks;
 
Quoted 7 lines

fs/f2fs/segment.c retry: · line 679

Quoted 7 lines
fs/f2fs/segment.c +0 -1
        verify_block_addr(sbi, blk_addr);
@@ -676,7 +677,8 @@ retry:
                        goto retry;
                }
 
-               sbi->bio[type] = f2fs_bio_alloc(bdev,

max_hw_blocks(sbi));

Quoted 22 lines
Quoted 19 lines
fs/f2fs/segment.c +2 -0
+               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;
                /*
fs/f2fs/segment.h index renamed from fs/f2fs/segment.h +0 -0

bdd10ea..9cc95eb 100644

fs/f2fs/segment.h +1 -0
@@ -9,6 +9,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/blkdev.h>
+#include <linux/uio.h>
 
 /* constant macro */
 #define NULL_SEGNO                     ((unsigned int)(~0))

fs/f2fs/segment.h line 92

Quoted 2 lines
fs/f2fs/segment.h +0 -0
@@ -90,6 +91,8 @@
        (blk_addr << ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
 #define SECTOR_TO_BLOCK(sbi, sectors)

\

Quoted 14 lines

fs/f2fs/segment.h line 94

Quoted 2 lines
fs/f2fs/segment.h +1 -0
        (sectors >> ((sbi)->log_blocksize - F2FS_LOG_SECTOR_SIZE))
+#define MAX_BIO_BLOCK(max_hw_blocks)

\

Quoted 11 lines
fs/f2fs/segment.h +1 -2
+       (min((int)max_hw_blocks, UIO_MAXIOV))
 
 /* 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/

------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel