From patchwork Mon Nov 25 19:46:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Zhou X-Patchwork-Id: 11260803 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4519B109A for ; Mon, 25 Nov 2019 19:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 266EB2075C for ; Mon, 25 Nov 2019 19:47:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574711247; bh=4nwyjM57SYkFwk5bopJ81x73VfKa480eeY+r/2HZ7bM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=z842vL349/OL5SsyxfCQu+ca8xjxf4MRrNX6e8cbh2UKTJnVWGrydJuWW1BzLIC1y m3aomk8L60VkmHiZPjEP4vS9FYcsT03H3/McoDg/lXQAdb7NCTFdTz4PgPnEeKw+eV Ab2nyS2Eg0rHfcgysLmrVWzng6RTdbQ2vvhyu1QM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727165AbfKYTrZ (ORCPT ); Mon, 25 Nov 2019 14:47:25 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:43261 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727146AbfKYTrY (ORCPT ); Mon, 25 Nov 2019 14:47:24 -0500 Received: by mail-qt1-f194.google.com with SMTP id q8so15921941qtr.10 for ; Mon, 25 Nov 2019 11:47:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=bB5FvP511krSBoiqaaHLMhl0zRayeVuowADZPIhNyco=; b=VPVVPkbYui541L58owAGNe9Z5GElhpcDzmhlIuNO3t1+I8au88h9gwWXVfj0gwA1lI E+iPb81aBabwZgeORLQn15p+znPRy+LfilJU9LKqPqXKBg1bCsUuRkzA7U/KFlPgGIzR TqTALIFFmrn1wnJA5/chZGDhobpkRpxwDq3aiRQ+1NcTXrfsSKeZshTxodp8QjXcXV9F 3iDCinPYvfj97XwNIR2Wpcq8QcjoADq+An7QDoojIVYAyFguYa4nxIhYbJqyYWIAtWYd VTXqcpio6jmxAAA39pkAnZqUcKBfWQZR6T8G+S0XJ9UT1xMyFvTUaRe75YRO2SgvBuJn C+aA== X-Gm-Message-State: APjAAAX4FB/B575FqHh6rCY4Z88FO9smCqgUA9sW5I0jhToqdgZ6GOG4 qJ+y0vb7SWrChdjn+Ov0OiU= X-Google-Smtp-Source: APXvYqxR63R03zyj3kOnOI6F5EHQg1Nh6WaU6gU170EKancoGx+lYV4nDzHNI669PM6P0bFV7eIJ0w== X-Received: by 2002:aed:2da5:: with SMTP id i34mr20544049qtd.218.1574711243356; Mon, 25 Nov 2019 11:47:23 -0800 (PST) Received: from dennisz-mbp.thefacebook.com ([163.114.130.128]) by smtp.gmail.com with ESMTPSA id o13sm4481033qto.96.2019.11.25.11.47.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Nov 2019 11:47:22 -0800 (PST) From: Dennis Zhou To: David Sterba , Chris Mason , Josef Bacik , Omar Sandoval Cc: kernel-team@fb.com, linux-btrfs@vger.kernel.org, Dennis Zhou Subject: [PATCH 14/22] btrfs: add bps discard rate limit Date: Mon, 25 Nov 2019 14:46:54 -0500 Message-Id: X-Mailer: git-send-email 2.13.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.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 --- fs/btrfs/ctree.h | 2 ++ fs/btrfs/discard.c | 18 ++++++++++++++++++ fs/btrfs/sysfs.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 78b970cfd108..303f000fe30a 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -467,10 +467,12 @@ struct btrfs_discard_ctl { spinlock_t lock; struct btrfs_block_group *block_group; struct list_head discard_list[BTRFS_NR_DISCARD_LISTS]; + u64 prev_discard; atomic_t discardable_extents; atomic64_t discardable_bytes; u32 delay; u32 iops_limit; + u64 bps_limit; }; /* delayed seq elem */ diff --git a/fs/btrfs/discard.c b/fs/btrfs/discard.c index ddd5cc303b1e..49e148a6a0ea 100644 --- a/fs/btrfs/discard.c +++ b/fs/btrfs/discard.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include "ctree.h" @@ -237,6 +238,19 @@ void btrfs_discard_schedule_work(struct btrfs_discard_ctl *discard_ctl, block_group = find_next_block_group(discard_ctl, now); if (block_group) { u32 delay = discard_ctl->delay; + u64 bps_limit = READ_ONCE(discard_ctl->bps_limit); + + /* + * A single delayed workqueue item is responsible for + * discarding, so we can manage the bytes rate limit by keeping + * track of the previous discard. + */ + if (bps_limit && discard_ctl->prev_discard) { + u64 bps_delay = div64_u64(discard_ctl->prev_discard * + MSEC_PER_SEC, bps_limit); + + delay = max_t(u64, delay, msecs_to_jiffies(bps_delay)); + } /* * This timeout is to hopefully prevent immediate discarding @@ -315,6 +329,8 @@ static void btrfs_discard_workfn(struct work_struct *work) btrfs_block_group_end(block_group), 0, true); + discard_ctl->prev_discard = trimmed; + /* Determine next steps for a block_group. */ if (block_group->discard_cursor >= btrfs_block_group_end(block_group)) { if (discard_state == BTRFS_DISCARD_BITMAPS) { @@ -511,10 +527,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->discardable_extents, 0); atomic64_set(&discard_ctl->discardable_bytes, 0); discard_ctl->delay = BTRFS_DISCARD_MAX_DELAY; discard_ctl->iops_limit = BTRFS_DISCARD_MAX_IOPS; + 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 043430ae3818..028081bdde6c 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -374,6 +374,36 @@ 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 = discard_to_fs_info(kobj); + + return snprintf(buf, PAGE_SIZE, "%llu\n", + READ_ONCE(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 = discard_to_fs_info(kobj); + struct btrfs_discard_ctl *discard_ctl = &fs_info->discard_ctl; + u64 bps_limit; + int ret; + + ret = kstrtou64(buf, 10, &bps_limit); + if (ret) + return -EINVAL; + + WRITE_ONCE(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 ssize_t btrfs_discardable_extents_show(struct kobject *kobj, struct kobj_attribute *a, char *buf) @@ -398,6 +428,7 @@ BTRFS_ATTR(discard, discardable_bytes, btrfs_discardable_bytes_show); static const struct attribute *discard_debug_attrs[] = { BTRFS_ATTR_PTR(discard, iops_limit), + BTRFS_ATTR_PTR(discard, bps_limit), BTRFS_ATTR_PTR(discard, discardable_extents), BTRFS_ATTR_PTR(discard, discardable_bytes), NULL,