GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 12:04:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Btrfs: Add a thread pool just for submit_bio

Browse source 
If a bio submission is after a lock holder waiting for the bio
on the work queue, it is possible to deadlock.  Move the bios
into their own pool.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2008-06-12 14:46:17 -04:00
parent df5b5520b2
commit 1cc127b5d1
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/btrfs/ctree.h
View file

@ -529,9 +529,13 @@ struct btrfs_fs_info {
* can run with FS locks held, and the writers may be waiting for * can run with FS locks held, and the writers may be waiting for
* those locks. We don't want ordering in the pending list to cause * those locks. We don't want ordering in the pending list to cause
* deadlocks, and so the two are serviced separately. * deadlocks, and so the two are serviced separately.
*
* A third pool does submit_bio to avoid deadlocking with the other
* two
*/ */
struct btrfs_workers workers; struct btrfs_workers workers;
struct btrfs_workers endio_workers; struct btrfs_workers endio_workers;
struct btrfs_workers submit_workers;
int thread_pool_size; int thread_pool_size;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)

4
fs/btrfs/disk-io.c
View file

@ -1233,8 +1233,10 @@ struct btrfs_root *open_ctree(struct super_block *sb,
* cannot dynamically grow. * cannot dynamically grow.
*/ */
btrfs_init_workers(&fs_info->workers, fs_info->thread_pool_size); btrfs_init_workers(&fs_info->workers, fs_info->thread_pool_size);
btrfs_init_workers(&fs_info->submit_workers, fs_info->thread_pool_size);
btrfs_init_workers(&fs_info->endio_workers, fs_info->thread_pool_size); btrfs_init_workers(&fs_info->endio_workers, fs_info->thread_pool_size);
btrfs_start_workers(&fs_info->workers, 1); btrfs_start_workers(&fs_info->workers, 1);
btrfs_start_workers(&fs_info->submit_workers, 1);
btrfs_start_workers(&fs_info->endio_workers, fs_info->thread_pool_size); btrfs_start_workers(&fs_info->endio_workers, fs_info->thread_pool_size);
@ -1343,6 +1345,7 @@ fail_sb_buffer:
extent_io_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->io_tree); extent_io_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->io_tree);
btrfs_stop_workers(&fs_info->workers); btrfs_stop_workers(&fs_info->workers);
btrfs_stop_workers(&fs_info->endio_workers); btrfs_stop_workers(&fs_info->endio_workers);
btrfs_stop_workers(&fs_info->submit_workers);
fail_iput: fail_iput:
iput(fs_info->btree_inode); iput(fs_info->btree_inode);
fail: fail:
@ -1597,6 +1600,7 @@ int close_ctree(struct btrfs_root *root)
btrfs_stop_workers(&fs_info->workers); btrfs_stop_workers(&fs_info->workers);
btrfs_stop_workers(&fs_info->endio_workers); btrfs_stop_workers(&fs_info->endio_workers);
btrfs_stop_workers(&fs_info->submit_workers);
iput(fs_info->btree_inode); iput(fs_info->btree_inode);
#if 0 #if 0

3
fs/btrfs/volumes.c
View file

@ -2112,7 +2112,8 @@ int schedule_bio(struct btrfs_root *root, struct btrfs_device *device,
spin_unlock(&device->io_lock); spin_unlock(&device->io_lock);
if (should_queue) if (should_queue)
btrfs_queue_worker(&root->fs_info->workers, &device->work); btrfs_queue_worker(&root->fs_info->submit_workers,
&device->work);
return 0; return 0;
} }