f2fs: introduce private bioset

In low memory scenario, we can allocate multiple bios without
submitting any of them.

- f2fs_write_checkpoint()
 - block_operations()
  - f2fs_sync_node_pages()
   step 1) flush cold nodes, allocate new bio from mempool
   - bio_alloc()
    - mempool_alloc()
   step 2) flush hot nodes, allocate a bio from mempool
   - bio_alloc()
    - mempool_alloc()
   step 3) flush warm nodes, be stuck in below call path
   - bio_alloc()
    - mempool_alloc()
     - loop to wait mempool element release, as we only
       reserved memory for two bio allocation, however above
       allocated two bios may never be submitted.

So we need avoid using default bioset, in this patch we introduce a
private bioset, in where we enlarg mempool element count to total
number of log header, so that we can make sure we have enough
backuped memory pool in scenario of allocating/holding multiple
bios.

Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 3b294512155747d31d3754bbf28cb83cab716ac2..f89aeaaea90e55bfeed4de35f3d8a972d8536d97 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -31,6 +31,47 @@
 static struct kmem_cache *bio_post_read_ctx_cache;
 static struct kmem_cache *bio_entry_slab;
 static mempool_t *bio_post_read_ctx_pool;
+static struct bio_set f2fs_bioset;
+
+#define        F2FS_BIO_POOL_SIZE      NR_CURSEG_TYPE
+
+int __init f2fs_init_bioset(void)
+{
+       if (bioset_init(&f2fs_bioset, F2FS_BIO_POOL_SIZE,
+                                       0, BIOSET_NEED_BVECS))
+               return -ENOMEM;
+       return 0;
+}
+
+void f2fs_destroy_bioset(void)
+{
+       bioset_exit(&f2fs_bioset);
+}
+
+static inline struct bio *__f2fs_bio_alloc(gfp_t gfp_mask,
+                                               unsigned int nr_iovecs)
+{
+       return bio_alloc_bioset(gfp_mask, nr_iovecs, &f2fs_bioset);
+}
+
+struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool no_fail)
+{
+       struct bio *bio;
+
+       if (no_fail) {
+               /* No failure on bio allocation */
+               bio = __f2fs_bio_alloc(GFP_NOIO, npages);
+               if (!bio)
+                       bio = __f2fs_bio_alloc(GFP_NOIO | __GFP_NOFAIL, npages);
+               return bio;
+       }
+       if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {
+               f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO);
+               return NULL;
+       }
+
+       return __f2fs_bio_alloc(GFP_KERNEL, npages);
+}
 
 static bool __is_cp_guaranteed(struct page *page)
 {
@@ -3317,7 +3358,7 @@ int __init f2fs_init_bio_entry_cache(void)
        return 0;
 }
 
-void __exit f2fs_destroy_bio_entry_cache(void)
+void f2fs_destroy_bio_entry_cache(void)
 {
        kmem_cache_destroy(bio_entry_slab);
 }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 33c57627b64959d076d906585aca8dd7f9ad369f..dbc20d33d0e1f2d89b2f89c6e7a3e4ab52cb065f 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2221,26 +2221,6 @@ static inline void *f2fs_kmem_cache_alloc(struct kmem_cache *cachep,
        return entry;
 }
 
-static inline struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi,
-                                               int npages, bool no_fail)
-{
-       struct bio *bio;
-
-       if (no_fail) {
-               /* No failure on bio allocation */
-               bio = bio_alloc(GFP_NOIO, npages);
-               if (!bio)
-                       bio = bio_alloc(GFP_NOIO | __GFP_NOFAIL, npages);
-               return bio;
-       }
-       if (time_to_inject(sbi, FAULT_ALLOC_BIO)) {
-               f2fs_show_injection_info(sbi, FAULT_ALLOC_BIO);
-               return NULL;
-       }
-
-       return bio_alloc(GFP_KERNEL, npages);
-}
-
 static inline bool is_idle(struct f2fs_sb_info *sbi, int type)
 {
        if (sbi->gc_mode == GC_URGENT)
@@ -3206,6 +3186,9 @@ void f2fs_destroy_checkpoint_caches(void);
 /*
  * data.c
  */
+int __init f2fs_init_bioset(void);
+void f2fs_destroy_bioset(void);
+struct bio *f2fs_bio_alloc(struct f2fs_sb_info *sbi, int npages, bool no_fail);
 int f2fs_init_post_read_processing(void);
 void f2fs_destroy_post_read_processing(void);
 int f2fs_init_bio_entry_cache(void);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 755ad57c795b6704e1daef24195e1afcb5748fd7..9e85894d12c9b73ce324230eba2d6c6c8a3187a2 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -3773,8 +3773,12 @@ static int __init init_f2fs_fs(void)
        err = f2fs_init_bio_entry_cache();
        if (err)
                goto free_post_read;
+       err = f2fs_init_bioset();
+       if (err)
+               goto free_bio_enrty_cache;
        return 0;
-
+free_bio_enrty_cache:
+       f2fs_destroy_bio_entry_cache();
 free_post_read:
        f2fs_destroy_post_read_processing();
 free_root_stats:
@@ -3800,6 +3804,7 @@ static int __init init_f2fs_fs(void)
 
 static void __exit exit_f2fs_fs(void)
 {
+       f2fs_destroy_bioset();
        f2fs_destroy_bio_entry_cache();
        f2fs_destroy_post_read_processing();
        f2fs_destroy_root_stats();