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=-10.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 4531AC433E3 for ; Fri, 31 Jul 2020 15:18:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E254921744 for ; Fri, 31 Jul 2020 15:18:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=cmpxchg-org.20150623.gappssmtp.com header.i=@cmpxchg-org.20150623.gappssmtp.com header.b="vmpN/XsH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E254921744 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2B1AD8D0040; Fri, 31 Jul 2020 11:18:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2631C8D000B; Fri, 31 Jul 2020 11:18:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 151068D0040; Fri, 31 Jul 2020 11:18:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id F25BC8D000B for ; Fri, 31 Jul 2020 11:18:00 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 81FE73625 for ; Fri, 31 Jul 2020 15:18:00 +0000 (UTC) X-FDA: 77098726320.15.hate82_450792326f84 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 09337180284F5 for ; Fri, 31 Jul 2020 15:18:00 +0000 (UTC) X-HE-Tag: hate82_450792326f84 X-Filterd-Recvd-Size: 5954 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Fri, 31 Jul 2020 15:17:58 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id e13so29068009qkg.5 for ; Fri, 31 Jul 2020 08:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=pNskHEW12lh46n0Zlsd60MF+6OVuuX4EV9sgDes5FR4=; b=vmpN/XsHGRmAJzX5ODCmQOdU9dwEyRp4t7ZUCD4yk9xdf2LrjaQbv+MGtE58Gw5Hk0 fCc1sTUG9N2JEiTEPZ02eEnWasxmDlL+3cufg1hkd5Br741rCh0DLfqCA12pW9rmoS5w S2sLfPoLcfilrvfhKBcLMpVBeLGqe3V5nPNIcPIPTjtGEVHhmBxlFHl033WuVronNsQT CMJWEYn2c7vUpTzI1ChIzAoJXE7ERBOkILmts0mZvxCifvZDsDuRBSUTs6RYS0BbfSIi FRv4zq27dRtme/tQsrb1pIB2YY/c2B8VEBWij6lB4lORsAREM0tk9dV7ZmS9bSEQKZUO 38Dw== 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:message-id:references :mime-version:content-disposition:in-reply-to; bh=pNskHEW12lh46n0Zlsd60MF+6OVuuX4EV9sgDes5FR4=; b=NiMAZAYBHZhQOrV7YjQ8EQTA4ZWmwA5j4V33lwmEYER4mK4RuOZ+UzFHZXEOnbAZ5O 0sVqrJIUaf8UFfXriu9rh8UQmykizt79cuEvfZnWJ1VrgJTe+hNwdS0lSANE/sbJPJlP 6Wdq5nOmmgfjrPs56ggExSI0DhgttcUOqRJLJQ3UojTFyN1N9AXhAbfxpCsuhzNYnm7/ zb7zA8MGu1knWuNswrmmqA6Jm62B467Dnec2RbkctJQw615qwei/bGBUUCXfIYXeHdRx VW3C9q83d0N2WBkOuffUtsWL5XztgVhmTDfekdF1/pRs/F9XyQr3p/XXtGO3aZ3eHD8g I0Zg== X-Gm-Message-State: AOAM530nCYCckvRtg2zgAzm3oVwDF2TvZVCaaFkkomFkpB1VuXdPvkys mFuWyNV6irYs7PKNQqKnV3BisA== X-Google-Smtp-Source: ABdhPJyiF3c2kk77NFw/RswzR9D58w6iAB6/VDp+1WDgbwVvj9yXCVCuU1nROvR45TchoNFVAq+dvg== X-Received: by 2002:a05:620a:12cf:: with SMTP id e15mr4256707qkl.459.1596208678297; Fri, 31 Jul 2020 08:17:58 -0700 (PDT) Received: from localhost ([2620:10d:c091:480::1:11a4]) by smtp.gmail.com with ESMTPSA id n81sm8397098qke.11.2020.07.31.08.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2020 08:17:57 -0700 (PDT) Date: Fri, 31 Jul 2020 11:16:55 -0400 From: Johannes Weiner To: Alex Shi Cc: Michal Hocko , Vladimir Davydov , Andrew Morton , cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/memcg: remove useless check on page->mem_cgroup Message-ID: <20200731151655.GB491801@cmpxchg.org> References: <1596166480-22814-1-git-send-email-alex.shi@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1596166480-22814-1-git-send-email-alex.shi@linux.alibaba.com> X-Rspamd-Queue-Id: 09337180284F5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Jul 31, 2020 at 11:34:40AM +0800, Alex Shi wrote: > Since readahead page will be charged on memcg too. We don't need to > check this exception now. Rmove them is safe as all user pages are > charged before use. > > Signed-off-by: Alex Shi > Cc: Johannes Weiner > Cc: Michal Hocko > Cc: Vladimir Davydov > Cc: Andrew Morton > Cc: cgroups@vger.kernel.org > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > --- > mm/memcontrol.c | 21 ++++----------------- > 1 file changed, 4 insertions(+), 17 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index e84c2b5596f2..9e44ae22d591 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1322,12 +1322,7 @@ struct lruvec *mem_cgroup_page_lruvec(struct page *page, struct pglist_data *pgd > } > > memcg = page->mem_cgroup; > - /* > - * Swapcache readahead pages are added to the LRU - and > - * possibly migrated - before they are charged. > - */ > - if (!memcg) > - memcg = root_mem_cgroup; > + VM_BUG_ON_PAGE(!memcg, page); > > mz = mem_cgroup_page_nodeinfo(memcg, page); > lruvec = &mz->lruvec; > @@ -6897,10 +6892,8 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage) > if (newpage->mem_cgroup) > return; > > - /* Swapcache readahead pages can get replaced before being charged */ > memcg = oldpage->mem_cgroup; > - if (!memcg) > - return; > + VM_BUG_ON_PAGE(!memcg, oldpage); > > /* Force-charge the new page. The old one will be freed soon */ > nr_pages = thp_nr_pages(newpage); > @@ -7094,10 +7087,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > return; > > memcg = page->mem_cgroup; > - > - /* Readahead page, never charged */ > - if (!memcg) > - return; > + VM_BUG_ON_PAGE(!memcg, page); > > /* > * In case the memcg owning these pages has been offlined and doesn't > @@ -7158,10 +7148,7 @@ int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry) > return 0; > > memcg = page->mem_cgroup; > - > - /* Readahead page, never charged */ > - if (!memcg) > - return 0; > + VM_BUG_ON_PAGE(!memcg, page); > > if (!entry.val) { > memcg_memory_event(memcg, MEMCG_SWAP_FAIL); Uncharged readahead pages are gone, but I'm not 100% sure uncharged pages in general are gone. ISTR that the !page->mem_cgroup check in mem_cgroup_uncharge() prevented a crash - although that is of course a much broader interface, whereas the ones you change should only apply to LRU pages (which are hopefully all charged). Nevertheless, to avoid unnecessary crashes if we discover that we've been wrong, how about leaving the branches for now, but adding a (new) VM_WARN_ON_ONCE_PAGE() to them?