Commit bdefd689 authored by Kemeng Shi's avatar Kemeng Shi Committed by Theodore Ts'o
Browse files

ext4: add some kunit stub for mballoc kunit test 



Multiblocks allocation will read and write block bitmap and group
descriptor which reside on disk. Add kunit stub to function
ext4_get_group_desc, ext4_read_block_bitmap_nowait, ext4_wait_block_bitmap
and ext4_mb_mark_context to avoid real IO to disk.

Signed-off-by: default avatarKemeng Shi <shikemeng@huaweicloud.com>
Reviewed-by: default avatar"Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Link: https://lore.kernel.org/r/20230928160407.142069-11-shikemeng@huaweicloud.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 5c657db4

fs/ext4/balloc.c

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "mballoc.h"



#include <trace/events/ext4.h>

#include <kunit/static_stub.h>



static unsigned ext4_num_base_meta_clusters(struct super_block *sb,

					    ext4_group_t block_group);
@@ -272,6 +273,9 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct buffer_head *bh_p;



	KUNIT_STATIC_STUB_REDIRECT(ext4_get_group_desc,

				   sb, block_group, bh);



	if (block_group >= ngroups) {

		ext4_error(sb, "block_group >= groups_count - block_group = %u,"

			   " groups_count = %u", block_group, ngroups);
@@ -466,6 +470,9 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group, 
	ext4_fsblk_t bitmap_blk;

	int err;



	KUNIT_STATIC_STUB_REDIRECT(ext4_read_block_bitmap_nowait,

				   sb, block_group, ignore_locked);



	desc = ext4_get_group_desc(sb, block_group, NULL);

	if (!desc)

		return ERR_PTR(-EFSCORRUPTED);
@@ -561,6 +568,9 @@ int ext4_wait_block_bitmap(struct super_block *sb, ext4_group_t block_group, 
{

	struct ext4_group_desc *desc;



	KUNIT_STATIC_STUB_REDIRECT(ext4_wait_block_bitmap,

				   sb, block_group, bh);



	if (!buffer_new(bh))

		return 0;

	desc = ext4_get_group_desc(sb, block_group, NULL);

fs/ext4/mballoc.c

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/backing-dev.h>

#include <linux/freezer.h>

#include <trace/events/ext4.h>

#include <kunit/static_stub.h>



/*

 * MUSTDO:
@@ -3957,6 +3958,10 @@ ext4_mb_mark_context(handle_t *handle, struct super_block *sb, bool state, 
	int err;

	unsigned int i, already, changed = len;



	KUNIT_STATIC_STUB_REDIRECT(ext4_mb_mark_context,

				   handle, sb, state, group, blkoff, len,

				   flags, ret_changed);



	if (ret_changed)

		*ret_changed = 0;

	bitmap_bh = ext4_read_block_bitmap(sb, group);