On Thu, Aug 07, 2014 at 03:36:14PM +0200, Michal Hocko wrote:
> On Mon 04-08-14 17:14:55, Johannes Weiner wrote:
> [...]
> > @@ -132,6 +137,19 @@ u64 res_counter_uncharge(struct res_counter *counter,
> > unsigned long val);
> > u64 res_counter_uncharge_until(struct res_counter *counter,
> > struct res_counter *top,
> > unsigned long val);
> > +
> > +static inline unsigned long long res_counter_high(struct res_counter *cnt)
>
> soft limit used res_counter_soft_limit_excess which has quite a long
> name but at least those two should be consistent.
That name is horrible and a result from "soft_limit" being completely
nondescriptive. I really see no point in trying to be consistent with
this stuff that we are trying hard to delete.
> > @@ -2621,6 +2621,20 @@ bypass:
> > done_restock:
> > if (batch > nr_pages)
> > refill_stock(memcg, batch - nr_pages);
> > +
> > + res = &memcg->res;
> > + while (res) {
> > + unsigned long long high = res_counter_high(res);
> > +
> > + if (high) {
> > + unsigned long high_pages = high >> PAGE_SHIFT;
> > + struct mem_cgroup *memcg;
> > +
> > + memcg = mem_cgroup_from_res_counter(res, res);
> > + mem_cgroup_reclaim(memcg, high_pages, gfp_mask, 0);
> > + }
> > + res = res->parent;
> > + }
> > done:
> > return ret;
> > }
>
> Why haven't you followed what we do for hard limit here?
I did.
> In my implementation I have the following:
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index a37465fcd8ae..6a797c740ea5 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2529,6 +2529,21 @@ static int memcg_cpu_hotplug_callback(struct
> notifier_block *nb,
> return NOTIFY_OK;
> }
>
> +static bool high_limit_excess(struct mem_cgroup *memcg,
> + struct mem_cgroup **memcg_over_limit)
> +{
> + struct mem_cgroup *parent = memcg;
> +
> + do {
> + if (res_counter_limit_excess(&parent->res, RES_HIGH_LIMIT)) {
> + *memcg_over_limit = parent;
> + return true;
> + }
> + } while ((parent = parent_mem_cgroup(parent)));
> +
> + return false;
> +}
> +
> static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
> unsigned int nr_pages)
> {
> @@ -2623,6 +2638,10 @@ bypass:
> goto retry;
>
> done_restock:
> + /* Throttle charger a bit if it is above high limit. */
> + if (high_limit_excess(memcg, &mem_over_limit))
> + mem_cgroup_reclaim(mem_over_limit, gfp_mask, flags);
This is not what the hard limit does.
The hard limit, by its nature, can only be exceeded at one level at a
time, so we try to charge, check the closest limit that was hit,
reclaim, then retry. This means we are reclaiming up the hierarchy to
enforce the hard limit on each level.
I do the same here: reclaim up the hierarchy to enforce the high limit
on each level.
Your proposal only reclaims the closest offender, leaving higher
hierarchy levels in excess.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
