| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 4 Oct 2010 15:14:26 +0200 (CEST)
From: Lukas Czerner <lczerner@...hat.com>
To: "Ted Ts'o" <tytso@....edu>
cc: Lukas Czerner <lczerner@...hat.com>, linux-ext4@...r.kernel.org,
rwheeler@...hat.com, sandeen@...hat.com, adilger@...ger.ca,
snitzer@...il.com
Subject: Re: [PATCH 0/6 v4] Lazy itable initialization for Ext4
Hi Ted,
first of all, thank you very much for tracking down those issues and for
all the improvement you have done on this. Now, I have some questions
about changes you have introduced with this patch.
On Sun, 3 Oct 2010, Ted Ts'o wrote:
> I've made some more changes. This version updates the timing control.
> The major changes are:
>
> 1) Time the it takes to clear the inode table with a barrier (once),
> and then use it for the rest of the block groups for that file system.
So if I understand this right it means that we measure the time it takes
to zeroout inode table just once (set the lr_timeout) and then we use
this value for all the following zeroouts.
Initially I have done this "measuring time" thing to adaptively balance
the load it generates and thus do not disturb other ongoing I/O very
much. So this change does not really make sense to me, because when we
measure the time right after the mount (just once) and the system is
relatively still we end up with rather small lr_timeout and then, when
system is under heavy load it will keep the same zeroout rate as when
system was still - resulting in much more impact on performance than my
previous solution.
Conversely, when the system is under heavy load when the filesystem
with init_itable option is mounted the zeroing will proceed very slowly
even if the system is relatively still later on.
>
> 2) s_li_wait_nult wasn't getting defaulted, so we weren't waiting any
> time at all between sb_issue_zeroout calls.
Actually it is getting defaulted:
+ case Opt_init_inode_table:
+ set_opt(sbi->s_mount_opt, INIT_INODE_TABLE);
+ if (args[0].from) {
+ if (match_int(&args[0], &option))
+ return 0;
+ } else
+ option = EXT4_DEF_LI_WAIT_MULT;
+ if (option < 0)
+ return 0;
+ sbi->s_li_wait_mult = option;
+ break;
EXT4_DEF_LI_WAIT_MULT is the default value for s_li_wait_mult.
Some comments in the code below...
>
> 3) Fix the timer arithmetic so it works across jiffies rollover.
> (This means using time_before() instead of <)
>
> - Ted
>
> From 87fe012bfa04e1ac95a4a96f90b70c2a0983e228 Mon Sep 17 00:00:00 2001
> From: Lukas Czerner <lczerner@...hat.com>
> Date: Sun, 3 Oct 2010 22:31:15 -0400
> Subject: [PATCH] ext4: Add support for lazy inode table initialization
>
> When the lazy_itable_init extended option is passed to mke2fs, it
> considerably speeds up filesystem creation because inode tables are
> not zeroed out. The fact that parts of the inode table are
> uninitialized is not a problem so long as the block group descriptors,
> which contain information regarding how much of the inode table has
> been initialized, has not been corrupted However, if the block group
> checksums are not valid, e2fsck must scan the entire inode table, and
> the the old, uninitialized data could potentially cause e2fsck to
> report false problems.
>
> Hence, it is important for the inode tables to be initialized as soon
> as possble. This commit adds this feature so that mke2fs can safely
> use the lazy inode table initialization feature to speed up formatting
> file systems.
>
> This is done via a new new kernel thread called ext4lazyinit, which is
> created on demand and destroyed, when it is no longer needed. There
> is only one thread for all ext4 filesystems in the system. When the
> first filesystem with inititable mount option is mounted, ext4lazyinit
> thread is created, then the filesystem can register its request in the
> request list.
>
> This thread then walks through the list of requests picking up
> scheduled requests and invoking ext4_init_inode_table(). Next schedule
> time for the request is computed by multiplying the time it took to
> zero out last inode table with wait multiplier, which can be set with
> the (init_itable=n) mount option (default is 10). We are doing
> this so we do not take the whole I/O bandwidth. When the thread is no
> longer necessary (request list is empty) it frees the appropriate
> structures and exits (and can be created later later by another
> filesystem).
>
> We do not disturb regular inode allocations in any way, it just do not
> care whether the inode table is, or is not zeroed. But when zeroing, we
> have to skip used inodes, obviously. Also we should prevent new inode
> allocations from the group, while zeroing is on the way. For that we
> take write alloc_sem lock in ext4_init_inode_table() and read alloc_sem
> in the ext4_claim_inode, so when we are unlucky and allocator hits the
> group which is currently being zeroed, it just has to wait.
>
> This can be suppresed using the mount option no_init_itable.
>
> Signed-off-by: Lukas Czerner <lczerner@...hat.com>
> Signed-off-by: "Theodore Ts'o" <tytso@....edu>
> ---
> Documentation/filesystems/ext4.txt | 14 ++
> fs/ext4/ext4.h | 40 ++++
> fs/ext4/ialloc.c | 120 ++++++++++
> fs/ext4/super.c | 439 +++++++++++++++++++++++++++++++++++-
> 4 files changed, 610 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
> index e1def17..6ab9442 100644
> --- a/Documentation/filesystems/ext4.txt
> +++ b/Documentation/filesystems/ext4.txt
> @@ -353,6 +353,20 @@ noauto_da_alloc replacing existing files via patterns such as
> system crashes before the delayed allocation
> blocks are forced to disk.
>
> +noinit_itable Do not initialize any uninitialized inode table
> + blocks in the background. This feature may be
> + used by installation CD's so that the install
> + process can complete as quickly as possible; the
> + inode table initialization process would then be
> + deferred until the next time the file system
> + is unmounted.
> +
> +init_itable=n The lazy itable init code will wait n times the
> + number of milliseconds it took to zero out the
> + previous block group's inode table. This
> + minimizes the impact on the systme performance
> + while file system's inode table is being initialized.
> +
> discard Controls whether ext4 should issue discard/TRIM
> nodiscard(*) commands to the underlying block device when
> blocks are freed. This is useful for SSD devices
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index b364b9d..0fe078d 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -890,6 +890,7 @@ struct ext4_inode_info {
> #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */
> #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */
> #define EXT4_MOUNT_DISCARD 0x40000000 /* Issue DISCARD requests */
> +#define EXT4_MOUNT_INIT_INODE_TABLE 0x80000000 /* Initialize uninitialized itables */
>
> #define clear_opt(o, opt) o &= ~EXT4_MOUNT_##opt
> #define set_opt(o, opt) o |= EXT4_MOUNT_##opt
> @@ -1173,6 +1174,11 @@ struct ext4_sb_info {
>
> /* timer for periodic error stats printing */
> struct timer_list s_err_report;
> +
> + /* Lazy inode table initialization info */
> + struct ext4_li_request *s_li_request;
> + /* Wait multiplier for lazy initialization thread */
> + unsigned int s_li_wait_mult;
> };
>
> static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
> @@ -1537,6 +1543,38 @@ void ext4_get_group_no_and_offset(struct super_block *sb, ext4_fsblk_t blocknr,
> extern struct proc_dir_entry *ext4_proc_root;
>
> /*
> + * Timeout and state flag for lazy initialization inode thread.
> + */
> +#define EXT4_DEF_LI_WAIT_MULT 10
> +#define EXT4_DEF_LI_MAX_START_DELAY 5
> +#define EXT4_LAZYINIT_QUIT 0x0001
> +#define EXT4_LAZYINIT_RUNNING 0x0002
> +
> +/*
> + * Lazy inode table initialization info
> + */
> +struct ext4_lazy_init {
> + unsigned long li_state;
> +
> + wait_queue_head_t li_wait_daemon;
> + wait_queue_head_t li_wait_task;
> + struct timer_list li_timer;
> + struct task_struct *li_task;
> +
> + struct list_head li_request_list;
> + struct mutex li_list_mtx;
> +};
> +
> +struct ext4_li_request {
> + struct super_block *lr_super;
> + struct ext4_sb_info *lr_sbi;
> + ext4_group_t lr_next_group;
> + struct list_head lr_request;
> + unsigned long lr_next_sched;
> + unsigned long lr_timeout;
> +};
> +
> +/*
> * Function prototypes
> */
>
> @@ -1611,6 +1649,8 @@ extern unsigned ext4_init_inode_bitmap(struct super_block *sb,
> ext4_group_t group,
> struct ext4_group_desc *desc);
> extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
> +extern int ext4_init_inode_table(struct super_block *sb,
> + ext4_group_t group, int barrier);
>
> /* mballoc.c */
> extern long ext4_mb_stats;
> diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
> index 45853e0..e428f23 100644
> --- a/fs/ext4/ialloc.c
> +++ b/fs/ext4/ialloc.c
> @@ -107,6 +107,7 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
> desc = ext4_get_group_desc(sb, block_group, NULL);
> if (!desc)
> return NULL;
> +
> bitmap_blk = ext4_inode_bitmap(sb, desc);
> bh = sb_getblk(sb, bitmap_blk);
> if (unlikely(!bh)) {
> @@ -123,6 +124,7 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
> unlock_buffer(bh);
> return bh;
> }
> +
> ext4_lock_group(sb, block_group);
> if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
> ext4_init_inode_bitmap(sb, bh, block_group, desc);
> @@ -133,6 +135,7 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
> return bh;
> }
> ext4_unlock_group(sb, block_group);
> +
> if (buffer_uptodate(bh)) {
> /*
> * if not uninit if bh is uptodate,
> @@ -712,8 +715,17 @@ static int ext4_claim_inode(struct super_block *sb,
> {
> int free = 0, retval = 0, count;
> struct ext4_sb_info *sbi = EXT4_SB(sb);
> + struct ext4_group_info *grp = ext4_get_group_info(sb, group);
> struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
>
> + /*
> + * We have to be sure that new inode allocation does not race with
> + * inode table initialization, because otherwise we may end up
> + * allocating and writing new inode right before sb_issue_zeroout
> + * takes place and overwriting our new inode with zeroes. So we
> + * take alloc_sem to prevent it.
> + */
> + down_read(&grp->alloc_sem);
> ext4_lock_group(sb, group);
> if (ext4_set_bit(ino, inode_bitmap_bh->b_data)) {
> /* not a free inode */
> @@ -724,6 +736,7 @@ static int ext4_claim_inode(struct super_block *sb,
> if ((group == 0 && ino < EXT4_FIRST_INO(sb)) ||
> ino > EXT4_INODES_PER_GROUP(sb)) {
> ext4_unlock_group(sb, group);
> + up_read(&grp->alloc_sem);
> ext4_error(sb, "reserved inode or inode > inodes count - "
> "block_group = %u, inode=%lu", group,
> ino + group * EXT4_INODES_PER_GROUP(sb));
> @@ -772,6 +785,7 @@ static int ext4_claim_inode(struct super_block *sb,
> gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);
> err_ret:
> ext4_unlock_group(sb, group);
> + up_read(&grp->alloc_sem);
> return retval;
> }
>
> @@ -1205,3 +1219,109 @@ unsigned long ext4_count_dirs(struct super_block * sb)
> }
> return count;
> }
> +
> +/*
> + * Zeroes not yet zeroed inode table - just write zeroes through the whole
> + * inode table. Must be called without any spinlock held. The only place
> + * where it is called from on active part of filesystem is ext4lazyinit
> + * thread, so we do not need any special locks, however we have to prevent
> + * inode allocation from the current group, so we take alloc_sem lock, to
> + * block ext4_claim_inode until we are finished.
> + */
> +extern int ext4_init_inode_table(struct super_block *sb, ext4_group_t group,
> + int barrier)
> +{
> + struct ext4_group_info *grp = ext4_get_group_info(sb, group);
> + struct ext4_sb_info *sbi = EXT4_SB(sb);
> + struct ext4_group_desc *gdp = NULL;
> + struct buffer_head *group_desc_bh;
> + handle_t *handle;
> + ext4_fsblk_t blk;
> + int num, ret = 0, used_blks = 0;
> + unsigned long flags = BLKDEV_IFL_WAIT;
> +
> + /* This should not happen, but just to be sure check this */
> + if (sb->s_flags & MS_RDONLY) {
> + ret = 1;
> + goto out;
> + }
> +
> + gdp = ext4_get_group_desc(sb, group, &group_desc_bh);
> + if (!gdp)
> + goto out;
> +
> + /*
> + * We do not need to lock this, because we are the only one
> + * handling this flag.
> + */
> + if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED))
> + goto out;
> +
> + handle = ext4_journal_start_sb(sb, 1);
> + if (IS_ERR(handle)) {
> + ret = PTR_ERR(handle);
> + goto out;
> + }
> +
> + down_write(&grp->alloc_sem);
> + /*
> + * If inode bitmap was already initialized there may be some
> + * used inodes so we need to skip blocks with used inodes in
> + * inode table.
> + */
> + if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)))
> + used_blks = DIV_ROUND_UP((EXT4_INODES_PER_GROUP(sb) -
> + ext4_itable_unused_count(sb, gdp)),
> + sbi->s_inodes_per_block);
> +
> + blk = ext4_inode_table(sb, gdp) + used_blks;
> + num = sbi->s_itb_per_group - used_blks;
> +
> + BUFFER_TRACE(group_desc_bh, "get_write_access");
> + ret = ext4_journal_get_write_access(handle,
> + group_desc_bh);
> + if (ret)
> + goto err_out;
> +
> + if (unlikely(num > EXT4_INODES_PER_GROUP(sb))) {
> + ext4_error(sb, "Something is wrong with group %u\n"
> + "Used itable blocks: %d"
> + "Itable blocks per group: %lu\n",
> + group, used_blks, sbi->s_itb_per_group);
> + ret = 1;
> + goto err_out;
> + }
> +
> + /*
> + * Skip zeroout if the inode table is full. But we set the ZEROED
> + * flag anyway, because obviously, when it is full it does not need
> + * further zeroing.
> + */
> + if (unlikely(num == 0))
> + goto skip_zeroout;
> +
> + ext4_debug("going to zero out inode table in group %d\n",
> + group);
> + if (barrier)
> + flags |= BLKDEV_IFL_BARRIER;
> + ret = sb_issue_zeroout(sb, blk, num, GFP_NOFS, flags);
> + if (ret < 0)
> + goto err_out;
> +
> +skip_zeroout:
> + ext4_lock_group(sb, group);
> + gdp->bg_flags |= cpu_to_le16(EXT4_BG_INODE_ZEROED);
> + gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);
> + ext4_unlock_group(sb, group);
> +
> + BUFFER_TRACE(group_desc_bh,
> + "call ext4_handle_dirty_metadata");
> + ret = ext4_handle_dirty_metadata(handle, NULL,
> + group_desc_bh);
> +
> +err_out:
> + up_write(&grp->alloc_sem);
> + ext4_journal_stop(handle);
> +out:
> + return ret;
> +}
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 751997d..c4b9984 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -41,6 +41,9 @@
> #include <linux/crc16.h>
> #include <asm/uaccess.h>
>
> +#include <linux/kthread.h>
> +#include <linux/freezer.h>
> +
> #include "ext4.h"
> #include "ext4_jbd2.h"
> #include "xattr.h"
> @@ -52,6 +55,8 @@
>
> struct proc_dir_entry *ext4_proc_root;
> static struct kset *ext4_kset;
> +struct ext4_lazy_init *ext4_li_info;
> +struct mutex ext4_li_mtx;
>
> static int ext4_load_journal(struct super_block *, struct ext4_super_block *,
> unsigned long journal_devnum);
> @@ -70,6 +75,8 @@ static void ext4_write_super(struct super_block *sb);
> static int ext4_freeze(struct super_block *sb);
> static int ext4_get_sb(struct file_system_type *fs_type, int flags,
> const char *dev_name, void *data, struct vfsmount *mnt);
> +static void ext4_destroy_lazyinit_thread(void);
> +static void ext4_unregister_li_request(struct super_block *sb);
>
> #if !defined(CONFIG_EXT3_FS) && !defined(CONFIG_EXT3_FS_MODULE) && defined(CONFIG_EXT4_USE_FOR_EXT23)
> static struct file_system_type ext3_fs_type = {
> @@ -720,6 +727,7 @@ static void ext4_put_super(struct super_block *sb)
> }
>
> del_timer(&sbi->s_err_report);
> + ext4_unregister_li_request(sb);
> ext4_release_system_zone(sb);
> ext4_mb_release(sb);
> ext4_ext_release(sb);
> @@ -1046,6 +1054,12 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
> !(def_mount_opts & EXT4_DEFM_BLOCK_VALIDITY))
> seq_puts(seq, ",block_validity");
>
> + if (!test_opt(sb, INIT_INODE_TABLE))
> + seq_puts(seq, ",noinit_inode_table");
> + else if (sbi->s_li_wait_mult)
> + seq_printf(seq, ",init_inode_table=%u",
> + (unsigned) sbi->s_li_wait_mult);
> +
> ext4_show_quota_options(seq, sb);
>
> return 0;
> @@ -1220,6 +1234,7 @@ enum {
> Opt_inode_readahead_blks, Opt_journal_ioprio,
> Opt_dioread_nolock, Opt_dioread_lock,
> Opt_discard, Opt_nodiscard,
> + Opt_init_inode_table, Opt_noinit_inode_table,
> };
>
> static const match_table_t tokens = {
> @@ -1290,6 +1305,9 @@ static const match_table_t tokens = {
> {Opt_dioread_lock, "dioread_lock"},
> {Opt_discard, "discard"},
> {Opt_nodiscard, "nodiscard"},
> + {Opt_init_inode_table, "init_itable=%u"},
> + {Opt_init_inode_table, "init_itable"},
> + {Opt_noinit_inode_table, "noinit_itable"},
> {Opt_err, NULL},
> };
>
> @@ -1760,6 +1778,20 @@ set_qf_format:
> case Opt_dioread_lock:
> clear_opt(sbi->s_mount_opt, DIOREAD_NOLOCK);
> break;
> + case Opt_init_inode_table:
> + set_opt(sbi->s_mount_opt, INIT_INODE_TABLE);
> + if (args[0].from) {
> + if (match_int(&args[0], &option))
> + return 0;
> + } else
> + option = EXT4_DEF_LI_WAIT_MULT;
> + if (option < 0)
> + return 0;
> + sbi->s_li_wait_mult = option;
> + break;
> + case Opt_noinit_inode_table:
> + clear_opt(sbi->s_mount_opt, INIT_INODE_TABLE);
> + break;
> default:
> ext4_msg(sb, KERN_ERR,
> "Unrecognized mount option \"%s\" "
> @@ -1943,7 +1975,8 @@ int ext4_group_desc_csum_verify(struct ext4_sb_info *sbi, __u32 block_group,
> }
>
> /* Called at mount-time, super-block is locked */
> -static int ext4_check_descriptors(struct super_block *sb)
> +static int ext4_check_descriptors(struct super_block *sb,
> + ext4_group_t *first_not_zeroed)
> {
> struct ext4_sb_info *sbi = EXT4_SB(sb);
> ext4_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
> @@ -1952,7 +1985,7 @@ static int ext4_check_descriptors(struct super_block *sb)
> ext4_fsblk_t inode_bitmap;
> ext4_fsblk_t inode_table;
> int flexbg_flag = 0;
> - ext4_group_t i;
> + ext4_group_t i, grp = sbi->s_groups_count;
>
> if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG))
> flexbg_flag = 1;
> @@ -1968,6 +2001,10 @@ static int ext4_check_descriptors(struct super_block *sb)
> last_block = first_block +
> (EXT4_BLOCKS_PER_GROUP(sb) - 1);
>
> + if ((grp == sbi->s_groups_count) &&
> + !(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))
> + grp = i;
> +
> block_bitmap = ext4_block_bitmap(sb, gdp);
> if (block_bitmap < first_block || block_bitmap > last_block) {
> ext4_msg(sb, KERN_ERR, "ext4_check_descriptors: "
> @@ -2005,6 +2042,8 @@ static int ext4_check_descriptors(struct super_block *sb)
> if (!flexbg_flag)
> first_block += EXT4_BLOCKS_PER_GROUP(sb);
> }
> + if (NULL != first_not_zeroed)
> + *first_not_zeroed = grp;
>
> ext4_free_blocks_count_set(sbi->s_es, ext4_count_free_blocks(sb));
> sbi->s_es->s_free_inodes_count =cpu_to_le32(ext4_count_free_inodes(sb));
> @@ -2543,6 +2582,377 @@ static void print_daily_error_info(unsigned long arg)
> mod_timer(&sbi->s_err_report, jiffies + 24*60*60*HZ); /* Once a day */
> }
>
> +static void ext4_lazyinode_timeout(unsigned long data)
> +{
> + struct task_struct *p = (struct task_struct *)data;
> + wake_up_process(p);
> +}
> +
> +/* Find next suitable group and run ext4_init_inode_table */
> +static int ext4_run_li_request(struct ext4_li_request *elr)
> +{
> + struct ext4_group_desc *gdp = NULL;
> + ext4_group_t group, ngroups;
> + struct super_block *sb;
> + unsigned long timeout = 0;
> + int ret = 0;
> +
> + sb = elr->lr_super;
> + ngroups = EXT4_SB(sb)->s_groups_count;
> +
> + for (group = elr->lr_next_group; group < ngroups; group++) {
> + gdp = ext4_get_group_desc(sb, group, NULL);
> + if (!gdp) {
> + ret = 1;
> + break;
> + }
> +
> + if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))
> + break;
> + }
> +
> + if (group == ngroups)
> + ret = 1;
> +
> + if (!ret) {
> + timeout = jiffies;
> + ret = ext4_init_inode_table(sb, group,
> + elr->lr_timeout ? 0 : 1);
> + if (elr->lr_timeout == 0) {
> + timeout = jiffies - timeout;
> + if (elr->lr_sbi->s_li_wait_mult)
> + timeout *= elr->lr_sbi->s_li_wait_mult;
> + else
> + timeout *= 20;
> + elr->lr_timeout = timeout;
> + }
> + elr->lr_next_sched = jiffies + elr->lr_timeout;
> + elr->lr_next_group = group + 1;
> + }
> +
> + return ret;
> +}
> +
> +/*
> + * Remove lr_request from the list_request and free the
> + * request tructure. Should be called with li_list_mtx held
> + */
> +static void ext4_remove_li_request(struct ext4_li_request *elr)
> +{
> + struct ext4_sb_info *sbi;
> +
> + if (!elr)
> + return;
> +
> + sbi = elr->lr_sbi;
> +
> + list_del(&elr->lr_request);
> + sbi->s_li_request = NULL;
> + kfree(elr);
> +}
> +
> +static void ext4_unregister_li_request(struct super_block *sb)
> +{
> + struct ext4_li_request *elr = EXT4_SB(sb)->s_li_request;
> +
> + if (!ext4_li_info)
> + return;
> +
> + mutex_lock(&ext4_li_info->li_list_mtx);
> + ext4_remove_li_request(elr);
> + mutex_unlock(&ext4_li_info->li_list_mtx);
> +}
> +
> +/*
> + * This is the function where ext4lazyinit thread lives. It walks
> + * through the request list searching for next scheduled filesystem.
> + * When such a fs is found, run the lazy initialization request
> + * (ext4_rn_li_request) and keep track of the time spend in this
> + * function. Based on that time we compute next schedule time of
> + * the request. When walking through the list is complete, compute
> + * next waking time and put itself into sleep.
> + */
> +static int ext4_lazyinit_thread(void *arg)
> +{
> + struct ext4_lazy_init *eli = (struct ext4_lazy_init *)arg;
> + struct list_head *pos, *n;
> + struct ext4_li_request *elr;
> + unsigned long next_wakeup;
> + DEFINE_WAIT(wait);
> + int ret;
> +
> + BUG_ON(NULL == eli);
> +
> + eli->li_timer.data = (unsigned long)current;
> + eli->li_timer.function = ext4_lazyinode_timeout;
> +
> + eli->li_task = current;
> + wake_up(&eli->li_wait_task);
> +
> +cont_thread:
> + while (true) {
> + next_wakeup = jiffies-1;
> +
> + mutex_lock(&eli->li_list_mtx);
> + if (list_empty(&eli->li_request_list)) {
> + mutex_unlock(&eli->li_list_mtx);
> + goto exit_thread;
> + }
> +
> + list_for_each_safe(pos, n, &eli->li_request_list) {
> + elr = list_entry(pos, struct ext4_li_request,
> + lr_request);
> +
> + if (time_before_eq(jiffies, elr->lr_next_sched))
> + continue;
> +
> + if ((ret = ext4_run_li_request(elr)) != 0) {
> + ext4_remove_li_request(elr);
> + continue;
> + }
> +
> + if (time_before(elr->lr_next_sched, next_wakeup))
> + next_wakeup = elr->lr_next_sched;
> + }
> + mutex_unlock(&eli->li_list_mtx);
> +
> + if (freezing(current))
> + refrigerator();
> +
> + if (jiffies >= next_wakeup) {
> + cond_resched();
> + continue;
> + }
When we are using this time functions (with really confusing names) we can
use one here as well I think.
if (time_after_eq(jiffies, next_wakeup) {
cond_resched();
continue;
}
> +
> + eli->li_timer.expires = next_wakeup;
> + add_timer(&eli->li_timer);
> + prepare_to_wait(&eli->li_wait_daemon, &wait,
> + TASK_INTERRUPTIBLE);
> + if (time_before(jiffies, next_wakeup))
> + schedule();
> + finish_wait(&eli->li_wait_daemon, &wait);
> + }
> +
> +exit_thread:
> + /*
> + * It looks like the request list is empty, but we need
> + * to check it under the li_list_mtx lock, to prevent any
> + * additions into it, and of course we should lock ext4_li_mtx
> + * to atomically free the list and ext4_li_info, because at
> + * this point another ext4 filesystem could be registering
> + * new one.
> + */
> + mutex_lock(&ext4_li_mtx);
> + mutex_lock(&eli->li_list_mtx);
> + if (!list_empty(&eli->li_request_list)) {
> + mutex_unlock(&eli->li_list_mtx);
> + mutex_unlock(&ext4_li_mtx);
> + goto cont_thread;
> + }
> + mutex_unlock(&eli->li_list_mtx);
> + del_timer_sync(&ext4_li_info->li_timer);
> + eli->li_task = NULL;
> + wake_up(&eli->li_wait_task);
> +
> + kfree(ext4_li_info);
> + ext4_li_info = NULL;
> + mutex_unlock(&ext4_li_mtx);
> +
> + return 0;
> +}
> +
> +static void ext4_clear_request_list(void)
> +{
> + struct list_head *pos, *n;
> + struct ext4_li_request *elr;
> +
> + mutex_lock(&ext4_li_info->li_list_mtx);
> + if (list_empty(&ext4_li_info->li_request_list))
> + return;
> +
> + list_for_each_safe(pos, n, &ext4_li_info->li_request_list) {
> + elr = list_entry(pos, struct ext4_li_request,
> + lr_request);
> + ext4_remove_li_request(elr);
> + }
> + mutex_unlock(&ext4_li_info->li_list_mtx);
> +}
> +
> +static int ext4_run_lazyinit_thread(void)
> +{
> + struct task_struct *t;
> +
> + t = kthread_run(ext4_lazyinit_thread, ext4_li_info, "ext4lazyinit");
> + if (IS_ERR(t)) {
> + int err = PTR_ERR(t);
> + ext4_clear_request_list();
> + del_timer_sync(&ext4_li_info->li_timer);
> + kfree(ext4_li_info);
> + ext4_li_info = NULL;
> + printk(KERN_CRIT "EXT4: error %d creating inode table "
> + "initialization thread\n",
> + err);
> + return err;
> + }
> + ext4_li_info->li_state |= EXT4_LAZYINIT_RUNNING;
> +
> + wait_event(ext4_li_info->li_wait_task, ext4_li_info->li_task != NULL);
> + return 0;
> +}
> +
> +/*
> + * Check whether it make sense to run itable init. thread or not.
> + * If there is at least one uninitialized inode table, return
> + * corresponding group number, else the loop goes through all
> + * groups and return total number of groups.
> + */
> +static ext4_group_t ext4_has_uninit_itable(struct super_block *sb)
> +{
> + ext4_group_t group, ngroups = EXT4_SB(sb)->s_groups_count;
> + struct ext4_group_desc *gdp = NULL;
> +
> + for (group = 0; group < ngroups; group++) {
> + gdp = ext4_get_group_desc(sb, group, NULL);
> + if (!gdp)
> + continue;
> +
> + if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)))
> + break;
> + }
> +
> + return group;
> +}
> +
> +static int ext4_li_info_new(void)
> +{
> + struct ext4_lazy_init *eli = NULL;
> +
> + eli = kzalloc(sizeof(*eli), GFP_KERNEL);
> + if (!eli)
> + return -ENOMEM;
> +
> + eli->li_task = NULL;
> + INIT_LIST_HEAD(&eli->li_request_list);
> + mutex_init(&eli->li_list_mtx);
> +
> + init_waitqueue_head(&eli->li_wait_daemon);
> + init_waitqueue_head(&eli->li_wait_task);
> + init_timer(&eli->li_timer);
> + eli->li_state |= EXT4_LAZYINIT_QUIT;
> +
> + ext4_li_info = eli;
> +
> + return 0;
> +}
> +
> +static struct ext4_li_request *ext4_li_request_new(struct super_block *sb,
> + ext4_group_t start)
> +{
> + struct ext4_sb_info *sbi = EXT4_SB(sb);
> + struct ext4_li_request *elr;
> + unsigned long rnd;
> +
> + elr = kzalloc(sizeof(*elr), GFP_KERNEL);
> + if (!elr)
> + return NULL;
> +
> + elr->lr_super = sb;
> + elr->lr_sbi = sbi;
> + elr->lr_next_group = start;
> +
> + /*
> + * Randomize first schedule time of the request to
> + * spread the inode table initialization requests
> + * better.
> + */
> + get_random_bytes(&rnd, sizeof(rnd));
> + elr->lr_next_sched = jiffies + (unsigned long)rnd %
> + (EXT4_DEF_LI_MAX_START_DELAY * HZ);
> +
> + return elr;
> +}
> +
> +static int ext4_register_li_request(struct super_block *sb,
> + ext4_group_t first_not_zeroed)
> +{
> + struct ext4_sb_info *sbi = EXT4_SB(sb);
> + struct ext4_li_request *elr;
> + ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count;
> + int ret = 0;
> +
> + if (sbi->s_li_request != NULL)
> + goto out;
> +
> + if (first_not_zeroed == ngroups ||
> + (sb->s_flags & MS_RDONLY) ||
> + !test_opt(sb, INIT_INODE_TABLE)) {
> + sbi->s_li_request = NULL;
> + goto out;
> + }
> +
> + if (first_not_zeroed == ngroups) {
> + sbi->s_li_request = NULL;
> + goto out;
> + }
I do not know why I did this, but apparently we do not need to test
first_not_zeroed again since we just did.
> +
> + elr = ext4_li_request_new(sb, first_not_zeroed);
> + if (!elr) {
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + mutex_lock(&ext4_li_mtx);
> +
> + if (NULL == ext4_li_info) {
> + ret = ext4_li_info_new();
> + if (ret)
> + goto out;
> + }
> +
> + mutex_lock(&ext4_li_info->li_list_mtx);
> + list_add(&elr->lr_request, &ext4_li_info->li_request_list);
> + mutex_unlock(&ext4_li_info->li_list_mtx);
> +
> + sbi->s_li_request = elr;
> +
> + if (!(ext4_li_info->li_state & EXT4_LAZYINIT_RUNNING)) {
> + ret = ext4_run_lazyinit_thread();
> + if (ret)
> + goto out;
> + }
> +
> + mutex_unlock(&ext4_li_mtx);
> +
> +out:
> + if (ret) {
> + mutex_unlock(&ext4_li_mtx);
> + kfree(elr);
> + }
> + return ret;
> +}
> +
> +/*
> + * We do not need to lock anything since this is called on
> + * module unload.
> + */
> +static void ext4_destroy_lazyinit_thread(void)
> +{
> + /*
> + * If thread exited earlier
> + * there's nothing to be done.
> + */
> + if (!ext4_li_info)
> + return;
> +
> + ext4_clear_request_list();
> +
> + while (ext4_li_info->li_task) {
> + wake_up(&ext4_li_info->li_wait_daemon);
> + wait_event(ext4_li_info->li_wait_task,
> + ext4_li_info->li_task == NULL);
> + }
> +}
> +
> static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> __releases(kernel_lock)
> __acquires(kernel_lock)
> @@ -2568,6 +2978,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> __u64 blocks_count;
> int err;
> unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;
> + ext4_group_t first_not_zeroed;
>
> sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
> if (!sbi)
> @@ -2630,6 +3041,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
>
> /* Set defaults before we parse the mount options */
> def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
> + set_opt(sbi->s_mount_opt, INIT_INODE_TABLE);
> if (def_mount_opts & EXT4_DEFM_DEBUG)
> set_opt(sbi->s_mount_opt, DEBUG);
> if (def_mount_opts & EXT4_DEFM_BSDGROUPS) {
> @@ -2909,7 +3321,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
> goto failed_mount2;
> }
> }
> - if (!ext4_check_descriptors(sb)) {
> + if (!ext4_check_descriptors(sb, &first_not_zeroed)) {
> ext4_msg(sb, KERN_ERR, "group descriptors corrupted!");
> goto failed_mount2;
> }
> @@ -3130,6 +3542,10 @@ no_journal:
> goto failed_mount4;
> }
>
> + err = ext4_register_li_request(sb, first_not_zeroed);
> + if (err)
> + goto failed_mount4;
> +
> sbi->s_kobj.kset = ext4_kset;
> init_completion(&sbi->s_kobj_unregister);
> err = kobject_init_and_add(&sbi->s_kobj, &ext4_ktype, NULL,
> @@ -3847,6 +4263,19 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
> enable_quota = 1;
> }
> }
> +
> + /*
> + * Reinitialize lazy itable initialization thread based on
> + * current settings
> + */
> + if ((sb->s_flags & MS_RDONLY) || !test_opt(sb, INIT_INODE_TABLE))
> + ext4_unregister_li_request(sb);
> + else {
> + ext4_group_t first_not_zeroed;
> + first_not_zeroed = ext4_has_uninit_itable(sb);
> + ext4_register_li_request(sb, first_not_zeroed);
> + }
> +
> ext4_setup_system_zone(sb);
> if (sbi->s_journal == NULL)
> ext4_commit_super(sb, 1);
> @@ -4317,6 +4746,9 @@ static int __init init_ext4_fs(void)
> err = register_filesystem(&ext4_fs_type);
> if (err)
> goto out;
> +
> + ext4_li_info = NULL;
> + mutex_init(&ext4_li_mtx);
> return 0;
> out:
> unregister_as_ext2();
> @@ -4336,6 +4768,7 @@ out4:
>
> static void __exit exit_ext4_fs(void)
> {
> + ext4_destroy_lazyinit_thread();
> unregister_as_ext2();
> unregister_as_ext3();
> unregister_filesystem(&ext4_fs_type);
>
-Lukas
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists