From: Michal Rostecki <mrostecki@suse.de>
To: Chris Mason <clm@fb.com>, Josef Bacik <josef@toxicpanda.com>,
David Sterba <dsterba@suse.com>,
linux-btrfs@vger.kernel.org (open list:BTRFS FILE SYSTEM),
linux-kernel@vger.kernel.org (open list)
Cc: Michal Rostecki <mrostecki@suse.com>
Subject: [PATCH RFC 1/6] btrfs: Add inflight BIO request counter
Date: Tue, 9 Feb 2021 21:30:35 +0100 [thread overview]
Message-ID: <20210209203041.21493-2-mrostecki@suse.de> (raw)
In-Reply-To: <20210209203041.21493-1-mrostecki@suse.de>
From: Michal Rostecki <mrostecki@suse.com>
Add a per-CPU inflight BIO counter to btrfs_device which stores the
number of requests currently processed by the device. This information
is going to be used in roundrobin raid1 read policy.
Signed-off-by: Michal Rostecki <mrostecki@suse.com>
---
fs/btrfs/volumes.c | 11 +++++++++--
fs/btrfs/volumes.h | 3 +++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3948f5b50d11..d4f452dcce95 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -376,6 +376,7 @@ void btrfs_free_device(struct btrfs_device *device)
extent_io_tree_release(&device->alloc_state);
bio_put(device->flush_bio);
btrfs_destroy_dev_zone_info(device);
+ percpu_counter_destroy(&device->inflight);
kfree(device);
}
@@ -439,6 +440,11 @@ static struct btrfs_device *__alloc_device(struct btrfs_fs_info *fs_info)
extent_io_tree_init(fs_info, &dev->alloc_state,
IO_TREE_DEVICE_ALLOC_STATE, NULL);
+ if (percpu_counter_init(&dev->inflight, 0, GFP_KERNEL)) {
+ kfree(dev);
+ return ERR_PTR(-ENOMEM);
+ }
+
return dev;
}
@@ -6305,6 +6311,7 @@ static inline void btrfs_end_bbio(struct btrfs_bio *bbio, struct bio *bio)
static void btrfs_end_bio(struct bio *bio)
{
+ struct btrfs_device *dev = btrfs_io_bio(bio)->device;
struct btrfs_bio *bbio = bio->bi_private;
int is_orig_bio = 0;
@@ -6312,8 +6319,6 @@ static void btrfs_end_bio(struct bio *bio)
atomic_inc(&bbio->error);
if (bio->bi_status == BLK_STS_IOERR ||
bio->bi_status == BLK_STS_TARGET) {
- struct btrfs_device *dev = btrfs_io_bio(bio)->device;
-
ASSERT(dev->bdev);
if (bio_op(bio) == REQ_OP_WRITE)
btrfs_dev_stat_inc_and_print(dev,
@@ -6331,6 +6336,7 @@ static void btrfs_end_bio(struct bio *bio)
is_orig_bio = 1;
btrfs_bio_counter_dec(bbio->fs_info);
+ percpu_counter_dec(&dev->inflight);
if (atomic_dec_and_test(&bbio->stripes_pending)) {
if (!is_orig_bio) {
@@ -6375,6 +6381,7 @@ static void submit_stripe_bio(struct btrfs_bio *bbio, struct bio *bio,
bio_set_dev(bio, dev->bdev);
btrfs_bio_counter_inc_noblocked(fs_info);
+ percpu_counter_inc(&dev->inflight);
btrfsic_submit_bio(bio);
}
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 04e2b26823c2..938c5292250c 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -143,6 +143,9 @@ struct btrfs_device {
struct completion kobj_unregister;
/* For sysfs/FSID/devinfo/devid/ */
struct kobject devid_kobj;
+
+ /* I/O stats for raid1 mirror selection */
+ struct percpu_counter inflight;
};
/*
--
2.30.0
next prev parent reply other threads:[~2021-02-09 23:56 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 20:30 [PATCH RFC 0/6] Add roundrobin raid1 read policy Michal Rostecki
2021-02-09 20:30 ` Michal Rostecki [this message]
2021-02-09 20:30 ` [PATCH RFC 2/6] btrfs: Store the last device I/O offset Michal Rostecki
2021-02-09 20:30 ` [PATCH RFC 3/6] btrfs: Add stripe_physical function Michal Rostecki
2021-02-09 20:30 ` [PATCH RFC 4/6] btrfs: Check if the filesystem is has mixed type of devices Michal Rostecki
2021-02-10 4:08 ` Michał Mirosław
2021-02-10 12:50 ` Michal Rostecki
2021-02-12 18:26 ` Michal Rostecki
2021-02-12 23:36 ` Michał Mirosław
2021-02-15 14:40 ` Michal Rostecki
2021-02-10 10:09 ` Filipe Manana
2021-02-10 12:55 ` Michal Rostecki
2021-02-09 20:30 ` [PATCH RFC 5/6] btrfs: sysfs: Add directory for read policies Michal Rostecki
2021-02-13 10:19 ` Greg KH
2021-02-15 14:35 ` Michal Rostecki
2021-02-15 14:59 ` Greg KH
2021-02-09 20:30 ` [PATCH RFC 6/6] btrfs: Add roundrobin raid1 read policy Michal Rostecki
2021-02-10 4:24 ` Michał Mirosław
2021-02-10 12:29 ` Michal Rostecki
2021-02-10 12:58 ` Michał Mirosław
2021-02-10 19:23 ` Michal Rostecki
2021-02-11 2:27 ` Michał Mirosław
2021-02-11 12:35 ` Michal Rostecki
2021-02-10 8:20 ` Anand Jain
2021-02-11 15:55 ` Michal Rostecki
2021-02-12 17:12 ` Michal Rostecki
2021-02-10 6:52 ` [PATCH RFC 0/6] " Anand Jain
2021-02-10 12:18 ` Michal Rostecki
2021-02-10 14:00 ` Michal Rostecki
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=20210209203041.21493-2-mrostecki@suse.de \
--to=mrostecki@suse.de \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mrostecki@suse.com \
/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;
as well as URLs for NNTP newsgroup(s).