f2fs: remove power-of-two limitation fo zoned device
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: remove power-of-two limitation fo zoned device
In f2fs, there's no reason to force po2.
--- fs/f2fs/f2fs.h | 3 +-- fs/f2fs/gc.c | 2 +- fs/f2fs/segment.c | 2 +- fs/f2fs/super.c | 7 +------ 4 files changed, 4 insertions(+), 10 deletions(-)
fs/f2fs/f2fs.h +1 -2
@@ -1523,7 +1523,6 @@ struct f2fs_sb_info {#ifdef CONFIG_BLK_DEV_ZONED unsigned int blocks_per_blkz;/* F2FS blocks per zone */ -unsigned int log_blocks_per_blkz;/* log2 F2FS blocks per zone */ #endif /* for node-related operations */
@@ -4377,7 +4376,7 @@ F2FS_FEATURE_FUNCS(readonly, RO);static inline bool f2fs_blkz_is_seq (struct f2fs_sb_info *sbi,int devi,block_t blkaddr) { -unsigned int zno = blkaddr >> sbi->log_blocks_per_blkz; +unsigned int zno = blkaddr / sbi->blocks_per_blkz;return test_bit (zno,FDEV (devi).blkz_seq); }
fs/f2fs/gc.c +1 -1
@@ -2094,7 +2094,7 @@ static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs) (long long )FDEV (last_dev).end_blk + blks;#ifdef CONFIG_BLK_DEV_ZONED FDEV (last_dev).nr_blkz = (int )FDEV (last_dev).nr_blkz + - (int )(blks >> sbi->log_blocks_per_blkz); + (int )(blks / sbi->blocks_per_blkz);#endif } }
fs/f2fs/segment.c +1 -1
@@ -2075,7 +2075,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,if (force && start >= cpc->trim_start && (end -1 ) <= cpc->trim_end) -continue ; +continue ;/* Should cover 2MB zoned device for zone-based reset */ if (!f2fs_sb_has_blkzoned(sbi) &&
fs/f2fs/super.c +1 -6
@@ -3806,12 +3806,7 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi) SECTOR_TO_BLOCK(zone_sectors))return -EINVAL ; sbi->blocks_per_blkz =SECTOR_TO_BLOCK (zone_sectors); -if (sbi->log_blocks_per_blkz && sbi->log_blocks_per_blkz != -__ilog2_u32 (sbi->blocks_per_blkz)) -return -EINVAL ; - sbi->log_blocks_per_blkz =__ilog2_u32 (sbi->blocks_per_blkz); -FDEV (devi).nr_blkz =SECTOR_TO_BLOCK (nr_sectors) >> - sbi->log_blocks_per_blkz; +FDEV (devi).nr_blkz =SECTOR_TO_BLOCK (nr_sectors) / sbi->blocks_per_blkz;if (nr_sectors & (zone_sectors -1 ))FDEV (devi).nr_blkz++;
Signature · 1 line
2.40.0.634.g4ca3ef3211-goog
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Jaegeuk,
kernel test robot noticed the following build errors:
[auto build test ERROR on jaegeuk-f2fs/dev-test]
[also build test ERROR on jaegeuk-f2fs/dev next-20230417] [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/Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test patch link: https://lore.kernel.org/r/20230418004049.3262659-1-jaegeuk%40kernel.org patch subject: [PATCH] f2fs: remove power-of-two limitation fo zoned device config: m68k-randconfig-r015-20230416 (https://download.01.org/0day-ci/archive/20230418/[email protected]/config) compiler: m68k-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/50158b3d258eb40eb81f3460d91c71126c08cdb8
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 git checkout 50158b3d258eb40eb81f3460d91c71126c08cdb8
# 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=m68k olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
m68k-linux-ld: fs/f2fs/super.o: in function `init_blkz_info':
>> super.c:(.text+0x1b1e): undefined reference to `__udivdi3' m68k-linux-ld: fs/f2fs/gc.o: in function `update_fs_metadata': >> gc.c:(.text+0x2ae): undefined reference to `__divdi3'
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Jaegeuk,
kernel test robot noticed the following build errors:
[auto build test ERROR on jaegeuk-f2fs/dev-test]
[also build test ERROR on jaegeuk-f2fs/dev next-20230417] [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/Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test patch link: https://lore.kernel.org/r/20230418004049.3262659-1-jaegeuk%40kernel.org patch subject: [PATCH] f2fs: remove power-of-two limitation fo zoned device config: arm-randconfig-r022-20230416 (https://download.01.org/0day-ci/archive/20230418/[email protected]/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project 9638da200e00bd069e6dd63604e14cbafede9324)
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 arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/intel-lab-lkp/linux/commit/50158b3d258eb40eb81f3460d91c71126c08cdb8
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 git checkout 50158b3d258eb40eb81f3460d91c71126c08cdb8
# 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=arm olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> ld.lld: error: undefined symbol: __aeabi_ldivmod >>> referenced by gc.c:2097 (fs/f2fs/gc.c:2097) >>> fs/f2fs/gc.o:(update_fs_metadata) in archive vmlinux.a >>> did you mean: __aeabi_idivmod >>> defined in: arch/arm/lib/lib.a(lib1funcs.o)
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Jaegeuk,
kernel test robot noticed the following build errors:
[auto build test ERROR on jaegeuk-f2fs/dev-test]
[also build test ERROR on jaegeuk-f2fs/dev next-20230417] [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/Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test patch link: https://lore.kernel.org/r/20230418004049.3262659-1-jaegeuk%40kernel.org patch subject: [PATCH] f2fs: remove power-of-two limitation fo zoned device config: i386-debian-10.3-kunit (https://download.01.org/0day-ci/archive/20230418/[email protected]/config) compiler: gcc-11 (Debian 11.3.0-8) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/50158b3d258eb40eb81f3460d91c71126c08cdb8
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Jaegeuk-Kim/f2fs-remove-power-of-two-limitation-fo-zoned-device/20230418-084241 git checkout 50158b3d258eb40eb81f3460d91c71126c08cdb8
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=i386 olddefconfig
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "__divdi3" [fs/f2fs/f2fs.ko] undefined! >> ERROR: modpost: "__udivdi3" [fs/f2fs/f2fs.ko] undefined!
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Jaegeuk Kim
maintainerIn f2fs, there's no reason to force po2.
---
Change log from v1:
- fix udiv
fs/f2fs/f2fs.h | 3 +-- fs/f2fs/gc.c | 4 ++-- fs/f2fs/segment.c | 2 +- fs/f2fs/super.c | 8 ++------ 4 files changed, 6 insertions(+), 11 deletions(-)
fs/f2fs/f2fs.h +1 -2
@@ -1523,7 +1523,6 @@ struct f2fs_sb_info {#ifdef CONFIG_BLK_DEV_ZONED unsigned int blocks_per_blkz;/* F2FS blocks per zone */ -unsigned int log_blocks_per_blkz;/* log2 F2FS blocks per zone */ #endif /* for node-related operations */
@@ -4377,7 +4376,7 @@ F2FS_FEATURE_FUNCS(readonly, RO);static inline bool f2fs_blkz_is_seq (struct f2fs_sb_info *sbi,int devi,block_t blkaddr) { -unsigned int zno = blkaddr >> sbi->log_blocks_per_blkz; +unsigned int zno = blkaddr / sbi->blocks_per_blkz;return test_bit (zno,FDEV (devi).blkz_seq); }
fs/f2fs/gc.c +2 -2
@@ -2093,8 +2093,8 @@ static void update_fs_metadata(struct f2fs_sb_info *sbi, int secs)FDEV (last_dev).end_blk = (long long )FDEV (last_dev).end_blk + blks;#ifdef CONFIG_BLK_DEV_ZONED -FDEV (last_dev).nr_blkz = (int )FDEV (last_dev).nr_blkz + - (int )(blks >> sbi->log_blocks_per_blkz); +FDEV (last_dev).nr_blkz =FDEV (last_dev).nr_blkz + +div_u64 (blks, sbi->blocks_per_blkz);#endif } }
fs/f2fs/segment.c +1 -1
@@ -2075,7 +2075,7 @@ void f2fs_clear_prefree_segments(struct f2fs_sb_info *sbi,if (force && start >= cpc->trim_start && (end -1 ) <= cpc->trim_end) -continue ; +continue ;/* Should cover 2MB zoned device for zone-based reset */ if (!f2fs_sb_has_blkzoned(sbi) &&
fs/f2fs/super.c +2 -6
@@ -3806,12 +3806,8 @@ static int init_blkz_info(struct f2fs_sb_info *sbi, int devi) SECTOR_TO_BLOCK(zone_sectors))return -EINVAL ; sbi->blocks_per_blkz =SECTOR_TO_BLOCK (zone_sectors); -if (sbi->log_blocks_per_blkz && sbi->log_blocks_per_blkz != -__ilog2_u32 (sbi->blocks_per_blkz)) -return -EINVAL ; - sbi->log_blocks_per_blkz =__ilog2_u32 (sbi->blocks_per_blkz); -FDEV (devi).nr_blkz =SECTOR_TO_BLOCK (nr_sectors) >> - sbi->log_blocks_per_blkz; +FDEV (devi).nr_blkz =div_u64 (SECTOR_TO_BLOCK (nr_sectors), + sbi->blocks_per_blkz);if (nr_sectors & (zone_sectors -1 ))FDEV (devi).nr_blkz++;
Signature · 8 lines
2.40.0.634.g4ca3ef3211-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 3 lines · Jaegeuk Kim
In f2fs, there's no reason to force po2.
Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,