On Sat 13-02-21 01:01:57, Muchun Song wrote:
> When we uncharge a page, we wake up oom victims when the memcg oom
> handling is outsourced to the userspace. The uncharge_batch do that
> for normal and kmem pages but not slab pages. It is likely an
> omission. So add the missing memcg_oom_recover() to
> __memcg_kmem_uncharge(). And the function of memory.oom_control
> is only suitable for cgroup v1. So guard this test (memcg->under_oom)
> by the cgroup_subsys_on_dfl(memory_cgrp_subsys).
User visible effects please? I believe there are unlikely any. I do not
have any data at hands but I would expect that slab pages freeing
wouldn't really contribute much to help a memcg out of oom without an
external intervention for oom_disabled case. If that is the case then
make it explicit to the changelog. If you have workloads which do see a
suboptimal behavior then please mention that as well. This is important
for future readers to understand the code and motivation behind it.
Also, now I guess I can see why you have decided to not do cgroup v2
check directly in memcg_oom_recover. You do not want to repeat the check
in paths which already do do check for you. That is fine. Appart from
the uncharging path, none of the others is really a hot path so this is
likely a reasonable decision.
I have a minor comment below.
> Signed-off-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
> ---
> mm/memcontrol.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 7afca9677693..a3f26522765a 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -3126,8 +3126,10 @@ static int __memcg_kmem_charge(struct mem_cgroup *memcg, gfp_t gfp,
> */
> static void __memcg_kmem_uncharge(struct mem_cgroup *memcg, unsigned int nr_pages)
> {
> - if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
> + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) {
> page_counter_uncharge(&memcg->kmem, nr_pages);
> + memcg_oom_recover(memcg);
> + }
>
> refill_stock(memcg, nr_pages);
> }
> @@ -6806,11 +6808,15 @@ static void uncharge_batch(const struct uncharge_gather *ug)
>
> if (!mem_cgroup_is_root(ug->memcg)) {
> page_counter_uncharge(&ug->memcg->memory, ug->nr_pages);
> - if (do_memsw_account())
> - page_counter_uncharge(&ug->memcg->memsw, ug->nr_pages);
> - if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && ug->nr_kmem)
> - page_counter_uncharge(&ug->memcg->kmem, ug->nr_kmem);
> - memcg_oom_recover(ug->memcg);
> + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) {
> + if (!cgroup_memory_noswap)
> + page_counter_uncharge(&ug->memcg->memsw,
> + ug->nr_pages);
This is functionally equivalent but I am not sure this will make a
further maintainability easier. do_memsw_account check is used at many
other places and it is a general helper which you have split into its
current implementation. This makes any future changes more tricky. Is
this miro-optimization worth it?
> + if (ug->nr_kmem)
> + page_counter_uncharge(&ug->memcg->kmem,
> + ug->nr_kmem);
> + memcg_oom_recover(ug->memcg);
> + }
> }
>
> local_irq_save(flags);
> --
> 2.11.0
--
Michal Hocko
SUSE Labs
