From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 1/5] btrfs: Factor out reada loop in __reada_start_machine
Date: Wed, 15 Jul 2020 13:48:46 +0300 [thread overview]
Message-ID: <20200715104850.19071-2-nborisov@suse.com> (raw)
In-Reply-To: <20200715104850.19071-1-nborisov@suse.com>
This is in preparation for moving fs_devices to proper lists.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
fs/btrfs/reada.c | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 243a2e44526e..aa9d24ed56d7 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -767,15 +767,14 @@ static void reada_start_machine_worker(struct btrfs_work *work)
kfree(rmw);
}
-static void __reada_start_machine(struct btrfs_fs_info *fs_info)
+
+/* Try to start up to 10k READA requests for a group of devices. */
+static int __reada_start_for_fsdevs(struct btrfs_fs_devices *fs_devices)
{
- struct btrfs_device *device;
- struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
u64 enqueued;
u64 total = 0;
- int i;
+ struct btrfs_device *device;
-again:
do {
enqueued = 0;
mutex_lock(&fs_devices->device_list_mutex);
@@ -787,6 +786,18 @@ static void __reada_start_machine(struct btrfs_fs_info *fs_info)
mutex_unlock(&fs_devices->device_list_mutex);
total += enqueued;
} while (enqueued && total < 10000);
+
+ return total;
+}
+
+static void __reada_start_machine(struct btrfs_fs_info *fs_info)
+{
+ struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
+ int i;
+ u64 enqueued = 0;
+
+again:
+ enqueued += __reada_start_for_fsdevs(fs_devices);
if (fs_devices->seed) {
fs_devices = fs_devices->seed;
goto again;
--
2.17.1
next prev parent reply other threads:[~2020-07-15 10:48 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 10:48 [PATCH 0/5] Convert seed devices to proper list API Nikolay Borisov
2020-07-15 10:48 ` Nikolay Borisov [this message]
2020-08-18 15:02 ` [PATCH 1/5] btrfs: Factor out reada loop in __reada_start_machine Josef Bacik
2020-08-29 15:06 ` Anand Jain
2020-08-31 12:24 ` David Sterba
2020-07-15 10:48 ` [PATCH 2/5] btrfs: Factor out loop logic from btrfs_free_extra_devids Nikolay Borisov
2020-07-15 12:32 ` kernel test robot
2020-07-15 12:39 ` Nikolay Borisov
2020-07-16 7:17 ` [PATCH v2] " Nikolay Borisov
2020-08-29 15:13 ` Anand Jain
2020-08-18 15:03 ` [PATCH 2/5] " Josef Bacik
2020-07-15 10:48 ` [PATCH 3/5] btrfs: Make close_fs_devices return void Nikolay Borisov
2020-08-18 15:05 ` Josef Bacik
2020-08-29 15:14 ` Anand Jain
2020-07-15 10:48 ` [PATCH 4/5] btrfs: Simplify setting/clearing fs_info to btrfs_fs_devices Nikolay Borisov
2020-08-18 15:08 ` Josef Bacik
2020-08-26 10:50 ` Anand Jain
2020-07-15 10:48 ` [PATCH 5/5] btrfs: Switch seed device to list api Nikolay Borisov
2020-07-15 13:14 ` kernel test robot
2020-07-16 7:25 ` [PATCH v2] " Nikolay Borisov
2020-08-18 15:19 ` Josef Bacik
2020-08-30 14:39 ` Anand Jain
2020-07-24 7:36 ` [PATCH 5/5] " Nikolay Borisov
2020-09-02 15:58 ` Anand Jain
2020-09-03 9:03 ` Nikolay Borisov
2020-09-03 9:33 ` Anand Jain
2020-09-10 16:28 ` David Sterba
2020-07-22 14:26 ` [PATCH 0/5] Convert seed devices to proper list API David Sterba
2020-07-23 8:02 ` Nikolay Borisov
2020-08-21 14:33 ` David Sterba
2020-08-17 19:19 ` Nikolay Borisov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200715104850.19071-2-nborisov@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox