From: Josef Bacik <josef@toxicpanda.com> To: hannes@cmpxchg.org, linux-mm@kvack.org, akpm@linux-foundation.org, jack@suse.cz, linux-fsdevel@vger.kernel.org, kernel-team@fb.com, linux-btrfs@vger.kernel.org Cc: Josef Bacik <jbacik@fb.com> Subject: [PATCH v3 04/10] writeback: convert the flexible prop stuff to bytes Date: Mon, 11 Dec 2017 16:55:29 -0500 [thread overview] Message-ID: <1513029335-5112-5-git-send-email-josef@toxicpanda.com> (raw) In-Reply-To: <1513029335-5112-1-git-send-email-josef@toxicpanda.com> From: Josef Bacik <jbacik@fb.com> The flexible proportions were all page based, but now that we are doing metadata writeout that can be smaller or larger than page size we need to account for this in bytes instead of number of pages. Signed-off-by: Josef Bacik <jbacik@fb.com> Reviewed-by: Jan Kara <jack@suse.cz> --- lib/flex_proportions.c | 2 +- mm/page-writeback.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c index 31003989d34a..fd95791a2c93 100644 --- a/lib/flex_proportions.c +++ b/lib/flex_proportions.c @@ -166,7 +166,7 @@ void fprop_fraction_single(struct fprop_global *p, /* * ---- PERCPU ---- */ -#define PROP_BATCH (8*(1+ilog2(nr_cpu_ids))) +#define PROP_BATCH (8*PAGE_SIZE*(1+ilog2(nr_cpu_ids))) int fprop_local_init_percpu(struct fprop_local_percpu *pl, gfp_t gfp) { diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e4563645749a..2a1994194cc1 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -574,11 +574,11 @@ static unsigned long wp_next_time(unsigned long cur_time) return cur_time; } -static void wb_domain_writeout_inc(struct wb_domain *dom, +static void wb_domain_writeout_add(struct wb_domain *dom, struct fprop_local_percpu *completions, - unsigned int max_prop_frac) + long bytes, unsigned int max_prop_frac) { - __fprop_inc_percpu_max(&dom->completions, completions, + __fprop_add_percpu_max(&dom->completions, completions, bytes, max_prop_frac); /* First event after period switching was turned off? */ if (unlikely(!dom->period_time)) { @@ -602,12 +602,12 @@ static inline void __wb_writeout_add(struct bdi_writeback *wb, long bytes) struct wb_domain *cgdom; __add_wb_stat(wb, WB_WRITTEN_BYTES, bytes); - wb_domain_writeout_inc(&global_wb_domain, &wb->completions, + wb_domain_writeout_add(&global_wb_domain, &wb->completions, bytes, wb->bdi->max_prop_frac); cgdom = mem_cgroup_wb_domain(wb); if (cgdom) - wb_domain_writeout_inc(cgdom, wb_memcg_completions(wb), + wb_domain_writeout_add(cgdom, wb_memcg_completions(wb), bytes, wb->bdi->max_prop_frac); } -- 2.7.5
WARNING: multiple messages have this Message-ID (diff)
From: Josef Bacik <josef@toxicpanda.com> To: hannes@cmpxchg.org, linux-mm@kvack.org, akpm@linux-foundation.org, jack@suse.cz, linux-fsdevel@vger.kernel.org, kernel-team@fb.com, linux-btrfs@vger.kernel.org Cc: Josef Bacik <jbacik@fb.com> Subject: [PATCH v3 04/10] writeback: convert the flexible prop stuff to bytes Date: Mon, 11 Dec 2017 16:55:29 -0500 [thread overview] Message-ID: <1513029335-5112-5-git-send-email-josef@toxicpanda.com> (raw) In-Reply-To: <1513029335-5112-1-git-send-email-josef@toxicpanda.com> From: Josef Bacik <jbacik@fb.com> The flexible proportions were all page based, but now that we are doing metadata writeout that can be smaller or larger than page size we need to account for this in bytes instead of number of pages. Signed-off-by: Josef Bacik <jbacik@fb.com> Reviewed-by: Jan Kara <jack@suse.cz> --- lib/flex_proportions.c | 2 +- mm/page-writeback.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c index 31003989d34a..fd95791a2c93 100644 --- a/lib/flex_proportions.c +++ b/lib/flex_proportions.c @@ -166,7 +166,7 @@ void fprop_fraction_single(struct fprop_global *p, /* * ---- PERCPU ---- */ -#define PROP_BATCH (8*(1+ilog2(nr_cpu_ids))) +#define PROP_BATCH (8*PAGE_SIZE*(1+ilog2(nr_cpu_ids))) int fprop_local_init_percpu(struct fprop_local_percpu *pl, gfp_t gfp) { diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e4563645749a..2a1994194cc1 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -574,11 +574,11 @@ static unsigned long wp_next_time(unsigned long cur_time) return cur_time; } -static void wb_domain_writeout_inc(struct wb_domain *dom, +static void wb_domain_writeout_add(struct wb_domain *dom, struct fprop_local_percpu *completions, - unsigned int max_prop_frac) + long bytes, unsigned int max_prop_frac) { - __fprop_inc_percpu_max(&dom->completions, completions, + __fprop_add_percpu_max(&dom->completions, completions, bytes, max_prop_frac); /* First event after period switching was turned off? */ if (unlikely(!dom->period_time)) { @@ -602,12 +602,12 @@ static inline void __wb_writeout_add(struct bdi_writeback *wb, long bytes) struct wb_domain *cgdom; __add_wb_stat(wb, WB_WRITTEN_BYTES, bytes); - wb_domain_writeout_inc(&global_wb_domain, &wb->completions, + wb_domain_writeout_add(&global_wb_domain, &wb->completions, bytes, wb->bdi->max_prop_frac); cgdom = mem_cgroup_wb_domain(wb); if (cgdom) - wb_domain_writeout_inc(cgdom, wb_memcg_completions(wb), + wb_domain_writeout_add(cgdom, wb_memcg_completions(wb), bytes, wb->bdi->max_prop_frac); } -- 2.7.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-12-11 21:55 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-11 21:55 [PATCH v3 00/11] Metadata specific accouting and dirty writeout Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 01/10] remove mapping from balance_dirty_pages*() Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 02/10] writeback: convert WB_WRITTEN/WB_DIRITED counters to bytes Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 03/10] lib: add a __fprop_add_percpu_max Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-19 7:25 ` Jan Kara 2017-12-11 21:55 ` Josef Bacik [this message] 2017-12-11 21:55 ` [PATCH v3 04/10] writeback: convert the flexible prop stuff to bytes Josef Bacik 2017-12-11 21:55 ` [PATCH v3 05/10] writeback: add counters for metadata usage Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-19 7:52 ` Jan Kara 2017-12-11 21:55 ` [PATCH v3 06/10] writeback: introduce super_operations->write_metadata Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 23:36 ` Dave Chinner 2017-12-11 23:36 ` Dave Chinner 2017-12-12 18:05 ` Josef Bacik 2017-12-12 18:05 ` Josef Bacik 2017-12-12 22:20 ` Dave Chinner 2017-12-12 22:20 ` Dave Chinner 2017-12-12 23:59 ` Josef Bacik 2017-12-12 23:59 ` Josef Bacik 2017-12-19 12:07 ` Jan Kara 2017-12-19 21:35 ` Dave Chinner 2017-12-20 14:30 ` Jan Kara 2018-01-02 16:13 ` Josef Bacik 2018-01-02 16:13 ` Josef Bacik 2018-01-03 2:32 ` Dave Chinner 2018-01-03 2:32 ` Dave Chinner 2018-01-03 13:59 ` Jan Kara 2018-01-03 13:59 ` Jan Kara 2018-01-03 15:49 ` Josef Bacik 2018-01-03 15:49 ` Josef Bacik 2018-01-03 16:26 ` Jan Kara 2018-01-03 16:26 ` Jan Kara 2018-01-03 16:29 ` Josef Bacik 2018-01-03 16:29 ` Josef Bacik 2018-01-29 9:06 ` Chandan Rajendra 2018-01-29 9:06 ` Chandan Rajendra 2018-09-28 8:37 ` Chandan Rajendra 2018-01-04 1:32 ` Dave Chinner 2018-01-04 1:32 ` Dave Chinner 2018-01-04 9:10 ` Jan Kara 2018-01-04 9:10 ` Jan Kara 2017-12-19 12:21 ` Jan Kara 2017-12-11 21:55 ` [PATCH v3 07/10] export radix_tree_iter_tag_set Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 08/10] Btrfs: kill the btree_inode Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 09/10] btrfs: rework end io for extent buffer reads Josef Bacik 2017-12-11 21:55 ` Josef Bacik 2017-12-11 21:55 ` [PATCH v3 10/10] btrfs: add NR_METADATA_BYTES accounting Josef Bacik 2017-12-11 21:55 ` Josef Bacik
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=1513029335-5112-5-git-send-email-josef@toxicpanda.com \ --to=josef@toxicpanda.com \ --cc=akpm@linux-foundation.org \ --cc=hannes@cmpxchg.org \ --cc=jack@suse.cz \ --cc=jbacik@fb.com \ --cc=kernel-team@fb.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.