UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: use a normal workqueue for rmw_workers 

rmw_workers doesn't need ordered execution or thread disabling threshold
(as the thresh parameter is less than DFT_THRESHOLD).

Just switch to the normal workqueues that use a lot less resources,
especially in the work_struct vs btrfs_work structures.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Christoph Hellwig 2022-04-18 06:43:11 +02:00 committed by David Sterba
parent be53951826
commit 385de0ef38
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -853,7 +853,7 @@ struct btrfs_fs_info {
struct btrfs_workqueue *endio_workers; struct btrfs_workqueue *endio_workers;
struct btrfs_workqueue *endio_meta_workers; struct btrfs_workqueue *endio_meta_workers;
struct btrfs_workqueue *endio_raid56_workers; struct btrfs_workqueue *endio_raid56_workers;
struct btrfs_workqueue *rmw_workers; struct workqueue_struct *rmw_workers;
struct btrfs_workqueue *endio_meta_write_workers; struct btrfs_workqueue *endio_meta_write_workers;
struct btrfs_workqueue *endio_write_workers; struct btrfs_workqueue *endio_write_workers;
struct btrfs_workqueue *endio_freespace_worker; struct btrfs_workqueue *endio_freespace_worker;

6
fs/btrfs/disk-io.c
View File

@ -2283,7 +2283,8 @@ static void btrfs_stop_all_workers(struct btrfs_fs_info *fs_info)
btrfs_destroy_workqueue(fs_info->workers); btrfs_destroy_workqueue(fs_info->workers);
btrfs_destroy_workqueue(fs_info->endio_workers); btrfs_destroy_workqueue(fs_info->endio_workers);
btrfs_destroy_workqueue(fs_info->endio_raid56_workers); btrfs_destroy_workqueue(fs_info->endio_raid56_workers);
btrfs_destroy_workqueue(fs_info->rmw_workers); if (fs_info->rmw_workers)
destroy_workqueue(fs_info->rmw_workers);
btrfs_destroy_workqueue(fs_info->endio_write_workers); btrfs_destroy_workqueue(fs_info->endio_write_workers);
btrfs_destroy_workqueue(fs_info->endio_freespace_worker); btrfs_destroy_workqueue(fs_info->endio_freespace_worker);
btrfs_destroy_workqueue(fs_info->delayed_workers); btrfs_destroy_workqueue(fs_info->delayed_workers);
@ -2492,8 +2493,7 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info)
fs_info->endio_raid56_workers = fs_info->endio_raid56_workers =
btrfs_alloc_workqueue(fs_info, "endio-raid56", flags, btrfs_alloc_workqueue(fs_info, "endio-raid56", flags,
max_active, 4); max_active, 4);
fs_info->rmw_workers = fs_info->rmw_workers = alloc_workqueue("btrfs-rmw", flags, max_active);
btrfs_alloc_workqueue(fs_info, "rmw", flags, max_active, 2);
fs_info->endio_write_workers = fs_info->endio_write_workers =
btrfs_alloc_workqueue(fs_info, "endio-write", flags, btrfs_alloc_workqueue(fs_info, "endio-write", flags,
max_active, 2); max_active, 2);

29
fs/btrfs/raid56.c
View File

@ -88,7 +88,7 @@ struct btrfs_raid_bio {
/* /*
* for scheduling work in the helper threads * for scheduling work in the helper threads
*/ */
struct btrfs_work work; struct work_struct work;
/* /*
* bio list and bio_list_lock are used * bio list and bio_list_lock are used
@ -196,8 +196,8 @@ struct btrfs_raid_bio {
static int __raid56_parity_recover(struct btrfs_raid_bio *rbio); static int __raid56_parity_recover(struct btrfs_raid_bio *rbio);
static noinline void finish_rmw(struct btrfs_raid_bio *rbio); static noinline void finish_rmw(struct btrfs_raid_bio *rbio);
static void rmw_work(struct btrfs_work *work); static void rmw_work(struct work_struct *work);
static void read_rebuild_work(struct btrfs_work *work); static void read_rebuild_work(struct work_struct *work);
static int fail_bio_stripe(struct btrfs_raid_bio *rbio, struct bio *bio); static int fail_bio_stripe(struct btrfs_raid_bio *rbio, struct bio *bio);
static int fail_rbio_index(struct btrfs_raid_bio *rbio, int failed); static int fail_rbio_index(struct btrfs_raid_bio *rbio, int failed);
static void __free_raid_bio(struct btrfs_raid_bio *rbio); static void __free_raid_bio(struct btrfs_raid_bio *rbio);
@ -206,12 +206,12 @@ static int alloc_rbio_pages(struct btrfs_raid_bio *rbio);
static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,
int need_check); int need_check);
static void scrub_parity_work(struct btrfs_work *work); static void scrub_parity_work(struct work_struct *work);
static void start_async_work(struct btrfs_raid_bio *rbio, btrfs_func_t work_func) static void start_async_work(struct btrfs_raid_bio *rbio, work_func_t work_func)
{ {
btrfs_init_work(&rbio->work, work_func, NULL, NULL); INIT_WORK(&rbio->work, work_func);
btrfs_queue_work(rbio->bioc->fs_info->rmw_workers, &rbio->work); queue_work(rbio->bioc->fs_info->rmw_workers, &rbio->work);
} }
/* /*
@ -1745,7 +1745,7 @@ struct btrfs_plug_cb {
struct blk_plug_cb cb; struct blk_plug_cb cb;
struct btrfs_fs_info *info; struct btrfs_fs_info *info;
struct list_head rbio_list; struct list_head rbio_list;
struct btrfs_work work; struct work_struct work;
}; };
/* /*
@ -1813,7 +1813,7 @@ static void run_plug(struct btrfs_plug_cb *plug)
* if the unplug comes from schedule, we have to push the * if the unplug comes from schedule, we have to push the
* work off to a helper thread * work off to a helper thread
*/ */
static void unplug_work(struct btrfs_work *work) static void unplug_work(struct work_struct *work)
{ {
struct btrfs_plug_cb *plug; struct btrfs_plug_cb *plug;
plug = container_of(work, struct btrfs_plug_cb, work); plug = container_of(work, struct btrfs_plug_cb, work);
@ -1826,9 +1826,8 @@ static void btrfs_raid_unplug(struct blk_plug_cb *cb, bool from_schedule)
plug = container_of(cb, struct btrfs_plug_cb, cb); plug = container_of(cb, struct btrfs_plug_cb, cb);
if (from_schedule) { if (from_schedule) {
btrfs_init_work(&plug->work, unplug_work, NULL, NULL); INIT_WORK(&plug->work, unplug_work);
btrfs_queue_work(plug->info->rmw_workers, queue_work(plug->info->rmw_workers, &plug->work);
&plug->work);
return; return;
} }
run_plug(plug); run_plug(plug);
@ -2316,7 +2315,7 @@ int raid56_parity_recover(struct bio *bio, struct btrfs_io_context *bioc,
} }
static void rmw_work(struct btrfs_work *work) static void rmw_work(struct work_struct *work)
{ {
struct btrfs_raid_bio *rbio; struct btrfs_raid_bio *rbio;
@ -2324,7 +2323,7 @@ static void rmw_work(struct btrfs_work *work)
raid56_rmw_stripe(rbio); raid56_rmw_stripe(rbio);
} }
static void read_rebuild_work(struct btrfs_work *work) static void read_rebuild_work(struct work_struct *work)
{ {
struct btrfs_raid_bio *rbio; struct btrfs_raid_bio *rbio;
@ -2781,7 +2780,7 @@ finish:
validate_rbio_for_parity_scrub(rbio); validate_rbio_for_parity_scrub(rbio);
} }
static void scrub_parity_work(struct btrfs_work *work) static void scrub_parity_work(struct work_struct *work)
{ {
struct btrfs_raid_bio *rbio; struct btrfs_raid_bio *rbio;