mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
btrfs: Replace fs_info->submit_workers with btrfs_workqueue.
Much like the fs_info->workers, replace the fs_info->submit_workers use the same btrfs_workqueue. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Tested-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fb.com>
This commit is contained in:
parent
afe3d24267
commit
a8c93d4ef6
5 changed files with 18 additions and 16 deletions
|
@ -1515,7 +1515,7 @@ struct btrfs_fs_info {
|
||||||
struct btrfs_workers endio_meta_write_workers;
|
struct btrfs_workers endio_meta_write_workers;
|
||||||
struct btrfs_workers endio_write_workers;
|
struct btrfs_workers endio_write_workers;
|
||||||
struct btrfs_workers endio_freespace_worker;
|
struct btrfs_workers endio_freespace_worker;
|
||||||
struct btrfs_workers submit_workers;
|
struct btrfs_workqueue_struct *submit_workers;
|
||||||
struct btrfs_workers caching_workers;
|
struct btrfs_workers caching_workers;
|
||||||
struct btrfs_workers readahead_workers;
|
struct btrfs_workers readahead_workers;
|
||||||
|
|
||||||
|
|
|
@ -2006,7 +2006,7 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
|
||||||
btrfs_stop_workers(&fs_info->endio_meta_write_workers);
|
btrfs_stop_workers(&fs_info->endio_meta_write_workers);
|
||||||
btrfs_stop_workers(&fs_info->endio_write_workers);
|
btrfs_stop_workers(&fs_info->endio_write_workers);
|
||||||
btrfs_stop_workers(&fs_info->endio_freespace_worker);
|
btrfs_stop_workers(&fs_info->endio_freespace_worker);
|
||||||
btrfs_stop_workers(&fs_info->submit_workers);
|
btrfs_destroy_workqueue(fs_info->submit_workers);
|
||||||
btrfs_stop_workers(&fs_info->delayed_workers);
|
btrfs_stop_workers(&fs_info->delayed_workers);
|
||||||
btrfs_stop_workers(&fs_info->caching_workers);
|
btrfs_stop_workers(&fs_info->caching_workers);
|
||||||
btrfs_stop_workers(&fs_info->readahead_workers);
|
btrfs_stop_workers(&fs_info->readahead_workers);
|
||||||
|
@ -2486,18 +2486,19 @@ int open_ctree(struct super_block *sb,
|
||||||
btrfs_init_workers(&fs_info->flush_workers, "flush_delalloc",
|
btrfs_init_workers(&fs_info->flush_workers, "flush_delalloc",
|
||||||
fs_info->thread_pool_size, NULL);
|
fs_info->thread_pool_size, NULL);
|
||||||
|
|
||||||
btrfs_init_workers(&fs_info->submit_workers, "submit",
|
|
||||||
min_t(u64, fs_devices->num_devices,
|
|
||||||
fs_info->thread_pool_size), NULL);
|
|
||||||
|
|
||||||
btrfs_init_workers(&fs_info->caching_workers, "cache",
|
btrfs_init_workers(&fs_info->caching_workers, "cache",
|
||||||
fs_info->thread_pool_size, NULL);
|
fs_info->thread_pool_size, NULL);
|
||||||
|
|
||||||
/* a higher idle thresh on the submit workers makes it much more
|
/*
|
||||||
|
* a higher idle thresh on the submit workers makes it much more
|
||||||
* likely that bios will be send down in a sane order to the
|
* likely that bios will be send down in a sane order to the
|
||||||
* devices
|
* devices
|
||||||
*/
|
*/
|
||||||
fs_info->submit_workers.idle_thresh = 64;
|
fs_info->submit_workers =
|
||||||
|
btrfs_alloc_workqueue("submit", flags,
|
||||||
|
min_t(u64, fs_devices->num_devices,
|
||||||
|
max_active), 64);
|
||||||
|
|
||||||
btrfs_init_workers(&fs_info->fixup_workers, "fixup", 1,
|
btrfs_init_workers(&fs_info->fixup_workers, "fixup", 1,
|
||||||
&fs_info->generic_worker);
|
&fs_info->generic_worker);
|
||||||
|
@ -2548,7 +2549,6 @@ int open_ctree(struct super_block *sb,
|
||||||
* return -ENOMEM if any of these fail.
|
* return -ENOMEM if any of these fail.
|
||||||
*/
|
*/
|
||||||
ret = btrfs_start_workers(&fs_info->generic_worker);
|
ret = btrfs_start_workers(&fs_info->generic_worker);
|
||||||
ret |= btrfs_start_workers(&fs_info->submit_workers);
|
|
||||||
ret |= btrfs_start_workers(&fs_info->fixup_workers);
|
ret |= btrfs_start_workers(&fs_info->fixup_workers);
|
||||||
ret |= btrfs_start_workers(&fs_info->endio_workers);
|
ret |= btrfs_start_workers(&fs_info->endio_workers);
|
||||||
ret |= btrfs_start_workers(&fs_info->endio_meta_workers);
|
ret |= btrfs_start_workers(&fs_info->endio_meta_workers);
|
||||||
|
@ -2566,7 +2566,8 @@ int open_ctree(struct super_block *sb,
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto fail_sb_buffer;
|
goto fail_sb_buffer;
|
||||||
}
|
}
|
||||||
if (!(fs_info->workers && fs_info->delalloc_workers)) {
|
if (!(fs_info->workers && fs_info->delalloc_workers &&
|
||||||
|
fs_info->submit_workers)) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto fail_sb_buffer;
|
goto fail_sb_buffer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1326,7 +1326,7 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info,
|
||||||
btrfs_set_max_workers(&fs_info->generic_worker, new_pool_size);
|
btrfs_set_max_workers(&fs_info->generic_worker, new_pool_size);
|
||||||
btrfs_workqueue_set_max(fs_info->workers, new_pool_size);
|
btrfs_workqueue_set_max(fs_info->workers, new_pool_size);
|
||||||
btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size);
|
btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size);
|
||||||
btrfs_set_max_workers(&fs_info->submit_workers, new_pool_size);
|
btrfs_workqueue_set_max(fs_info->submit_workers, new_pool_size);
|
||||||
btrfs_set_max_workers(&fs_info->caching_workers, new_pool_size);
|
btrfs_set_max_workers(&fs_info->caching_workers, new_pool_size);
|
||||||
btrfs_set_max_workers(&fs_info->fixup_workers, new_pool_size);
|
btrfs_set_max_workers(&fs_info->fixup_workers, new_pool_size);
|
||||||
btrfs_set_max_workers(&fs_info->endio_workers, new_pool_size);
|
btrfs_set_max_workers(&fs_info->endio_workers, new_pool_size);
|
||||||
|
|
|
@ -415,7 +415,8 @@ static noinline void run_scheduled_bios(struct btrfs_device *device)
|
||||||
device->running_pending = 1;
|
device->running_pending = 1;
|
||||||
|
|
||||||
spin_unlock(&device->io_lock);
|
spin_unlock(&device->io_lock);
|
||||||
btrfs_requeue_work(&device->work);
|
btrfs_queue_work(fs_info->submit_workers,
|
||||||
|
&device->work);
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
/* unplug every 64 requests just for good measure */
|
/* unplug every 64 requests just for good measure */
|
||||||
|
@ -439,7 +440,7 @@ static noinline void run_scheduled_bios(struct btrfs_device *device)
|
||||||
blk_finish_plug(&plug);
|
blk_finish_plug(&plug);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pending_bios_fn(struct btrfs_work *work)
|
static void pending_bios_fn(struct btrfs_work_struct *work)
|
||||||
{
|
{
|
||||||
struct btrfs_device *device;
|
struct btrfs_device *device;
|
||||||
|
|
||||||
|
@ -5379,8 +5380,8 @@ static noinline void btrfs_schedule_bio(struct btrfs_root *root,
|
||||||
spin_unlock(&device->io_lock);
|
spin_unlock(&device->io_lock);
|
||||||
|
|
||||||
if (should_queue)
|
if (should_queue)
|
||||||
btrfs_queue_worker(&root->fs_info->submit_workers,
|
btrfs_queue_work(root->fs_info->submit_workers,
|
||||||
&device->work);
|
&device->work);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bio_size_ok(struct block_device *bdev, struct bio *bio,
|
static int bio_size_ok(struct block_device *bdev, struct bio *bio,
|
||||||
|
@ -5668,7 +5669,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
|
||||||
else
|
else
|
||||||
generate_random_uuid(dev->uuid);
|
generate_random_uuid(dev->uuid);
|
||||||
|
|
||||||
dev->work.func = pending_bios_fn;
|
btrfs_init_work(&dev->work, pending_bios_fn, NULL, NULL);
|
||||||
|
|
||||||
return dev;
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,7 +95,7 @@ struct btrfs_device {
|
||||||
/* per-device scrub information */
|
/* per-device scrub information */
|
||||||
struct scrub_ctx *scrub_device;
|
struct scrub_ctx *scrub_device;
|
||||||
|
|
||||||
struct btrfs_work work;
|
struct btrfs_work_struct work;
|
||||||
struct rcu_head rcu;
|
struct rcu_head rcu;
|
||||||
struct work_struct rcu_work;
|
struct work_struct rcu_work;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue