Please ignore this patch with missing IRP, will re-post to the intro mail.
Am Mi., 27. Jan. 2021 um 14:24 Uhr schrieb Kai Krakow <kai@xxxxxxxxxxx>:
>
> This reverts commit 56b30770b27d54d68ad51eccc6d888282b568cee.
>
> With the btree using the system_wq, I seem to see a lot more desktop
> latency than I should. So let's revert this.
> ---
> drivers/md/bcache/bcache.h | 2 ++
> drivers/md/bcache/btree.c | 21 +++++++++++++++++++--
> drivers/md/bcache/super.c | 4 ++++
> 3 files changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
> index 1d57f48307e6..b1ed16c7a534 100644
> --- a/drivers/md/bcache/bcache.h
> +++ b/drivers/md/bcache/bcache.h
> @@ -1042,5 +1042,7 @@ void bch_debug_exit(void);
> void bch_debug_init(void);
> void bch_request_exit(void);
> int bch_request_init(void);
> +void bch_btree_exit(void);
> +int bch_btree_init(void);
>
> #endif /* _BCACHE_H */
> diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
> index 910df242c83d..952f022db5a5 100644
> --- a/drivers/md/bcache/btree.c
> +++ b/drivers/md/bcache/btree.c
> @@ -99,6 +99,8 @@
> #define PTR_HASH(c, k) \
> (((k)->ptr[0] >> c->bucket_bits) | PTR_GEN(k, 0))
>
> +static struct workqueue_struct *btree_io_wq;
> +
> #define insert_lock(s, b) ((b)->level <= (s)->lock)
>
>
> @@ -308,7 +310,7 @@ static void __btree_node_write_done(struct closure *cl)
> btree_complete_write(b, w);
>
> if (btree_node_dirty(b))
> - schedule_delayed_work(&b->work, 30 * HZ);
> + queue_delayed_work(btree_io_wq, &b->work, 30 * HZ);
>
> closure_return_with_destructor(cl, btree_node_write_unlock);
> }
> @@ -481,7 +483,7 @@ static void bch_btree_leaf_dirty(struct btree *b, atomic_t *journal_ref)
> BUG_ON(!i->keys);
>
> if (!btree_node_dirty(b))
> - schedule_delayed_work(&b->work, 30 * HZ);
> + queue_delayed_work(btree_io_wq, &b->work, 30 * HZ);
>
> set_btree_node_dirty(b);
>
> @@ -2764,3 +2766,18 @@ void bch_keybuf_init(struct keybuf *buf)
> spin_lock_init(&buf->lock);
> array_allocator_init(&buf->freelist);
> }
> +
> +void bch_btree_exit(void)
> +{
> + if (btree_io_wq)
> + destroy_workqueue(btree_io_wq);
> +}
> +
> +int __init bch_btree_init(void)
> +{
> + btree_io_wq = create_singlethread_workqueue("bch_btree_io");
> + if (!btree_io_wq)
> + return -ENOMEM;
> +
> + return 0;
> +}
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index 2047a9cccdb5..dc4fe7eeda81 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -2815,6 +2815,7 @@ static void bcache_exit(void)
> {
> bch_debug_exit();
> bch_request_exit();
> + bch_btree_exit();
> if (bcache_kobj)
> kobject_put(bcache_kobj);
> if (bcache_wq)
> @@ -2880,6 +2881,9 @@ static int __init bcache_init(void)
> if (!bcache_wq)
> goto err;
>
> + if (bch_btree_init())
> + goto err;
> +
> bch_journal_wq = alloc_workqueue("bch_journal", WQ_MEM_RECLAIM, 0);
> if (!bch_journal_wq)
> goto err;
> --
> 2.26.2
>
