From: Jakub Kicinski <kuba@kernel.org>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, kernel-team@fb.com, tj@kernel.org,
hannes@cmpxchg.org, chris@chrisdown.name,
cgroups@vger.kernel.org, shakeelb@google.com, mhocko@kernel.org,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH mm v4 2/4] mm: move penalty delay clamping out of calculate_high_delay()
Date: Tue, 19 May 2020 10:19:36 -0700 [thread overview]
Message-ID: <20200519171938.3569605-3-kuba@kernel.org> (raw)
In-Reply-To: <20200519171938.3569605-1-kuba@kernel.org>
We will want to call calculate_high_delay() twice - once for
memory and once for swap, and we should apply the clamp value
to sum of the penalties. Clamping has to be applied outside
of calculate_high_delay().
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
mm/memcontrol.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 0d05e6a593f5..dd8605a9137a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2367,14 +2367,7 @@ static unsigned long calculate_high_delay(struct mem_cgroup *memcg,
* MEMCG_CHARGE_BATCH pages is nominal, so work out how much smaller or
* larger the current charge patch is than that.
*/
- penalty_jiffies = penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
-
- /*
- * Clamp the max delay per usermode return so as to still keep the
- * application moving forwards and also permit diagnostics, albeit
- * extremely slowly.
- */
- return min(penalty_jiffies, MEMCG_MAX_HIGH_DELAY_JIFFIES);
+ return penalty_jiffies * nr_pages / MEMCG_CHARGE_BATCH;
}
/*
@@ -2402,6 +2395,13 @@ void mem_cgroup_handle_over_high(void)
penalty_jiffies = calculate_high_delay(memcg, nr_pages,
mem_find_max_overage(memcg));
+ /*
+ * Clamp the max delay per usermode return so as to still keep the
+ * application moving forwards and also permit diagnostics, albeit
+ * extremely slowly.
+ */
+ penalty_jiffies = min(penalty_jiffies, MEMCG_MAX_HIGH_DELAY_JIFFIES);
+
/*
* Don't sleep if the amount of jiffies this memcg owes us is so low
* that it's not even worth doing, in an attempt to be nice to those who
--
2.25.4
next prev parent reply other threads:[~2020-05-19 17:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 17:19 [PATCH mm v4 0/4] memcg: Slow down swap allocation as the available space gets depleted Jakub Kicinski
2020-05-19 17:19 ` [PATCH mm v4 1/4] mm: prepare for swap over-high accounting and penalty calculation Jakub Kicinski
2020-05-20 1:38 ` Shakeel Butt
2020-05-19 17:19 ` Jakub Kicinski [this message]
2020-05-20 1:40 ` [PATCH mm v4 2/4] mm: move penalty delay clamping out of calculate_high_delay() Shakeel Butt
2020-05-19 17:19 ` [PATCH mm v4 3/4] mm: move cgroup high memory limit setting into struct page_counter Jakub Kicinski
2020-05-19 22:15 ` Shakeel Butt
2020-05-19 23:14 ` Jakub Kicinski
2020-05-20 0:21 ` Shakeel Butt
2020-05-19 17:19 ` [PATCH mm v4 4/4] mm: automatically penalize tasks with high swap use Jakub Kicinski
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=20200519171938.3569605-3-kuba@kernel.org \
--to=kuba@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=chris@chrisdown.name \
--cc=hannes@cmpxchg.org \
--cc=kernel-team@fb.com \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=shakeelb@google.com \
--cc=tj@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;
as well as URLs for NNTP newsgroup(s).