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=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 A5FDBC433DB for ; Fri, 19 Mar 2021 23:34:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4EAAE61926 for ; Fri, 19 Mar 2021 23:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229708AbhCSXdm (ORCPT ); Fri, 19 Mar 2021 19:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229638AbhCSXd2 (ORCPT ); Fri, 19 Mar 2021 19:33:28 -0400 Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26A58C061761 for ; Fri, 19 Mar 2021 16:33:28 -0700 (PDT) Received: by mail-qk1-x72f.google.com with SMTP id u190so4719448qkd.6 for ; Fri, 19 Mar 2021 16:33:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=H5VdK/uIKMT1pp4iCjsWX5lLDmAK1g5zh8chc7mIlAc=; b=AY3pRnV72+SVoCn6bFK2m3d33V0kl3Xdda5vLh6PNQNNefCcAdDxuiD5hlz3URSd+i IVpfjCNBFk7l3OILp3flc1HpKr+lYJewEk2+hdkYf4Anssy+2hawzWNpfP0J4MipfB0G K8Zzp7g7MQNL6nWIRfRrOyvtsD0HLMAt8lC/cAY0WhmdMVriYj6dbDBOUzWsxbSW/Eer uUdcZ08zjwC4OLH1mQoBs6fBjJstKgjzJb9MLdJpa4cP/B0ZjhqjvY02td2/Xk+LcRDd nZckom5APFW679p2UegQaJ14GM8XCvZ2zQS9rWIqW79JELxZOtYzsV2e44iG9zbnfpgC uj+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=H5VdK/uIKMT1pp4iCjsWX5lLDmAK1g5zh8chc7mIlAc=; b=JfacYUwacfQ/HwjGYsWD0A82KrYf/cQyHxmaF0Q96oLLZRvEKEFuEXX1m+UlxBBAZt Gd0Cxkk4NrHJbh4wbkNmILuDi/2EEf+pvQnSCK2kFn/9ZbqWxJfnDpfRtsmX4b8hH7S3 d05MX4/1QGtQLJeLJLj08k1vmew08p1vUlrND+mEuX5im1oRRq2dECLEs238bSDeVw3n ylAUeC2MIrpi6O9RzY3OUd0IUr4E+JMUJ8T1xwTWZ2yKBR6uKikdyzn7oKIbBxWfa1pn zoanDzka3fAg3WqsyEDpI01bRduEo2kIDS25kiJzCpZbltJCQmNAuqk8ckGSMoUgfka9 btCA== X-Gm-Message-State: AOAM531ii3+ihYHrXQ8JuPYy5X5p3gp190b4E8RT/aoda6ZP4mjnDf69 jxfsgR0n0KJt8K5N3oKUdGvUaQ== X-Google-Smtp-Source: ABdhPJzSOdA+BZ4Cwwe9fFa3TylOFETyoXHTWal2DU9jC14FF6dLvr0K3mrLd/HkzIlioGc3Yeg0QQ== X-Received: by 2002:a37:a408:: with SMTP id n8mr1050785qke.6.1616196807028; Fri, 19 Mar 2021 16:33:27 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id e14sm5545018qka.56.2021.03.19.16.33.25 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Fri, 19 Mar 2021 16:33:26 -0700 (PDT) Date: Fri, 19 Mar 2021 16:33:14 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Johannes Weiner cc: Andrew Morton , Hugh Dickins , Shakeel Butt , Michal Hocko , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH 1/2] mm: memcontrol: don't allocate cgroup swap arrays when memcg is disabled In-Reply-To: <20210319054944.50048-1-hannes@cmpxchg.org> Message-ID: References: <20210319054944.50048-1-hannes@cmpxchg.org> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 19 Mar 2021, Johannes Weiner wrote: > Since commit 2d1c498072de ("mm: memcontrol: make swap tracking an > integral part of memory control"), the cgroup swap arrays are used to > track memory ownership at the time of swap readahead and swapoff, even > if swap space *accounting* has been turned off by the user via > swapaccount=0 (which sets cgroup_memory_noswap). > > However, the patch was overzealous: by simply dropping the > cgroup_memory_noswap conditionals in the swapon, swapoff and uncharge > path, it caused the cgroup arrays being allocated even when the memory > controller as a whole is disabled. This is a waste of that memory. > > Restore mem_cgroup_disabled() checks, implied previously by > cgroup_memory_noswap, in the swapon, swapoff, and swap_entry_free > callbacks. > > Fixes: 2d1c498072de ("mm: memcontrol: make swap tracking an integral part of memory control") > Reported-by: Hugh Dickins > Signed-off-by: Johannes Weiner Acked-by: Hugh Dickins Thanks for the memory! > --- > mm/memcontrol.c | 3 +++ > mm/swap_cgroup.c | 6 ++++++ > 2 files changed, 9 insertions(+) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 668d1d7c2645..49bdcf603af1 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -7101,6 +7101,9 @@ void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages) > struct mem_cgroup *memcg; > unsigned short id; > > + if (mem_cgroup_disabled()) > + return; > + > id = swap_cgroup_record(entry, 0, nr_pages); > rcu_read_lock(); > memcg = mem_cgroup_from_id(id); > diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c > index 7f34343c075a..08c3246f9269 100644 > --- a/mm/swap_cgroup.c > +++ b/mm/swap_cgroup.c > @@ -171,6 +171,9 @@ int swap_cgroup_swapon(int type, unsigned long max_pages) > unsigned long length; > struct swap_cgroup_ctrl *ctrl; > > + if (mem_cgroup_disabled()) > + return 0; > + > length = DIV_ROUND_UP(max_pages, SC_PER_PAGE); > array_size = length * sizeof(void *); > > @@ -206,6 +209,9 @@ void swap_cgroup_swapoff(int type) > unsigned long i, length; > struct swap_cgroup_ctrl *ctrl; > > + if (mem_cgroup_disabled()) > + return; > + > mutex_lock(&swap_cgroup_mutex); > ctrl = &swap_cgroup_ctrl[type]; > map = ctrl->map; > -- > 2.30.1