From: Dennis Zhou <dennis@kernel.org>
To: David Sterba <dsterba@suse.com>, Chris Mason <clm@fb.com>,
Josef Bacik <josef@toxicpanda.com>,
Omar Sandoval <osandov@osandov.com>
Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org,
Dennis Zhou <dennis@kernel.org>
Subject: [PATCH 11/19] btrfs: add bps discard rate limit
Date: Mon, 7 Oct 2019 16:17:42 -0400 [thread overview]
Message-ID: <17152a4b1f9a0719623af4ef98e5e8670dd70799.1570479299.git.dennis@kernel.org> (raw)
In-Reply-To: <cover.1570479299.git.dennis@kernel.org>
In-Reply-To: <cover.1570479299.git.dennis@kernel.org>
Provide an ability to rate limit based on mbps in addition to the iops
delay calculated from number of discardable extents.
Signed-off-by: Dennis Zhou <dennis@kernel.org>
---
fs/btrfs/ctree.h | 2 ++
fs/btrfs/discard.c | 11 +++++++++++
fs/btrfs/sysfs.c | 30 ++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index b0823961d049..e81f699347e0 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -447,10 +447,12 @@ struct btrfs_discard_ctl {
spinlock_t lock;
struct btrfs_block_group_cache *cache;
struct list_head discard_list[BTRFS_NR_DISCARD_LISTS];
+ u64 prev_discard;
atomic_t discard_extents;
atomic64_t discardable_bytes;
atomic_t delay;
atomic_t iops_limit;
+ atomic64_t bps_limit;
};
/* delayed seq elem */
diff --git a/fs/btrfs/discard.c b/fs/btrfs/discard.c
index c7afb5f8240d..072c73f48297 100644
--- a/fs/btrfs/discard.c
+++ b/fs/btrfs/discard.c
@@ -176,6 +176,13 @@ void btrfs_discard_schedule_work(struct btrfs_discard_ctl *discard_ctl,
cache = find_next_cache(discard_ctl, now);
if (cache) {
u64 delay = atomic_read(&discard_ctl->delay);
+ s64 bps_limit = atomic64_read(&discard_ctl->bps_limit);
+
+ if (bps_limit)
+ delay = max_t(u64, delay,
+ msecs_to_jiffies(MSEC_PER_SEC *
+ discard_ctl->prev_discard /
+ bps_limit));
if (now < cache->discard_delay)
delay = max_t(u64, delay,
@@ -213,6 +220,8 @@ static void btrfs_discard_workfn(struct work_struct *work)
btrfs_trim_block_group(cache, &trimmed, cache->discard_cursor,
btrfs_block_group_end(cache), 0, true);
+ discard_ctl->prev_discard = trimmed;
+
if (cache->discard_cursor >= btrfs_block_group_end(cache)) {
if (btrfs_discard_bitmaps(cache)) {
remove_from_discard_list(discard_ctl, cache);
@@ -324,10 +333,12 @@ void btrfs_discard_init(struct btrfs_fs_info *fs_info)
for (i = 0; i < BTRFS_NR_DISCARD_LISTS; i++)
INIT_LIST_HEAD(&discard_ctl->discard_list[i]);
+ discard_ctl->prev_discard = 0;
atomic_set(&discard_ctl->discard_extents, 0);
atomic64_set(&discard_ctl->discardable_bytes, 0);
atomic_set(&discard_ctl->delay, BTRFS_DISCARD_MAX_DELAY);
atomic_set(&discard_ctl->iops_limit, BTRFS_DISCARD_MAX_IOPS);
+ atomic64_set(&discard_ctl->bps_limit, 0);
}
void btrfs_discard_cleanup(struct btrfs_fs_info *fs_info)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index b9a62e470316..6fc4d644401b 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -522,10 +522,40 @@ static ssize_t btrfs_discard_iops_limit_store(struct kobject *kobj,
BTRFS_ATTR_RW(discard, iops_limit, btrfs_discard_iops_limit_show,
btrfs_discard_iops_limit_store);
+static ssize_t btrfs_discard_bps_limit_show(struct kobject *kobj,
+ struct kobj_attribute *a,
+ char *buf)
+{
+ struct btrfs_fs_info *fs_info = to_fs_info(kobj->parent);
+
+ return snprintf(buf, PAGE_SIZE, "%lld\n",
+ atomic64_read(&fs_info->discard_ctl.bps_limit));
+}
+
+static ssize_t btrfs_discard_bps_limit_store(struct kobject *kobj,
+ struct kobj_attribute *a,
+ const char *buf, size_t len)
+{
+ struct btrfs_fs_info *fs_info = to_fs_info(kobj->parent);
+ s64 bps_limit;
+ int ret;
+
+ ret = kstrtos64(buf, 10, &bps_limit);
+ if (ret || bps_limit < 0)
+ return -EINVAL;
+
+ atomic64_set(&fs_info->discard_ctl.bps_limit, bps_limit);
+
+ return len;
+}
+BTRFS_ATTR_RW(discard, bps_limit, btrfs_discard_bps_limit_show,
+ btrfs_discard_bps_limit_store);
+
static const struct attribute *discard_attrs[] = {
BTRFS_ATTR_PTR(discard, discard_extents),
BTRFS_ATTR_PTR(discard, discardable_bytes),
BTRFS_ATTR_PTR(discard, iops_limit),
+ BTRFS_ATTR_PTR(discard, bps_limit),
NULL,
};
--
2.17.1
next prev parent reply other threads:[~2019-10-07 20:18 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 20:17 [RFC PATCH 00/19] btrfs: async discard support Dennis Zhou
2019-10-07 20:17 ` [PATCH 01/19] bitmap: genericize percpu bitmap region iterators Dennis Zhou
2019-10-07 20:26 ` Josef Bacik
2019-10-07 22:24 ` Dennis Zhou
2019-10-15 12:11 ` David Sterba
2019-10-15 18:35 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 02/19] btrfs: rename DISCARD opt to DISCARD_SYNC Dennis Zhou
2019-10-07 20:27 ` Josef Bacik
2019-10-08 11:12 ` Johannes Thumshirn
2019-10-11 9:19 ` Nikolay Borisov
2019-10-07 20:17 ` [PATCH 03/19] btrfs: keep track of which extents have been discarded Dennis Zhou
2019-10-07 20:37 ` Josef Bacik
2019-10-07 22:38 ` Dennis Zhou
2019-10-10 13:40 ` Josef Bacik
2019-10-11 16:15 ` Dennis Zhou
2019-10-08 12:46 ` Nikolay Borisov
2019-10-11 16:08 ` Dennis Zhou
2019-10-15 12:17 ` David Sterba
2019-10-15 19:58 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 04/19] btrfs: keep track of cleanliness of the bitmap Dennis Zhou
2019-10-10 14:16 ` Josef Bacik
2019-10-11 16:17 ` Dennis Zhou
2019-10-15 12:23 ` David Sterba
2019-10-07 20:17 ` [PATCH 05/19] btrfs: add the beginning of async discard, discard workqueue Dennis Zhou
2019-10-10 14:38 ` Josef Bacik
2019-10-15 12:49 ` David Sterba
2019-10-15 19:57 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 06/19] btrfs: handle empty block_group removal Dennis Zhou
2019-10-10 15:00 ` Josef Bacik
2019-10-11 16:52 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 07/19] btrfs: discard one region at a time in async discard Dennis Zhou
2019-10-10 15:22 ` Josef Bacik
2019-10-14 19:42 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 08/19] btrfs: track discardable extents for asnyc discard Dennis Zhou
2019-10-10 15:36 ` Josef Bacik
2019-10-14 19:50 ` Dennis Zhou
2019-10-15 13:12 ` David Sterba
2019-10-15 18:41 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 09/19] btrfs: keep track of discardable_bytes Dennis Zhou
2019-10-10 15:38 ` Josef Bacik
2019-10-07 20:17 ` [PATCH 10/19] btrfs: calculate discard delay based on number of extents Dennis Zhou
2019-10-10 15:41 ` Josef Bacik
2019-10-11 18:07 ` Dennis Zhou
2019-10-07 20:17 ` Dennis Zhou [this message]
2019-10-10 15:47 ` [PATCH 11/19] btrfs: add bps discard rate limit Josef Bacik
2019-10-14 19:56 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 12/19] btrfs: limit max discard size for async discard Dennis Zhou
2019-10-10 16:16 ` Josef Bacik
2019-10-14 19:57 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 13/19] btrfs: have multiple discard lists Dennis Zhou
2019-10-10 16:51 ` Josef Bacik
2019-10-14 20:04 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 14/19] btrfs: only keep track of data extents for async discard Dennis Zhou
2019-10-10 16:53 ` Josef Bacik
2019-10-07 20:17 ` [PATCH 15/19] btrfs: load block_groups into discard_list on mount Dennis Zhou
2019-10-10 17:11 ` Josef Bacik
2019-10-14 20:17 ` Dennis Zhou
2019-10-14 23:38 ` David Sterba
2019-10-15 15:42 ` Dennis Zhou
2019-10-07 20:17 ` [PATCH 16/19] btrfs: keep track of discard reuse stats Dennis Zhou
2019-10-10 17:13 ` Josef Bacik
2019-10-07 20:17 ` [PATCH 17/19] btrfs: add async discard header Dennis Zhou
2019-10-10 17:13 ` Josef Bacik
2019-10-07 20:17 ` [PATCH 18/19] btrfs: increase the metadata allowance for the free_space_cache Dennis Zhou
2019-10-10 17:16 ` Josef Bacik
2019-10-07 20:17 ` [PATCH 19/19] btrfs: make smaller extents more likely to go into bitmaps Dennis Zhou
2019-10-10 17:17 ` Josef Bacik
2019-10-11 7:49 ` [RFC PATCH 00/19] btrfs: async discard support Nikolay Borisov
2019-10-14 21:05 ` Dennis Zhou
2019-10-15 12:08 ` David Sterba
2019-10-15 15:41 ` Dennis Zhou
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=17152a4b1f9a0719623af4ef98e5e8670dd70799.1570479299.git.dennis@kernel.org \
--to=dennis@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=osandov@osandov.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).