[v2,19/19] ext4: add first unit test for ext4_mb_new_blocks_simple in mballoc
Commit Message
Here are prepared work:
1. Include mballoc-test.c to mballoc.c to be able test static function
in mballoc.c.
2. Implement static stub to avoid read IO to disk.
3. Construct fake super_block. Only partial members are set, more members
will be set when more functions are tested.
Then unit test for ext4_mb_new_blocks_simple is added.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
fs/ext4/mballoc-test.c | 319 +++++++++++++++++++++++++++++++++++++++++
fs/ext4/mballoc.c | 4 +
2 files changed, 323 insertions(+)
create mode 100644 fs/ext4/mballoc-test.c
Comments
Hi Kemeng,
kernel test robot noticed the following build errors:
[auto build test ERROR on tytso-ext4/dev]
[also build test ERROR on next-20230412]
[cannot apply to linus/master v6.3-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
base: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
patch link: https://lore.kernel.org/r/20230412172833.2317696-20-shikemeng%40huaweicloud.com
patch subject: [PATCH v2 19/19] ext4: add first unit test for ext4_mb_new_blocks_simple in mballoc
config: hexagon-randconfig-r013-20230410 (https://download.01.org/0day-ci/archive/20230413/202304130218.GUkZVdgG-lkp@intel.com/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 2c57868e2e877f73c339796c3374ae660bb77f0d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
git checkout 3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=hexagon SHELL=/bin/bash fs/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304130218.GUkZVdgG-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from fs/ext4/mballoc.c:12:
In file included from fs/ext4/ext4_jbd2.h:16:
In file included from include/linux/jbd2.h:23:
In file included from include/linux/buffer_head.h:12:
In file included from include/linux/blk_types.h:10:
In file included from include/linux/bvec.h:10:
In file included from include/linux/highmem.h:12:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __raw_readb(PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
#define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
^
In file included from fs/ext4/mballoc.c:12:
In file included from fs/ext4/ext4_jbd2.h:16:
In file included from include/linux/jbd2.h:23:
In file included from include/linux/buffer_head.h:12:
In file included from include/linux/blk_types.h:10:
In file included from include/linux/bvec.h:10:
In file included from include/linux/highmem.h:12:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
^
In file included from fs/ext4/mballoc.c:12:
In file included from fs/ext4/ext4_jbd2.h:16:
In file included from include/linux/jbd2.h:23:
In file included from include/linux/buffer_head.h:12:
In file included from include/linux/blk_types.h:10:
In file included from include/linux/bvec.h:10:
In file included from include/linux/highmem.h:12:
In file included from include/linux/hardirq.h:11:
In file included from ./arch/hexagon/include/generated/asm/hardirq.h:1:
In file included from include/asm-generic/hardirq.h:17:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:334:
include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writeb(value, PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
__raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^
fs/ext4/mballoc.c:3752:12: warning: mixing declarations and code is incompatible with standards before C99 [-Wdeclaration-after-statement]
handle_t *handle = mc->handle;
^
In file included from fs/ext4/mballoc.c:6523:
>> fs/ext4/mballoc-test.c:107:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:115:23: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_ctx *ctx = MB_CTX(sb);
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:144:23: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_ctx *ctx = MB_CTX(sb);
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:156:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:153:1: warning: no previous prototype for function 'ext4_read_block_bitmap_nowait_stub' [-Wmissing-prototypes]
ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
^
fs/ext4/mballoc-test.c:152:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
struct buffer_head *
^
static
fs/ext4/mballoc-test.c:162:5: warning: no previous prototype for function 'ext4_wait_block_bitmap_stub' [-Wmissing-prototypes]
int ext4_wait_block_bitmap_stub(struct super_block *sb,
^
fs/ext4/mballoc-test.c:162:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int ext4_wait_block_bitmap_stub(struct super_block *sb,
^
static
fs/ext4/mballoc-test.c:173:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:169:25: warning: no previous prototype for function 'ext4_get_group_desc_stub' [-Wmissing-prototypes]
struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
^
fs/ext4/mballoc-test.c:169:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
^
static
fs/ext4/mballoc-test.c:185:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(mc->sb, group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:181:5: warning: no previous prototype for function 'ext4_mb_mark_group_bb_stub' [-Wmissing-prototypes]
int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
^
fs/ext4/mballoc-test.c:181:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
^
static
11 warnings and 6 errors generated.
vim +107 fs/ext4/mballoc-test.c
103
104 static void mb_ctx_mark_used(struct super_block *sb, ext4_group_t group,
105 unsigned int start, unsigned int len)
106 {
> 107 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, group);
108
109 mb_set_bits(grp_ctx->bitmap_bh.b_data, start, len);
110 }
111
Hi Kemeng,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tytso-ext4/dev]
[also build test WARNING on next-20230412]
[cannot apply to linus/master v6.3-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
base: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
patch link: https://lore.kernel.org/r/20230412172833.2317696-20-shikemeng%40huaweicloud.com
patch subject: [PATCH v2 19/19] ext4: add first unit test for ext4_mb_new_blocks_simple in mballoc
config: loongarch-randconfig-r004-20230409 (https://download.01.org/0day-ci/archive/20230413/202304130200.eNNpj54h-lkp@intel.com/config)
compiler: loongarch64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
git checkout 3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=loongarch olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=loongarch SHELL=/bin/bash fs/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304130200.eNNpj54h-lkp@intel.com/
All warnings (new ones prefixed by >>):
fs/ext4/mballoc.c: In function 'ext4_mb_mark_group_bb':
fs/ext4/mballoc.c:3752:9: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
3752 | handle_t *handle = mc->handle;
| ^~~~~~~~
In file included from fs/ext4/mballoc.c:6523:
fs/ext4/mballoc-test.c: At top level:
>> fs/ext4/mballoc-test.c:153:1: warning: no previous prototype for 'ext4_read_block_bitmap_nowait_stub' [-Wmissing-prototypes]
153 | ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> fs/ext4/mballoc-test.c:162:5: warning: no previous prototype for 'ext4_wait_block_bitmap_stub' [-Wmissing-prototypes]
162 | int ext4_wait_block_bitmap_stub(struct super_block *sb,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> fs/ext4/mballoc-test.c:169:25: warning: no previous prototype for 'ext4_get_group_desc_stub' [-Wmissing-prototypes]
169 | struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> fs/ext4/mballoc-test.c:181:5: warning: no previous prototype for 'ext4_mb_mark_group_bb_stub' [-Wmissing-prototypes]
181 | int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
vim +/ext4_read_block_bitmap_nowait_stub +153 fs/ext4/mballoc-test.c
151
152 struct buffer_head *
> 153 ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
154 bool ignore_locked)
155 {
156 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
157
158 get_bh(&grp_ctx->bitmap_bh);
159 return &grp_ctx->bitmap_bh;
160 }
161
> 162 int ext4_wait_block_bitmap_stub(struct super_block *sb,
163 ext4_group_t block_group,
164 struct buffer_head *bh)
165 {
166 return 0;
167 }
168
> 169 struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
170 ext4_group_t block_group,
171 struct buffer_head **bh)
172 {
173 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
174
175 if (bh != NULL)
176 *bh = &grp_ctx->gd_bh;
177
178 return &grp_ctx->desc;
179 }
180
> 181 int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
182 ext4_group_t group, ext4_grpblk_t blkoff,
183 ext4_grpblk_t len, int flags)
184 {
185 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(mc->sb, group);
186 struct buffer_head *bitmap_bh = &grp_ctx->bitmap_bh;
187
188 if (mc->state)
189 mb_set_bits(bitmap_bh->b_data, blkoff, len);
190 else
191 mb_clear_bits(bitmap_bh->b_data, blkoff, len);
192
193 return 0;
194 }
195
Hi Kemeng,
kernel test robot noticed the following build errors:
[auto build test ERROR on tytso-ext4/dev]
[also build test ERROR on next-20230412]
[cannot apply to linus/master v6.3-rc6]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
base: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git dev
patch link: https://lore.kernel.org/r/20230412172833.2317696-20-shikemeng%40huaweicloud.com
patch subject: [PATCH v2 19/19] ext4: add first unit test for ext4_mb_new_blocks_simple in mballoc
config: powerpc-randconfig-r006-20230409 (https://download.01.org/0day-ci/archive/20230413/202304130309.erdFVvYL-lkp@intel.com/config)
compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 2c57868e2e877f73c339796c3374ae660bb77f0d)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install powerpc cross compiling tool for clang build
# apt-get install binutils-powerpc-linux-gnu
# https://github.com/intel-lab-lkp/linux/commit/3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Kemeng-Shi/ext4-fix-wrong-unit-use-in-ext4_mb_normalize_request/20230412-172757
git checkout 3ceb1daf83fdf578c28ede1a10e55f05ef7642d5
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=powerpc olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash fs/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Link: https://lore.kernel.org/oe-kbuild-all/202304130309.erdFVvYL-lkp@intel.com/
All error/warnings (new ones prefixed by >>):
fs/ext4/mballoc.c:3752:12: warning: mixing declarations and code is incompatible with standards before C99 [-Wdeclaration-after-statement]
handle_t *handle = mc->handle;
^
In file included from fs/ext4/mballoc.c:6523:
>> fs/ext4/mballoc-test.c:107:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:115:23: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_ctx *ctx = MB_CTX(sb);
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:144:23: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_ctx *ctx = MB_CTX(sb);
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
fs/ext4/mballoc-test.c:156:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
>> fs/ext4/mballoc-test.c:153:1: warning: no previous prototype for function 'ext4_read_block_bitmap_nowait_stub' [-Wmissing-prototypes]
ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
^
fs/ext4/mballoc-test.c:152:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
struct buffer_head *
^
static
>> fs/ext4/mballoc-test.c:162:5: warning: no previous prototype for function 'ext4_wait_block_bitmap_stub' [-Wmissing-prototypes]
int ext4_wait_block_bitmap_stub(struct super_block *sb,
^
fs/ext4/mballoc-test.c:162:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int ext4_wait_block_bitmap_stub(struct super_block *sb,
^
static
fs/ext4/mballoc-test.c:173:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
>> fs/ext4/mballoc-test.c:169:25: warning: no previous prototype for function 'ext4_get_group_desc_stub' [-Wmissing-prototypes]
struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
^
fs/ext4/mballoc-test.c:169:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
^
static
fs/ext4/mballoc-test.c:185:31: error: casting from randomized structure pointer type 'struct super_block *' to 'struct mb_ctx *'
struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(mc->sb, group);
^
fs/ext4/mballoc-test.c:23:33: note: expanded from macro 'MB_GRP_CTX'
#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
^
fs/ext4/mballoc-test.c:22:21: note: expanded from macro 'MB_CTX'
#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
^
>> fs/ext4/mballoc-test.c:181:5: warning: no previous prototype for function 'ext4_mb_mark_group_bb_stub' [-Wmissing-prototypes]
int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
^
fs/ext4/mballoc-test.c:181:1: note: declare 'static' if the function is not intended to be used outside of this translation unit
int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
^
static
5 warnings and 6 errors generated.
vim +107 fs/ext4/mballoc-test.c
103
104 static void mb_ctx_mark_used(struct super_block *sb, ext4_group_t group,
105 unsigned int start, unsigned int len)
106 {
> 107 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, group);
108
109 mb_set_bits(grp_ctx->bitmap_bh.b_data, start, len);
110 }
111
112 /* called after init_sb_layout */
113 static int mb_ctx_init(struct super_block *sb)
114 {
115 struct mb_ctx *ctx = MB_CTX(sb);
116 ext4_group_t i, ngroups = ext4_get_groups_count(sb);
117
118 ctx->grp_ctx = kcalloc(ngroups, sizeof(struct mb_grp_ctx),
119 GFP_KERNEL);
120 if (ctx->grp_ctx == NULL)
121 return -ENOMEM;
122
123 for (i = 0; i < ngroups; i++)
124 if (mb_grp_ctx_init(sb, &ctx->grp_ctx[i]))
125 goto out;
126
127 /*
128 * first data block(first cluster in first group) is used by
129 * metadata, mark it used to avoid to alloc data block at first
130 * block which will fail ext4_sb_block_valid check.
131 */
132 mb_set_bits(ctx->grp_ctx[0].bitmap_bh.b_data, 0, 1);
133
134 return 0;
135 out:
136 while (i-- > 0)
137 mb_grp_ctx_release(&ctx->grp_ctx[i]);
138 kfree(ctx->grp_ctx);
139 return -ENOMEM;
140 }
141
142 static void mb_ctx_release(struct super_block *sb)
143 {
144 struct mb_ctx *ctx = MB_CTX(sb);
145 ext4_group_t i, ngroups = ext4_get_groups_count(sb);
146
147 for (i = 0; i < ngroups; i++)
148 mb_grp_ctx_release(&ctx->grp_ctx[i]);
149 kfree(ctx->grp_ctx);
150 }
151
152 struct buffer_head *
> 153 ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
154 bool ignore_locked)
155 {
156 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
157
158 get_bh(&grp_ctx->bitmap_bh);
159 return &grp_ctx->bitmap_bh;
160 }
161
> 162 int ext4_wait_block_bitmap_stub(struct super_block *sb,
163 ext4_group_t block_group,
164 struct buffer_head *bh)
165 {
166 return 0;
167 }
168
> 169 struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
170 ext4_group_t block_group,
171 struct buffer_head **bh)
172 {
173 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
174
175 if (bh != NULL)
176 *bh = &grp_ctx->gd_bh;
177
178 return &grp_ctx->desc;
179 }
180
> 181 int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
182 ext4_group_t group, ext4_grpblk_t blkoff,
183 ext4_grpblk_t len, int flags)
184 {
185 struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(mc->sb, group);
186 struct buffer_head *bitmap_bh = &grp_ctx->bitmap_bh;
187
188 if (mc->state)
189 mb_set_bits(bitmap_bh->b_data, blkoff, len);
190 else
191 mb_clear_bits(bitmap_bh->b_data, blkoff, len);
192
193 return 0;
194 }
195
new file mode 100644
@@ -0,0 +1,319 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * KUnit test of ext4 multiblocks allocation.
+ */
+
+#include <kunit/test.h>
+#include <kunit/static_stub.h>
+
+#include "ext4.h"
+
+struct mb_grp_ctx {
+ struct buffer_head bitmap_bh;
+ struct ext4_group_desc desc;
+ /* one group descriptor for each group descriptor for simplicity */
+ struct buffer_head gd_bh;
+};
+
+struct mb_ctx {
+ struct mb_grp_ctx *grp_ctx;
+};
+
+#define MB_CTX(sb) ((struct mb_ctx *)((struct super_block *)sb + 1))
+#define MB_GRP_CTX(sb, group) (&MB_CTX(sb)->grp_ctx[group])
+
+static struct super_block *alloc_fake_super_block(void)
+{
+ struct ext4_super_block *es = kzalloc(sizeof(*es), GFP_KERNEL);
+ struct ext4_sb_info *sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
+ struct super_block *sb = kzalloc(sizeof(*sb) +
+ sizeof(struct mb_ctx),
+ GFP_KERNEL);
+
+ if (sb == NULL || sbi == NULL || es == NULL)
+ goto out;
+
+ sbi->s_es = es;
+ sb->s_fs_info = sbi;
+ return sb;
+
+out:
+ kfree(sb);
+ kfree(sbi);
+ kfree(es);
+ return NULL;
+}
+
+static void free_fake_super_block(struct super_block *sb)
+{
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+ kfree(sbi->s_es);
+ kfree(sbi);
+ kfree(sb);
+}
+
+struct ext4_block_layout {
+ unsigned char blocksize_bits;
+ unsigned int cluster_bits;
+ unsigned long blocks_per_group;
+ ext4_group_t group_count;
+ unsigned long desc_size;
+};
+
+static void init_sb_layout(struct super_block *sb,
+ struct ext4_block_layout *layout)
+{
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+ struct ext4_super_block *es = sbi->s_es;
+
+ sb->s_blocksize = 1UL << layout->blocksize_bits;
+ sb->s_blocksize_bits = layout->blocksize_bits;
+
+ sbi->s_groups_count = layout->group_count;
+ sbi->s_blocks_per_group = layout->blocks_per_group;
+ sbi->s_cluster_bits = layout->cluster_bits;
+ sbi->s_cluster_ratio = 1U << layout->cluster_bits;
+ sbi->s_clusters_per_group = layout->blocks_per_group >>
+ layout->cluster_bits;
+ sbi->s_desc_size = layout->desc_size;
+
+ es->s_first_data_block = cpu_to_le32(0);
+ es->s_blocks_count_lo = cpu_to_le32(layout->blocks_per_group *
+ layout->group_count);
+}
+
+static int mb_grp_ctx_init(struct super_block *sb,
+ struct mb_grp_ctx *grp_ctx)
+{
+ grp_ctx->bitmap_bh.b_data = kzalloc(EXT4_BLOCK_SIZE(sb), GFP_KERNEL);
+ if (grp_ctx->bitmap_bh.b_data == NULL)
+ return -ENOMEM;
+
+ get_bh(&grp_ctx->bitmap_bh);
+ get_bh(&grp_ctx->gd_bh);
+ return 0;
+}
+
+static void mb_grp_ctx_release(struct mb_grp_ctx *grp_ctx)
+{
+ kfree(grp_ctx->bitmap_bh.b_data);
+ grp_ctx->bitmap_bh.b_data = NULL;
+}
+
+static void mb_ctx_mark_used(struct super_block *sb, ext4_group_t group,
+ unsigned int start, unsigned int len)
+{
+ struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, group);
+
+ mb_set_bits(grp_ctx->bitmap_bh.b_data, start, len);
+}
+
+/* called after init_sb_layout */
+static int mb_ctx_init(struct super_block *sb)
+{
+ struct mb_ctx *ctx = MB_CTX(sb);
+ ext4_group_t i, ngroups = ext4_get_groups_count(sb);
+
+ ctx->grp_ctx = kcalloc(ngroups, sizeof(struct mb_grp_ctx),
+ GFP_KERNEL);
+ if (ctx->grp_ctx == NULL)
+ return -ENOMEM;
+
+ for (i = 0; i < ngroups; i++)
+ if (mb_grp_ctx_init(sb, &ctx->grp_ctx[i]))
+ goto out;
+
+ /*
+ * first data block(first cluster in first group) is used by
+ * metadata, mark it used to avoid to alloc data block at first
+ * block which will fail ext4_sb_block_valid check.
+ */
+ mb_set_bits(ctx->grp_ctx[0].bitmap_bh.b_data, 0, 1);
+
+ return 0;
+out:
+ while (i-- > 0)
+ mb_grp_ctx_release(&ctx->grp_ctx[i]);
+ kfree(ctx->grp_ctx);
+ return -ENOMEM;
+}
+
+static void mb_ctx_release(struct super_block *sb)
+{
+ struct mb_ctx *ctx = MB_CTX(sb);
+ ext4_group_t i, ngroups = ext4_get_groups_count(sb);
+
+ for (i = 0; i < ngroups; i++)
+ mb_grp_ctx_release(&ctx->grp_ctx[i]);
+ kfree(ctx->grp_ctx);
+}
+
+struct buffer_head *
+ext4_read_block_bitmap_nowait_stub(struct super_block *sb, ext4_group_t block_group,
+ bool ignore_locked)
+{
+ struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
+
+ get_bh(&grp_ctx->bitmap_bh);
+ return &grp_ctx->bitmap_bh;
+}
+
+int ext4_wait_block_bitmap_stub(struct super_block *sb,
+ ext4_group_t block_group,
+ struct buffer_head *bh)
+{
+ return 0;
+}
+
+struct ext4_group_desc *ext4_get_group_desc_stub(struct super_block *sb,
+ ext4_group_t block_group,
+ struct buffer_head **bh)
+{
+ struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(sb, block_group);
+
+ if (bh != NULL)
+ *bh = &grp_ctx->gd_bh;
+
+ return &grp_ctx->desc;
+}
+
+int ext4_mb_mark_group_bb_stub(struct ext4_mark_context *mc,
+ ext4_group_t group, ext4_grpblk_t blkoff,
+ ext4_grpblk_t len, int flags)
+{
+ struct mb_grp_ctx *grp_ctx = MB_GRP_CTX(mc->sb, group);
+ struct buffer_head *bitmap_bh = &grp_ctx->bitmap_bh;
+
+ if (mc->state)
+ mb_set_bits(bitmap_bh->b_data, blkoff, len);
+ else
+ mb_clear_bits(bitmap_bh->b_data, blkoff, len);
+
+ return 0;
+}
+
+#define TEST_BLOCKSIZE_BITS 10
+#define TEST_CLUSTER_BITS 3
+#define TEST_BLOCKS_PER_GROUP 8192
+#define TEST_GROUP_COUNT 4
+#define TEST_DESC_SIZE 64
+#define TEST_GOAL_GROUP 1
+static int mballoc_test_init(struct kunit *test)
+{
+ struct ext4_block_layout layout = {
+ .blocksize_bits = TEST_BLOCKSIZE_BITS,
+ .cluster_bits = TEST_CLUSTER_BITS,
+ .blocks_per_group = TEST_BLOCKS_PER_GROUP,
+ .group_count = TEST_GROUP_COUNT,
+ .desc_size = TEST_DESC_SIZE,
+ };
+ struct super_block *sb;
+ int ret;
+
+ sb = alloc_fake_super_block();
+ if (sb == NULL)
+ return -ENOMEM;
+
+ init_sb_layout(sb, &layout);
+
+ ret = mb_ctx_init(sb);
+ if (ret != 0) {
+ free_fake_super_block(sb);
+ return ret;
+ }
+
+ test->priv = sb;
+ kunit_activate_static_stub(test,
+ ext4_read_block_bitmap_nowait,
+ ext4_read_block_bitmap_nowait_stub);
+ kunit_activate_static_stub(test,
+ ext4_wait_block_bitmap,
+ ext4_wait_block_bitmap_stub);
+ kunit_activate_static_stub(test,
+ ext4_get_group_desc,
+ ext4_get_group_desc_stub);
+ kunit_activate_static_stub(test,
+ ext4_mb_mark_group_bb,
+ ext4_mb_mark_group_bb_stub);
+ return 0;
+}
+
+static void mballoc_test_exit(struct kunit *test)
+{
+ struct super_block *sb = (struct super_block *)test->priv;
+
+ mb_ctx_release(sb);
+ free_fake_super_block(sb);
+}
+
+static void test_new_blocks_simple(struct kunit *test)
+{
+ struct super_block *sb = (struct super_block *)test->priv;
+ struct inode inode = { .i_sb = sb, };
+ struct ext4_allocation_request ar;
+ ext4_group_t i, goal_group = TEST_GOAL_GROUP;
+ int err = 0;
+ ext4_fsblk_t found;
+ struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+ ar.inode = &inode;
+
+ /* get block at goal */
+ ar.goal = ext4_group_first_block_no(sb, goal_group);
+ found = ext4_mb_new_blocks_simple(&ar, &err);
+ KUNIT_ASSERT_EQ_MSG(test, ar.goal, found,
+ "failed to alloc block at goal, expected %llu found %llu",
+ ar.goal, found);
+
+ /* get block after goal in goal group */
+ ar.goal = ext4_group_first_block_no(sb, goal_group);
+ found = ext4_mb_new_blocks_simple(&ar, &err);
+ KUNIT_ASSERT_EQ_MSG(test, ar.goal + EXT4_C2B(sbi, 1), found,
+ "failed to alloc block after goal in goal group, expected %llu found %llu",
+ ar.goal + 1, found);
+
+ /* get block after goal group */
+ mb_ctx_mark_used(sb, goal_group, 0, EXT4_CLUSTERS_PER_GROUP(sb));
+ ar.goal = ext4_group_first_block_no(sb, goal_group);
+ found = ext4_mb_new_blocks_simple(&ar, &err);
+ KUNIT_ASSERT_EQ_MSG(test,
+ ext4_group_first_block_no(sb, goal_group + 1), found,
+ "failed to alloc block after goal group, expected %llu found %llu",
+ ext4_group_first_block_no(sb, goal_group + 1), found);
+
+ /* get block before goal group */
+ for (i = goal_group; i < ext4_get_groups_count(sb); i++)
+ mb_ctx_mark_used(sb, i, 0, EXT4_CLUSTERS_PER_GROUP(sb));
+ ar.goal = ext4_group_first_block_no(sb, goal_group);
+ found = ext4_mb_new_blocks_simple(&ar, &err);
+ KUNIT_ASSERT_EQ_MSG(test,
+ ext4_group_first_block_no(sb, 0) + EXT4_C2B(sbi, 1), found,
+ "failed to alloc block before goal group, expected %llu found %llu",
+ ext4_group_first_block_no(sb, 0 + EXT4_C2B(sbi, 1)), found);
+
+ /* no block available, fail to allocate block */
+ for (i = 0; i < ext4_get_groups_count(sb); i++)
+ mb_ctx_mark_used(sb, i, 0, EXT4_CLUSTERS_PER_GROUP(sb));
+ ar.goal = ext4_group_first_block_no(sb, goal_group);
+ found = ext4_mb_new_blocks_simple(&ar, &err);
+ KUNIT_ASSERT_NE_MSG(test, err, 0,
+ "unexpectedly get block when no block is available");
+}
+
+
+static struct kunit_case ext4_mballoc_test_cases[] = {
+ KUNIT_CASE(test_new_blocks_simple),
+ {}
+};
+
+static struct kunit_suite ext4_mballoc_test_suite = {
+ .name = "ext4_mballoc_test",
+ .init = mballoc_test_init,
+ .exit = mballoc_test_exit,
+ .test_cases = ext4_mballoc_test_cases,
+};
+
+kunit_test_suites(&ext4_mballoc_test_suite);
+
+MODULE_LICENSE("GPL v2");
@@ -6518,3 +6518,7 @@ ext4_mballoc_query_range(
return error;
}
+
+#ifdef CONFIG_EXT4_KUNIT_TESTS
+#include "mballoc-test.c"
+#endif