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=-15.9 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 0824BC433E3 for ; Thu, 21 May 2020 20:06:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5BF8207D3 for ; Thu, 21 May 2020 20:06:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Fome3a6t" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbgEUUGe (ORCPT ); Thu, 21 May 2020 16:06:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729446AbgEUUGe (ORCPT ); Thu, 21 May 2020 16:06:34 -0400 Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E56AEC061A0F for ; Thu, 21 May 2020 13:06:33 -0700 (PDT) Received: by mail-oi1-x243.google.com with SMTP id y85so7248143oie.11 for ; Thu, 21 May 2020 13:06:33 -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=Q6rxcBNQ1zsmubc3wyT3H/0+GkcW6r2VdtQUO7eVpuM=; b=Fome3a6tpm2IBqz3WvlZB/B1A/bMjQGR4Zj3VuvRR2fGI5zsqnypeM4EFXp7Zf/dkf +TfItzJkD9hawgb5bm56vbw/g3jnHiB3MwuunQxVQjjZPIBQa+DE+UeLxTQdkjyeyK9E x9CwJpKLbls0MHOlo3DaVuOy9Q7wDf57b/LcBKb7miliwlmT1d2yLr9Al0TiVh3Cz84s WtKQPSMPPIYL4P/iG+aJez3B20kIsGbSVnjHdAVcDONHn6cMfLgdb1vknLDIxjVEPS/R 9Kd1gWxXLudP3tpFVm0rQ1Rfv/WcdUi26P5BKq6QVYrtI8P/sdU9Laq+iPU2tKeNmFe+ S5cg== 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=Q6rxcBNQ1zsmubc3wyT3H/0+GkcW6r2VdtQUO7eVpuM=; b=p2zVrvwk78HG6/fPsGzFvDFChxh2tiqhigWzusxQlLubBBm3u72t9COJ2b+wMO+wD6 47bFq8Rjgxry/nXy3BwWpR3fraVxtwJLjpPuMT+H4+oF6nolnpJkfSWpHg6lfhEOSh1m 5FS5+Dp0/4rd5/LpNtQH0VcVukWZxBYbMAGhp6EmHy6ut30XR5aqLK3v4Df5xQj/t7a5 dlwUwKhaw3Q/rQ0OHpXf5ULIaD2De0u3yvu5wNlPsj2ygMvFdirEjU03nx8M/403hIye A/30IhFZl9gJ1DG3m6Rj8+7ReQFVb/0aco8+nbOwqrpTTeNkYUsbcuVP5B165RKOly4Q F9Eg== X-Gm-Message-State: AOAM5332iRQJIh/UG6DFIZYz1atzgQ7zsKC97O5W+2THLOmcQ9WNQbtg 2k7hnxso0RylMWGcBQrnveVlZg== X-Google-Smtp-Source: ABdhPJyurkLvqoLB0FS3u7uDnzUJ3zFnGkEHZFMCyOcuHt/P1JS+m1iswp90fepgyFfu89MnmgrFtQ== X-Received: by 2002:aca:3bc3:: with SMTP id i186mr193576oia.122.1590091592807; Thu, 21 May 2020 13:06:32 -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 y23sm1861280otk.10.2020.05.21.13.06.30 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Thu, 21 May 2020 13:06:31 -0700 (PDT) Date: Thu, 21 May 2020 13:06:28 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Johannes Weiner cc: Michal Hocko , Hugh Dickins , Naresh Kamboju , Chris Down , Yafang Shao , Anders Roxell , "Linux F2FS DEV, Mailing List" , linux-ext4 , linux-block , Andrew Morton , open list , Linux-Next Mailing List , linux-mm , Arnd Bergmann , Andreas Dilger , Jaegeuk Kim , Theodore Ts'o , Chao Yu , Andrea Arcangeli , Matthew Wilcox , Chao Yu , lkft-triage@lists.linaro.org, Roman Gushchin , Cgroups Subject: Re: mm: mkfs.ext4 invoked oom-killer on i386 - pagecache_get_page In-Reply-To: <20200521191746.GB815980@cmpxchg.org> Message-ID: References: <20200519084535.GG32497@dhcp22.suse.cz> <20200520190906.GA558281@chrisdown.name> <20200521095515.GK6462@dhcp22.suse.cz> <20200521105801.GL6462@dhcp22.suse.cz> <20200521124444.GP6462@dhcp22.suse.cz> <20200521191746.GB815980@cmpxchg.org> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Thu, 21 May 2020, Johannes Weiner wrote: > > Very much appreciate you guys tracking it down so quickly. Sorry about > the breakage. > > I think mem_cgroup_disabled() checks are pretty good markers of public > entry points to the memcg API, so I'd prefer that even if a bit more > verbose. What do you think? An explicit mem_cgroup_disabled() check would be fine, but I must admit, the patch below is rather too verbose for my own taste. Your call. > > --- > From cd373ec232942a9bc43ee5e7d2171352019a58fb Mon Sep 17 00:00:00 2001 > From: Hugh Dickins > Date: Thu, 21 May 2020 14:58:36 -0400 > Subject: [PATCH] mm: memcontrol: prepare swap controller setup for integration > fix > > Fix crash with cgroup_disable=memory: > > > > > > + mkfs -t ext4 /dev/disk/by-id/ata-TOSHIBA_MG04ACA100N_Y8NRK0BPF6XF > > > > > mke2fs 1.43.8 (1-Jan-2018) > > > > > Creating filesystem with 244190646 4k blocks and 61054976 inodes > > > > > Filesystem UUID: 3bb1a285-2cb4-44b4-b6e8-62548f3ac620 > > > > > Superblock backups stored on blocks: > > > > > 32768, 98304, 163840, 229376, 294912, 819200, 884736, 1605632, 2654208, > > > > > 4096000, 7962624, 11239424, 20480000, 23887872, 71663616, 78675968, > > > > > 102400000, 214990848 > > > > > Allocating group tables: 0/7453 done > > > > > Writing inode tables: 0/7453 done > > > > > Creating journal (262144 blocks): [ 35.502102] BUG: kernel NULL > > > > > pointer dereference, address: 000000c8 > > > > > [ 35.508372] #PF: supervisor read access in kernel mode > > > > > [ 35.513506] #PF: error_code(0x0000) - not-present page > > > > > [ 35.518638] *pde = 00000000 > > > > > [ 35.521514] Oops: 0000 [#1] SMP > > > > > [ 35.524652] CPU: 0 PID: 145 Comm: kswapd0 Not tainted > > > > > 5.7.0-rc6-next-20200519+ #1 > > > > > [ 35.532121] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS > > > > > 2.2 05/23/2018 > > > > > [ 35.539507] EIP: mem_cgroup_get_nr_swap_pages+0x28/0x60 > > do_memsw_account() used to be automatically false when the cgroup > controller was disabled. Now that it's replaced by > cgroup_memory_noswap, for which this isn't true, make the > mem_cgroup_disabled() checks explicit in the swap control API. > > [hannes@cmpxchg.org: use mem_cgroup_disabled() in all API functions] > Reported-by: Naresh Kamboju > Debugged-by: Hugh Dickins > Debugged-by: Michal Hocko > Signed-off-by: Johannes Weiner > --- > mm/memcontrol.c | 47 +++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 41 insertions(+), 6 deletions(-) I'm certainly not against a mem_cgroup_disabled() check in the only place that's been observed to need it, as a fixup to merge into your original patch; but this seems rather an over-reaction - and I'm a little surprised that setting mem_cgroup_disabled() doesn't just force cgroup_memory_noswap, saving repetitious checks elsewhere (perhaps there's a difficulty in that, I haven't looked). Historically, I think we've added mem_cgroup_disabled() checks (accessing a cacheline we'd rather avoid) where they're necessary, rather than at every "interface". And you seem to be in a very "goto out" mood today - we all have our "goto out" days, alternating with our "return 0" days :) Hugh > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3e000a316b59..850bca380562 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -6811,6 +6811,9 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > VM_BUG_ON_PAGE(PageLRU(page), page); > VM_BUG_ON_PAGE(page_count(page), page); > > + if (mem_cgroup_disabled()) > + return; > + > if (cgroup_subsys_on_dfl(memory_cgrp_subsys)) > return; > > @@ -6876,6 +6879,10 @@ int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry) > struct mem_cgroup *memcg; > unsigned short oldid; > > + if (mem_cgroup_disabled()) > + return 0; > + > + /* Only cgroup2 has swap.max */ > if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > return 0; > > @@ -6920,6 +6927,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); > @@ -6940,12 +6950,25 @@ long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) > { > long nr_swap_pages = get_nr_swap_pages(); > > - if (cgroup_memory_noswap || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) > - return nr_swap_pages; > + if (mem_cgroup_disabled()) > + goto out; > + > + /* Swap control disabled */ > + if (cgroup_memory_noswap) > + goto out; > + > + /* > + * Only cgroup2 has swap.max, cgroup1 does mem+sw accounting, > + * which does not place restrictions specifically on swap. > + */ > + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > + goto out; > + > for (; memcg != root_mem_cgroup; memcg = parent_mem_cgroup(memcg)) > nr_swap_pages = min_t(long, nr_swap_pages, > READ_ONCE(memcg->swap.max) - > page_counter_read(&memcg->swap)); > +out: > return nr_swap_pages; > } > > @@ -6957,18 +6980,30 @@ bool mem_cgroup_swap_full(struct page *page) > > if (vm_swap_full()) > return true; > - if (cgroup_memory_noswap || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) > - return false; > + > + if (mem_cgroup_disabled()) > + goto out; > + > + /* Swap control disabled */ > + if (cgroup_memory_noswap) > + goto out; > + > + /* > + * Only cgroup2 has swap.max, cgroup1 does mem+sw accounting, > + * which does not place restrictions specifically on swap. > + */ > + if (!cgroup_subsys_on_dfl(memory_cgrp_subsys)) > + goto out; > > memcg = page->mem_cgroup; > if (!memcg) > - return false; > + goto out; > > for (; memcg != root_mem_cgroup; memcg = parent_mem_cgroup(memcg)) > if (page_counter_read(&memcg->swap) * 2 >= > READ_ONCE(memcg->swap.max)) > return true; > - > +out: > return false; > } > > -- > 2.26.2