Skip to content

btrfs: report congestion for NO_THRESHOLD workqueues #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eeea2222 wants to merge 1 commit into
base: 7.0/cachy
Choose a base branch
from
Draft

btrfs: report congestion for NO_THRESHOLD workqueues #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions fs/btrfs/async-thread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/freezer.h>
#include <linux/cpumask.h>
#include <trace/events/btrfs.h>
#include "async-thread.h"

Expand Down Expand Up @@ -59,14 +60,8 @@ struct btrfs_fs_info * __pure btrfs_work_owner(const struct btrfs_work *work)

bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq)
{
/*
* We could compare wq->pending with num_online_cpus()
* to support "thresh == NO_THRESHOLD" case, but it requires
* moving up atomic_inc/dec in thresh_queue/exec_hook. Let's
* postpone it until someone needs the support of that case.
*/
if (wq->thresh == NO_THRESHOLD)
return false;
return atomic_read(&wq->pending) > 2 * num_online_cpus();

return atomic_read(&wq->pending) > wq->thresh * 2;
}
Expand Down Expand Up @@ -154,8 +149,6 @@ struct btrfs_workqueue *btrfs_alloc_ordered_workqueue(
*/
static inline void thresh_queue_hook(struct btrfs_workqueue *wq)
{
if (wq->thresh == NO_THRESHOLD)
return;
atomic_inc(&wq->pending);
}

Expand All @@ -170,10 +163,11 @@ static inline void thresh_exec_hook(struct btrfs_workqueue *wq)
long pending;
bool need_change = false;

atomic_dec(&wq->pending);

if (wq->thresh == NO_THRESHOLD)
return;

atomic_dec(&wq->pending);
spin_lock(&wq->thres_lock);
/*
* Use wq->count to limit the calling frequency of
Expand Down