f2fs: reduce stack memory cost by using bitfield in struct f2fs_io_info

[ Upstream commit 2eae077e6e46f9046d383631145750e043820dce ]

This patch tries to use bitfield in struct f2fs_io_info to improve
memory usage.

struct f2fs_io_info {
...
	unsigned int need_lock:8;	/* indicate we need to lock cp_rwsem */
	unsigned int version:8;		/* version of the node */
	unsigned int submitted:1;	/* indicate IO submission */
	unsigned int in_list:1;		/* indicate fio is in io_list */
	unsigned int is_por:1;		/* indicate IO is from recovery or not */
	unsigned int retry:1;		/* need to reallocate block address */
	unsigned int encrypted:1;	/* indicate file is encrypted */
	unsigned int post_read:1;	/* require post read */
...
};

After this patch, size of struct f2fs_io_info reduces from 136 to 120.

[Nathan: fix a compile warning (single-bit-bitfield-constant-conversion)]
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Stable-dep-of: 8a430dd49e9c ("f2fs: compress: fix to guarantee persisting compressed blocks by CP")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index eb4d69f53337f453d69d5d60392c52bea20737d9..3ec203bbd5593c811f519f230618ebf16a45bf3e 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -70,7 +70,7 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index,
                .old_blkaddr = index,
                .new_blkaddr = index,
                .encrypted_page = NULL,
-               .is_por = !is_meta,
+               .is_por = !is_meta ? 1 : 0,
        };
        int err;
 
@@ -234,8 +234,8 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,
                .op = REQ_OP_READ,
                .op_flags = sync ? (REQ_META | REQ_PRIO) : REQ_RAHEAD,
                .encrypted_page = NULL,
-               .in_list = false,
-               .is_por = (type == META_POR),
+               .in_list = 0,
+               .is_por = (type == META_POR) ? 1 : 0,
        };
        struct blk_plug plug;
        int err;

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 967262c37da5249b72300a231f7f52efe5c9bc47..7d85db7208e14d43c994b9019c64db1e8fc9fef4 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1249,10 +1249,11 @@ static int f2fs_write_compressed_pages(struct compress_ctx *cc,
                .page = NULL,
                .encrypted_page = NULL,
                .compressed_page = NULL,
-               .submitted = false,
+               .submitted = 0,
                .io_type = io_type,
                .io_wbc = wbc,
-               .encrypted = fscrypt_inode_uses_fs_layer_crypto(cc->inode),
+               .encrypted = fscrypt_inode_uses_fs_layer_crypto(cc->inode) ?
+                                                                       1 : 0,
        };
        struct dnode_of_data dn;
        struct node_info ni;

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 8b561af379743a232cab343415b0c0989f10c286..7b3eb192f9c031597ea0453f448342fddcd2e7cd 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -982,7 +982,7 @@ next:
                bio_page = fio->page;
 
        /* set submitted = true as a return value */
-       fio->submitted = true;
+       fio->submitted = 1;
 
        inc_page_count(sbi, WB_DATA_TYPE(bio_page));
 
@@ -998,7 +998,7 @@ alloc_new:
                                (fio->type == DATA || fio->type == NODE) &&
                                fio->new_blkaddr & F2FS_IO_SIZE_MASK(sbi)) {
                        dec_page_count(sbi, WB_DATA_TYPE(bio_page));
-                       fio->retry = true;
+                       fio->retry = 1;
                        goto skip;
                }
                io->bio = __bio_alloc(fio, BIO_MAX_VECS);
@@ -2776,10 +2776,10 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
                .old_blkaddr = NULL_ADDR,
                .page = page,
                .encrypted_page = NULL,
-               .submitted = false,
+               .submitted = 0,
                .compr_blocks = compr_blocks,
                .need_lock = LOCK_RETRY,
-               .post_read = f2fs_post_read_required(inode),
+               .post_read = f2fs_post_read_required(inode) ? 1 : 0,
                .io_type = io_type,
                .io_wbc = wbc,
                .bio = bio,
@@ -2902,7 +2902,7 @@ out:
        }
 
        if (submitted)
-               *submitted = fio.submitted ? 1 : 0;
+               *submitted = fio.submitted;
 
        return 0;
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e5a9498b89c066e1783db1790bd57d62dd0000cd..1d78bca5037f49910226cb8ab59b4b6d99a4d8ac 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1183,19 +1183,19 @@ struct f2fs_io_info {
        struct page *encrypted_page;    /* encrypted page */
        struct page *compressed_page;   /* compressed page */
        struct list_head list;          /* serialize IOs */
-       bool submitted;         /* indicate IO submission */
-       int need_lock;          /* indicate we need to lock cp_rwsem */
-       bool in_list;           /* indicate fio is in io_list */
-       bool is_por;            /* indicate IO is from recovery or not */
-       bool retry;             /* need to reallocate block address */
-       int compr_blocks;       /* # of compressed block addresses */
-       bool encrypted;         /* indicate file is encrypted */
-       bool post_read;         /* require post read */
+       unsigned int compr_blocks;      /* # of compressed block addresses */
+       unsigned int need_lock:8;       /* indicate we need to lock cp_rwsem */
+       unsigned int version:8;         /* version of the node */
+       unsigned int submitted:1;       /* indicate IO submission */
+       unsigned int in_list:1;         /* indicate fio is in io_list */
+       unsigned int is_por:1;          /* indicate IO is from recovery or not */
+       unsigned int retry:1;           /* need to reallocate block address */
+       unsigned int encrypted:1;       /* indicate file is encrypted */
+       unsigned int post_read:1;       /* require post read */
        enum iostat_type io_type;       /* io type */
        struct writeback_control *io_wbc; /* writeback control */
        struct bio **bio;               /* bio for ipu */
        sector_t *last_block;           /* last block number in bio */
-       unsigned char version;          /* version of the node */
 };
 
 struct bio_entry {

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index ec7212f7a9b73b9a13fe22eff75cfcfae7af6134..8161355658562a7f51d8a766310737a9ae213e64 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1187,8 +1187,8 @@ static int ra_data_block(struct inode *inode, pgoff_t index)
                .op = REQ_OP_READ,
                .op_flags = 0,
                .encrypted_page = NULL,
-               .in_list = false,
-               .retry = false,
+               .in_list = 0,
+               .retry = 0,
        };
        int err;
 
@@ -1276,8 +1276,8 @@ static int move_data_block(struct inode *inode, block_t bidx,
                .op = REQ_OP_READ,
                .op_flags = 0,
                .encrypted_page = NULL,
-               .in_list = false,
-               .retry = false,
+               .in_list = 0,
+               .retry = 0,
        };
        struct dnode_of_data dn;
        struct f2fs_summary sum;

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index c6d0e070963263bd17ad1bcffe50fdab1360de87..5db6740d3136491494a2f9a89d1977b2643995c3 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1587,7 +1587,7 @@ static int __write_node_page(struct page *page, bool atomic, bool *submitted,
                .op_flags = wbc_to_write_flags(wbc),
                .page = page,
                .encrypted_page = NULL,
-               .submitted = false,
+               .submitted = 0,
                .io_type = io_type,
                .io_wbc = wbc,
        };

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 16bf9d5c8d4f9f01c574ae463991c9416b00bca5..a3dabec1f216ac9515c3ce0e14ba4868ff3573be 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3312,10 +3312,10 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
                struct f2fs_bio_info *io;
 
                if (F2FS_IO_ALIGNED(sbi))
-                       fio->retry = false;
+                       fio->retry = 0;
 
                INIT_LIST_HEAD(&fio->list);
-               fio->in_list = true;
+               fio->in_list = 1;
                io = sbi->write_io[fio->type] + fio->temp;
                spin_lock(&io->io_lock);
                list_add_tail(&fio->list, &io->io_list);
@@ -3396,7 +3396,7 @@ void f2fs_do_write_meta_page(struct f2fs_sb_info *sbi, struct page *page,
                .new_blkaddr = page->index,
                .page = page,
                .encrypted_page = NULL,
-               .in_list = false,
+               .in_list = 0,
        };
 
        if (unlikely(page->index >= MAIN_BLKADDR(sbi)))