From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B158C433DB for ; Fri, 12 Feb 2021 17:03:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 54CC564E05 for ; Fri, 12 Feb 2021 17:03:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229957AbhBLRDM (ORCPT ); Fri, 12 Feb 2021 12:03:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbhBLRDB (ORCPT ); Fri, 12 Feb 2021 12:03:01 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18B38C061786 for ; Fri, 12 Feb 2021 09:02:21 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id d15so175111plh.4 for ; Fri, 12 Feb 2021 09:02:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bcYt0NSihifXZf17H55Cj5Hl2GUjQyX5Z/whSKEEhxI=; b=QXdiNtz4icRE9wYOkzwNj/MEYjknOPfl+3qraA/tVpTL1yVUQ1uW/Egvq3zevZw11m 20DnFlwvQipf18yyHzSbhvGpWQ214vwvIYstobFglcVWyBKXAYFVQKqdebGoExkRRSK5 eiQft2Jyww09TKCwpm9fRe6tkSks1kczSXEdcv/laOSq5Cy74ohKIYxLVjPANARtpaLa liZ+acD0FILIz+lrXrA0/L9tZrDVhVAsNAGcQONgLpjgPGdqpzEP9NdCgVeVK6fjDxQo CXm7xNS6alE/sydQVkPcpDYcXQZrJZE64mOIICrRUaLwpDpPS5NX11mhQxdktolhNWPw vO4w== 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:mime-version:content-transfer-encoding; bh=bcYt0NSihifXZf17H55Cj5Hl2GUjQyX5Z/whSKEEhxI=; b=CanxP993SxcC/jhtbkYOelxg2F+JqKvUSKk45XxIqXhdjinHtvLUy2eTUY1d6Ow3TV BeHy2k9R1kjt+X0rZk4Ggeit4XTeyjpz/OQSQRXT1Is3GpmnYtIr48N2sZAsWOzhiR36 EqieQOCpdaakUuzFnPg8K0gzT8zw0aK5/+MEzJ3ykJIkZbBr4oxivzlVLMRT3JbI2lx+ D7prQKbDHcYCc2CK6krK9klWNfIt2CZ9z8yk7iKuQWTEuWeBirjah0cizR5qeTKyPNca co9vH2v2IcIusJpeWgKlQvrK2P8aaFAPIECBFZgfZnkk9DzWSvIoiAtnyUMxAF217k7B uhbg== X-Gm-Message-State: AOAM531Df0vjFvvTaKNbGQTUb98Mz1demqxOowRtC+v73LS94Fq8adOo mXd6TUrh0EcYk2rJeCUuhDnzlw== X-Google-Smtp-Source: ABdhPJy3fzcN97TILH5Pd2p9CjYCM+6s/EotNHOwcpsaLTt2cNdlvuafFJYbAs//bwycN8+3HlIfWA== X-Received: by 2002:a17:903:31c4:b029:e1:8840:8ab9 with SMTP id v4-20020a17090331c4b02900e188408ab9mr3441164ple.70.1613149340708; Fri, 12 Feb 2021 09:02:20 -0800 (PST) Received: from localhost.bytedance.net ([139.177.225.254]) by smtp.gmail.com with ESMTPSA id e21sm9317815pgv.74.2021.02.12.09.02.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Feb 2021 09:02:19 -0800 (PST) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, vdavydov.dev@gmail.com, akpm@linux-foundation.org Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH 2/4] mm: memcontrol: add missing memcg_oom_recover() when uncharge slab page Date: Sat, 13 Feb 2021 01:01:57 +0800 Message-Id: <20210212170159.32153-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210212170159.32153-1-songmuchun@bytedance.com> References: <20210212170159.32153-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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). Signed-off-by: Muchun Song --- 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); + 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