misc: deduplicate log2/log10 functions
PATCH 1/2 misc: deduplicate log2/log10 functions
Remove duplicate log2() and log10() functions and replace them with a single pair of functions ext2fs_log2() and ext2fs_log10().
Reviewed-on: https://review.whamcloud.com/52385
--- debugfs/debugfs.c | 16 ++-------------- debugfs/filefrag.c | 18 +++--------------- lib/ext2fs/ext2fs.h | 24 ++++++++++++++++++++++++ lib/ext2fs/extent.c | 17 +++-------------- misc/e2freefrag.c | 20 ++++---------------- misc/e4crypt.c | 14 +------------- misc/filefrag.c | 32 ++++---------------------------- misc/mk_hugefiles.c | 2 +- misc/mke2fs.c | 33 ++++++--------------------------- misc/mke2fs.h | 1 - 10 files changed, 48 insertions(+), 129 deletions(-)
debugfs/debugfs.c +2 -14
@@ -653,18 +653,6 @@ static void dump_blocks(FILE *f, const char *prefix, ext2_ino_t inode)fprintf (f,"\n" ); } -static int int_log10 (unsigned long long arg) -{ -int l =0 ; - - arg = arg /10 ; -while (arg) { - l++; - arg = arg /10 ; - } -return l; -} -#define DUMP_LEAF_EXTENTS 0x01#define DUMP_NODE_EXTENTS 0x02#define DUMP_EXTENT_TABLE 0x04
@@ -1076,11 +1064,11 @@ void do_dump_extents(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused))return ; } - logical_width =int_log10 ((EXT2_I_SIZE (&inode)+current_fs->blocksize-1 )/ + logical_width =ext2fs_log10 ((EXT2_I_SIZE (&inode)+current_fs->blocksize-1 )/ current_fs->blocksize) +1 ;if (logical_width <5 ) logical_width =5 ; - physical_width =int_log10 (ext2fs_blocks_count (current_fs->super)) +1 ; + physical_width =ext2fs_log10 (ext2fs_blocks_count (current_fs->super)) +1 ;if (physical_width <5 ) physical_width =5 ;
debugfs/filefrag.c +3 -15
@@ -54,18 +54,6 @@ struct filefrag_struct {struct dir_list *dir_list, *dir_last; }; -static int int_log10 (unsigned long long arg) -{ -int l =0 ; - - arg = arg /10 ; -while (arg) { - l++; - arg = arg /10 ; - } -return l; -} -static void print_header (struct filefrag_struct *fs) {if (fs->options &VERBOSE_OPT ) {
@@ -135,8 +123,8 @@ static void filefrag(ext2_ino_t ino, struct ext2_inode *inode,errcode_t retval;int blocksize = current_fs->blocksize; - fs->logical_width =int_log10 ((EXT2_I_SIZE (inode) + blocksize -1 ) / - blocksize) +1 ; + fs->logical_width =ext2fs_log10 ((EXT2_I_SIZE (inode) + blocksize -1 ) / + blocksize) +1 ;if (fs->logical_width <7 ) fs->logical_width =7 ; fs->ext =0 ;
@@ -313,7 +301,7 @@ void do_filefrag(int argc, ss_argv_t argv, int sci_idx EXT2FS_ATTR((unused)),return ; fs.f =open_pager (); - fs.physical_width =int_log10 (ext2fs_blocks_count (current_fs->super)); + fs.physical_width =ext2fs_log10 (ext2fs_blocks_count (current_fs->super)); fs.physical_width++;if (fs.physical_width <8 ) fs.physical_width =8 ;
lib/ext2fs/ext2fs.h +24 -0
@@ -2226,6 +2226,30 @@ _INLINE_ int ext2fs_htree_intnode_maxrecs(ext2_filsys fs, int blocks) sizeof(struct ext2_dx_entry)); } +_INLINE_ int ext2fs_log2(unsigned long long arg) +{ +int l =0 ; + + arg >>=1 ; +while (arg) { + l++; + arg >>=1 ; + } +return l; +} + +_INLINE_ int ext2fs_log10(unsigned long long arg) +{ +int l =0 ; + + arg /=10 ; +while (arg) { + l++; + arg /=10 ; + } +return l; +} +/* * This is an efficient, overflow safe way of calculating ceil((1.0 * a) / b) */
lib/ext2fs/extent.c +3 -14
@@ -1720,18 +1720,6 @@ errcode_t ext2fs_extent_get_info(ext2_extent_handle_t handle,return 0 ; } -static int ul_log2 (unsigned long arg) -{ -int l =0 ; - - arg >>=1 ; -while (arg) { - l++; - arg >>=1 ; - } -return l; -} -size_t ext2fs_max_extent_depth (ext2_extent_handle_t handle) {size_t iblock_sz =sizeof (((struct ext2_inode *)NULL )->i_block);
@@ -1746,8 +1734,9 @@ size_t ext2fs_max_extent_depth(ext2_extent_handle_t handle)if (last_blocksize && last_blocksize == handle->fs->blocksize)return last_result; - last_result =1 + ((ul_log2 (EXT_MAX_EXTENT_LBLK ) -ul_log2 (iblock_extents)) / -ul_log2 (extents_per_block)); + last_result =1 + ((ext2fs_log2 (EXT_MAX_EXTENT_LBLK ) - +ext2fs_log2 (iblock_extents)) / +ext2fs_log2 (extents_per_block)); last_blocksize = handle->fs->blocksize;return last_result; }
misc/e2freefrag.c +4 -16
@@ -57,28 +57,16 @@ static void usage(const char *prog)#endif } -static int ul_log2 (unsigned long arg) -{ -int l =0 ; - - arg >>=1 ; -while (arg) { - l++; - arg >>=1 ; - } -return l; -} -static void init_chunk_info (ext2_filsys fs,struct chunk_info *info) {int i; - info->blocksize_bits =ul_log2 ((unsigned long )fs->blocksize); + info->blocksize_bits =ext2fs_log2 (fs->blocksize);if (info->chunkbytes) { - info->chunkbits =ul_log2 (info->chunkbytes); + info->chunkbits =ext2fs_log2 (info->chunkbytes); info->blks_in_chunk = info->chunkbytes >> info->blocksize_bits; }else { - info->chunkbits =ul_log2 (DEFAULT_CHUNKSIZE ); + info->chunkbits =ext2fs_log2 (DEFAULT_CHUNKSIZE ); info->blks_in_chunk =DEFAULT_CHUNKSIZE >> info->blocksize_bits; }
@@ -97,7 +85,7 @@ static void update_chunk_stats(struct chunk_info *info, {unsigned long idx; - idx =ul_log2 (chunk_size) +1 ; + idx =ext2fs_log2 (chunk_size) +1 ;if (idx >=MAX_HIST ) idx =MAX_HIST -1 ; info->histogram.fc_chunks[idx]++;
misc/e4crypt.c +1 -13
@@ -114,18 +114,6 @@ static const size_t hexchars_size = 16;#define EXT4_IOC_SET_ENCRYPTION_POLICY _IOR('f', 19, struct ext4_encryption_policy)#define EXT4_IOC_GET_ENCRYPTION_POLICY _IOW('f', 21, struct ext4_encryption_policy) -static int int_log2 (int arg) -{ -int l =0 ; - - arg >>=1 ; -while (arg) { - l++; - arg >>=1 ; - } -return l; -} -static void validate_paths (int argc,char *argv[],int path_start_index) {int x;
@@ -386,7 +374,7 @@ static void set_policy(struct salt *set_salt, int pad,EXT4_ENCRYPTION_MODE_AES_256_XTS ; policy.filenames_encryption_mode =EXT4_ENCRYPTION_MODE_AES_256_CTS ; - policy.flags =int_log2 (pad >>2 ); + policy.flags =ext2fs_log2 (pad >>2 );memcpy (policy.master_key_descriptor, salt->key_desc,EXT4_KEY_DESCRIPTOR_SIZE ); rc =ioctl (fd,EXT4_IOC_SET_ENCRYPTION_POLICY , &policy);
misc/filefrag.c +4 -28
@@ -76,30 +76,6 @@ const char *hex_fmt = "%4d: %*llx..%*llx: %*llx..%*llx: %6llx: %s\n";#define EXT4_EXTENTS_FL 0x00080000/* Inode uses extents */ #define EXT3_IOC_GETFLAGS _IOR('f', 1, long) -static int ulong_log2 (unsigned long arg) -{ -int l =0 ; - - arg >>=1 ; -while (arg) { - l++; - arg >>=1 ; - } -return l; -} - -static int ulong_log10 (unsigned long long arg) -{ -int l =0 ; - - arg = arg /10 ; -while (arg) { - l++; - arg = arg /10 ; - } -return l; -} -static unsigned int div_ceil (unsigned int a,unsigned int b) {if (!a)
@@ -483,20 +459,20 @@ static int frag_report(const char *filename) } last_device = st.st_dev; - width =ulong_log10 (fsinfo.f_blocks); + width =ext2fs_log10 (fsinfo.f_blocks);if (width > physical_width) physical_width = width; numblocks = (st.st_size + blksize -1 ) / blksize;if (blocksize !=0 ) - blk_shift =ulong_log2 (blocksize); + blk_shift =ext2fs_log2 (blocksize);else - blk_shift =ulong_log2 (blksize); + blk_shift =ext2fs_log2 (blksize);if (use_extent_cache) width =10 ;else - width =ulong_log10 (numblocks); + width =ext2fs_log10 (numblocks);if (width > logical_width) logical_width = width;if (verbose) {
misc/mk_hugefiles.c +1 -1
@@ -417,7 +417,7 @@ errcode_t mk_hugefiles(ext2_filsys fs, const char *device_name) fn_prefix =get_string_from_profile (fs_types,"hugefiles_name" ,"hugefile" ); idx_digits =get_int_from_profile (fs_types,"hugefiles_digits" ,5 ); - d =int_log10 (num_files) +1 ; + d =ext2fs_log10 (num_files) +1 ;if (idx_digits > d) d = idx_digits; dsize =strlen (fn_prefix) + d +16 ;
misc/mke2fs.c +6 -27
@@ -147,27 +147,6 @@ static void usage(void)exit (1 ); } -static int int_log2 (unsigned long long arg) -{ -int l =0 ; - - arg >>=1 ; -while (arg) { - l++; - arg >>=1 ; - } -return l; -} - -int int_log10 (unsigned long long arg) -{ -int l; - -for (l=0 ; arg ; l++) - arg = arg /10 ; -return l; -} -#ifdef __linux__static int parse_version_number (const char *s) {
@@ -782,7 +761,7 @@ skip_details:continue ;if (i !=1 )printf (", " ); - need =int_log10 (group_block) +2 ; + need =ext2fs_log10 (group_block) +2 ;if (need > col_left) {printf ("\n\t" ); col_left =72 ;
@@ -1753,7 +1732,7 @@ profile_error: blocksize);if (blocksize >0 ) fs_param.s_log_block_size = -int_log2 (blocksize >> +ext2fs_log2 (blocksize >>EXT2_MIN_BLOCK_LOG_SIZE );break ;case 'c' :/* Check for bad blocks */
@@ -2042,7 +2021,7 @@ profile_error: blocksize = jfs->blocksize;printf (_ ("Using journal device's blocksize: %d\n" ), blocksize); fs_param.s_log_block_size = -int_log2 (blocksize >>EXT2_MIN_BLOCK_LOG_SIZE ); +ext2fs_log2 (blocksize >>EXT2_MIN_BLOCK_LOG_SIZE );ext2fs_close_free (&jfs); }
@@ -2297,7 +2276,7 @@ profile_error: } fs_param.s_log_block_size = -int_log2 (blocksize >>EXT2_MIN_BLOCK_LOG_SIZE ); +ext2fs_log2 (blocksize >>EXT2_MIN_BLOCK_LOG_SIZE );/* * We now need to do a sanity check of fs_blocks_count for
@@ -2396,7 +2375,7 @@ profile_error:"cluster_size" , blocksize*16); fs_param.s_log_cluster_size = -int_log2 (cluster_size >>EXT2_MIN_CLUSTER_LOG_SIZE ); +ext2fs_log2 (cluster_size >>EXT2_MIN_CLUSTER_LOG_SIZE );if (fs_param.s_log_cluster_size && fs_param.s_log_cluster_size < fs_param.s_log_block_size) { com_err(program_name, 0, "%s",
@@ -2686,7 +2665,7 @@ profile_error: "flex_bg size may not be specified"));exit (1 ); } - fs_param.s_log_groups_per_flex =int_log2 (flex_bg_size); + fs_param.s_log_groups_per_flex =ext2fs_log2 (flex_bg_size); }if (inode_size && fs_param.s_rev_level >=EXT2_DYNAMIC_REV ) {
misc/mke2fs.h +0 -1
@@ -21,7 +21,6 @@ extern char *get_string_from_profile(char **types, const char *opt, const char *def_val);extern int get_int_from_profile (char **types,const char *opt,int def_val);extern int get_bool_from_profile (char **types,const char *opt,int def_val); -extern int int_log10 (unsigned long long arg);/* mk_hugefiles.c */ extern errcode_t mk_hugefiles (ext2_filsys fs,const char *device_name);
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 2/2 journal: increase revoke block hash size
Increase the size of the revoke block hash table to scale with the size of the journal, so that we don't get long hash chains if there are a large number of revoke blocks in the journal to replay.
The new hash size will default to 1/16 of the blocks in the journal. This is about 1 byte per block in the hash table, but there are two allocated. The total amount of memory allocated for revoke blocks depends much more on how many are in the journal, and not on the size of the hash table. The system is regularly using this much memory for the journal blocks, so the hash table size is not a big factor.
Consolidate duplicate code between recover_ext3_journal() and ext2fs_open_ext3_journal() in debugfs.c to avoid duplicating logic.
Reviewed-on: https://review.whamcloud.com/52386
--- debugfs/journal.c | 68 +++++++++++++---------------------------- e2fsck/jfs_user.h | 2 +- e2fsck/journal.c | 12 +++++++- lib/ext2fs/jfs_compat.h | 1 + lib/ext2fs/kernel-jbd.h | 1 + misc/util.c | 21 +++++++------ 6 files changed, 48 insertions(+), 57 deletions(-)
debugfs/journal.c +22 -46
@@ -738,10 +738,12 @@ err:return retval; } -static errcode_t recover_ext3_journal (ext2_filsys fs) +#define recover_ext3_journal (fs) ext2fs_open_journal(fs, NULL) +errcode_t ext2fs_open_journal (ext2_filsys fs,journal_t **j) {journal_t *journal;errcode_t retval; +long hash_size; retval =jbd2_journal_init_revoke_record_cache ();if (retval)
@@ -759,19 +761,34 @@ static errcode_t recover_ext3_journal(ext2_filsys fs)if (retval) goto errout; - retval =jbd2_journal_init_revoke (journal,1024 ); +/* The hash table defaults to 2 bytes per journal block (average of +* 8 entries in a hash bucket in absolute worst case), but the total +* memory usage depends on the number of revoke blocks. The system +* should be able to handle this much RAM usage, since it uses at +* least this much memory for the journal when running. The max limit +* check is to avoid problems if the journal size is wrong somehow. */ + hash_size =roundup_power_of_two (journal->j_superblock->s_maxlen /16 ); +if (hash_size >JBD2_MAX_JOURNAL_BLOCKS /16 ) + hash_size =roundup_power_of_two (JBD2_MAX_JOURNAL_BLOCKS /16 ); + retval =jbd2_journal_init_revoke (journal, hash_size);if (retval) goto errout; - retval = -jbd2_journal_recover (journal); -if (retval) - goto errout; +if (!j) { + retval = -jbd2_journal_recover (journal); +if (retval) + goto errout; + }if (journal->j_failed_commit) { journal->j_superblock->s_errno = -EINVAL ;mark_buffer_dirty (journal->j_sb_buffer); } +if (j) { + *j = journal; +return 0 ; + } journal->j_tail_sequence = journal->j_transaction_sequence; errout:
@@ -853,47 +870,6 @@ outfree:return retval ? retval : recover_retval; } -errcode_t ext2fs_open_journal (ext2_filsys fs,journal_t **j) -{ -journal_t *journal; -errcode_t retval; - - retval =jbd2_journal_init_revoke_record_cache (); -if (retval) -return retval; - - retval =jbd2_journal_init_revoke_table_cache (); -if (retval) -return retval; - - retval =ext2fs_get_journal (fs, &journal); -if (retval) -return retval; - - retval =ext2fs_journal_load (journal); -if (retval) - goto errout; - - retval =jbd2_journal_init_revoke (journal,1024 ); -if (retval) - goto errout; - -if (journal->j_failed_commit) { - journal->j_superblock->s_errno = -EINVAL ; -mark_buffer_dirty (journal->j_sb_buffer); - } - - *j = journal; -return 0 ; - -errout: -jbd2_journal_destroy_revoke (journal); -jbd2_journal_destroy_revoke_record_cache (); -jbd2_journal_destroy_revoke_table_cache (); -ext2fs_journal_release (fs, journal,1 ,0 ); -return retval; -} -errcode_t ext2fs_close_journal (ext2_filsys fs,journal_t **j) {journal_t *journal = *j;
e2fsck/jfs_user.h +1 -1
@@ -306,7 +306,7 @@ extern int jbd2_journal_recover (journal_t *journal);extern int jbd2_journal_skip_recovery (journal_t *);/* revoke.c */ -extern int jbd2_journal_init_revoke (journal_t *,int ); +extern int jbd2_journal_init_revoke (journal_t *,int hash_size);extern void jbd2_journal_destroy_revoke (journal_t *);extern void jbd2_journal_destroy_revoke_record_cache (void );extern void jbd2_journal_destroy_revoke_table_cache (void );
e2fsck/journal.c +11 -1
@@ -1632,6 +1632,7 @@ static errcode_t recover_ext3_journal(e2fsck_t ctx)struct problem_context pctx;journal_t *journal;errcode_t retval; +long hash_size;clear_problem_context (&pctx);
@@ -1651,7 +1652,16 @@ static errcode_t recover_ext3_journal(e2fsck_t ctx)if (retval) goto errout; - retval =jbd2_journal_init_revoke (journal,1024 ); +/* The hash table defaults to 2 bytes per journal block (average of +* 8 entries in a hash chain in absolute worst case), but the total +* memory usage depends on the number of revoke blocks. The system +* should be able to handle this much RAM usage, since it uses at +* least this much memory for the journal when running. The max limit +* check is to avoid problems if the journal size is wrong somehow. */ + hash_size =roundup_power_of_two (journal->j_superblock->s_maxlen /16 ); +if (hash_size >JBD2_MAX_JOURNAL_BLOCKS /16 ) + hash_size =roundup_power_of_two (JBD2_MAX_JOURNAL_BLOCKS /16 ); + retval =jbd2_journal_init_revoke (journal, hash_size);if (retval) goto errout;
lib/ext2fs/jfs_compat.h +1 -0
@@ -59,6 +59,7 @@ typedef __u64 u64;#define blkdev_issue_flush (kdev) sync_blockdev(kdev)#define is_power_of_2 (x) ((x) != 0 && (((x) & ((x) - 1)) == 0)) +#define roundup_power_of_two (n) (1UL << (ext2fs_log2((n) - 1) + 1))#define pr_emerg (fmt)#define pr_err (...)
lib/ext2fs/kernel-jbd.h +1 -0
@@ -58,6 +58,7 @@ extern void * __jbd_kmalloc (char *where, size_t size, int flags, int retry); __jbd_kmalloc(__FUNCTION__, (size), (flags), 1)#define JBD2_MIN_JOURNAL_BLOCKS 1024 +#define JBD2_MAX_JOURNAL_BLOCKS (JBD2_MIN_JOURNAL_BLOCKS * 10000)#define JBD2_DEFAULT_FAST_COMMIT_BLOCKS 256/*
misc/util.c +12 -9
@@ -49,6 +49,7 @@#include "e2p/e2p.h" #include "ext2fs/ext2_fs.h" #include "ext2fs/ext2fs.h" +#include "ext2fs/kernel-jbd.h" #include "support/nls-enable.h" #include "support/devname.h" #include "blkid/blkid.h"
@@ -266,7 +267,7 @@ static inline int fcsize_to_blks(ext2_filsys fs, int size)void figure_journal_size (struct ext2fs_journal_params *jparams,int requested_j_size,int requested_fc_size,ext2_filsys fs) { -int total_blocks, ret; +int ret; ret =ext2fs_get_journal_params (jparams, fs);if (ret) {
@@ -275,7 +276,9 @@ void figure_journal_size(struct ext2fs_journal_params *jparams, }if (requested_j_size >0 || - (ext2fs_has_feature_fast_commit (fs->super) && requested_fc_size >0 )) { + (ext2fs_has_feature_fast_commit (fs->super) && requested_fc_size >0 )) { +unsigned int total_blocks; +if (requested_j_size >0 ) jparams->num_journal_blocks =jsize_to_blks (fs, requested_j_size);
@@ -286,15 +289,15 @@ void figure_journal_size(struct ext2fs_journal_params *jparams,else if (!ext2fs_has_feature_fast_commit (fs->super)) jparams->num_fc_blocks =0 ; total_blocks = jparams->num_journal_blocks + jparams->num_fc_blocks; -if (total_blocks <1024 || total_blocks >10240000 ) { -fprintf (stderr,_ ("\nThe total requested journal " -"size is %d blocks; it must be\n" -"between 1024 and 10240000 blocks. " -"Aborting.\n" ), - total_blocks); +if (total_blocks <JBD2_MIN_JOURNAL_BLOCKS || + total_blocks >JBD2_MAX_JOURNAL_BLOCKS ) { +fprintf (stderr, +_ ("\nThe total requested journal size is %d blocks;\nit must be between %d and %u blocks. Aborting.\n" ), + total_blocks,JBD2_MIN_JOURNAL_BLOCKS , +JBD2_MAX_JOURNAL_BLOCKS );exit (1 ); } -if ((unsigned int ) total_blocks >ext2fs_free_blocks_count (fs->super) /2 ) { +if (total_blocks >ext2fs_free_blocks_count (fs->super) /2 ) {fputs (_ ("\nTotal journal size too big for filesystem.\n" ), stderr);exit (1 );
Signature · 1 line
2.39.5 (Apple Git-154)
Quoted 2 lines · Andreas Dilger
Remove duplicate
log2()andlog10()functions and replace them with a single pair of functionsext2fs_log2()andext2fs_log10().
Could you please implement 4 funcions, instead of just 2? That is:
ext2fs_log{2,10}_u{32,64}()Thanks!!
- Ted