2023-07-24 14:02:09

by Jason Yan

[permalink] [raw]
Subject: Re: [PATCH v5 7/8] ext4: add some kunit stub for mballoc kunit test

On 2023/6/29 22:40, Kemeng Shi wrote:
> 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_group_bb to avoid real IO to disk.
>
> Signed-off-by: Kemeng Shi <[email protected]>
> ---
> fs/ext4/balloc.c | 16 ++++++++++++++++
> fs/ext4/mballoc.c | 6 ++++++
> 2 files changed, 22 insertions(+)
>
> diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
> index 1f72f977c6db..d39655fb2f53 100644
> --- a/fs/ext4/balloc.c
> +++ b/fs/ext4/balloc.c
> @@ -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);
> @@ -274,6 +275,11 @@ 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;
>
> +#ifdef CONFIG_EXT4_KUNIT_TESTS
> + KUNIT_STATIC_STUB_REDIRECT(ext4_get_group_desc,
> + sb, block_group, bh);
> +#endif

Hi Kemeng,

I'm not a fan of adding "#ifdef" blocks in functions everywhere. The
right thing to do is to put these "#ifdef" blocks in header files and to
make the macro or functions empty if you want to make these codes
conditionally-compiled out.

The standard usage in kernel looks like:

In the header file: "a.h"

#ifdef CONFIG_XXXX
void foo(struct sas_task *task);
#else
static inline void foo(struct sas_task *task)
{
}
#endif

or

#ifdef CONFIG_XXXX
#define foo() do_something()
#else
#define foo()
#endif

And in the c file: "a.c"

#include "a.h"

void bar(void)
{
foo();
something_else();
}

Please refer to:
https://docs.kernel.org/process/4.Coding.html?#ifdef-and-preprocessor-use-in-general

Thanks,
Jason