OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext4: fix lazy initialization next schedule time computation in more granular unit 

commit 39fec6889d15a658c3a3ebb06fd69d3584ddffd3 upstream.

Ext4 file system has default lazy inode table initialization setup once
it is mounted. However, it has issue on computing the next schedule time
that makes the timeout same amount in jiffies but different real time in
secs if with various HZ values. Therefore, fix by measuring the current
time in a more granular unit nanoseconds and make the next schedule time
independent of the HZ value.

Fixes: bfff68738f ("ext4: add support for lazy inode table initialization")
Signed-off-by: Shaoying Xu <shaoyi@amazon.com>
Cc: stable@vger.kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Link: https://lore.kernel.org/r/20210902164412.9994-2-shaoyi@amazon.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Shaoying Xu 2021-09-02 16:44:12 +00:00 committed by Greg Kroah-Hartman
parent 307c6f7287
commit c468f9249d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/ext4/super.c
View File

@ -3071,8 +3071,8 @@ static int ext4_run_li_request(struct ext4_li_request *elr)
struct ext4_group_desc *gdp = NULL; struct ext4_group_desc *gdp = NULL;
ext4_group_t group, ngroups; ext4_group_t group, ngroups;
struct super_block *sb; struct super_block *sb;
unsigned long timeout = 0;
int ret = 0; int ret = 0;
u64 start_time;
sb = elr->lr_super; sb = elr->lr_super;
ngroups = EXT4_SB(sb)->s_groups_count; ngroups = EXT4_SB(sb)->s_groups_count;
@ -3092,13 +3092,12 @@ static int ext4_run_li_request(struct ext4_li_request *elr)
ret = 1; ret = 1;
if (!ret) { if (!ret) {
timeout = jiffies; start_time = ktime_get_real_ns();
ret = ext4_init_inode_table(sb, group, ret = ext4_init_inode_table(sb, group,
elr->lr_timeout ? 0 : 1); elr->lr_timeout ? 0 : 1);
if (elr->lr_timeout == 0) { if (elr->lr_timeout == 0) {
timeout = (jiffies - timeout) * elr->lr_timeout = nsecs_to_jiffies((ktime_get_real_ns() - start_time) *
elr->lr_sbi->s_li_wait_mult; elr->lr_sbi->s_li_wait_mult);
elr->lr_timeout = timeout;
} }
elr->lr_next_sched = jiffies + elr->lr_timeout; elr->lr_next_sched = jiffies + elr->lr_timeout;
elr->lr_next_group = group + 1; elr->lr_next_group = group + 1;