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.1 required=3.0 tests=BAYES_00,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, UNWANTED_LANGUAGE_BODY,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 71B7CC35257 for ; Mon, 21 Sep 2020 21:37:11 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D3ED623A60 for ; Mon, 21 Sep 2020 21:37:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FHdmoZMn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3ED623A60 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 01D37900004; Mon, 21 Sep 2020 17:37:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F101D8E0001; Mon, 21 Sep 2020 17:37:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E25D5900004; Mon, 21 Sep 2020 17:37:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0073.hostedemail.com [216.40.44.73]) by kanga.kvack.org (Postfix) with ESMTP id CC8C38E0001 for ; Mon, 21 Sep 2020 17:37:09 -0400 (EDT) Received: from smtpin12.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 951481EE6 for ; Mon, 21 Sep 2020 21:37:09 +0000 (UTC) X-FDA: 77288379378.12.toe56_600c7c427148 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin12.hostedemail.com (Postfix) with ESMTP id 6EDC218052F8D for ; Mon, 21 Sep 2020 21:37:09 +0000 (UTC) X-HE-Tag: toe56_600c7c427148 X-Filterd-Recvd-Size: 6241 Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by imf09.hostedemail.com (Postfix) with ESMTP for ; Mon, 21 Sep 2020 21:37:08 +0000 (UTC) Received: by mail-ot1-f67.google.com with SMTP id e23so13734067otk.7 for ; Mon, 21 Sep 2020 14:37:08 -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=YEHhXiwYGhR5s4kQG6zgTm8dChdzwLCMqEBAcwVay/I=; b=FHdmoZMn2GtG6M6npCvulWXP2W6zbv9j1/3z4NpqqPF4CZZIAljfJOMpLr/AU2uRnh MLdveaSRjUzPSvkKU/DlErd+prAWEQjXExuohssIxy9UltoW3ysPdWIcSIUp4LyWW1Jw f9iXMdTfFs8PZRMKMKNmrEqTZxqpk0pSNflZqnROIW4x8CU5+zxWAyPrd0JTK2S8usf5 cPqbz7Dc5xC0sbOIcjVCnLcaK19VJiXht1ypF+z6GM1rUOhGT94Xfp0glBhXVfcUjwkE e+DCEVKAkYABqQqwtM6XQipNbujsVCq/177MSRg4OGLiC12Cy+yZJVoAvFcWKn21ctnh nh9A== 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=YEHhXiwYGhR5s4kQG6zgTm8dChdzwLCMqEBAcwVay/I=; b=GhIMfdPuubwq7TjHmhe79/n4CUJB+nP8ayhsH33Kx9o2vmnlYcGMyxSi+Zhu4pb17b BPPb8f8jEOrLi1BfEzOz1KwIxsuNiUwSvHaRR2APKPQkn2ed4O3kIc6Fl+4FKBXnXLTP ihyRxT1t5ySS1ZJ5EvzmX9LVz9J5WypoiFroOR59rv5QtY1YMyRPVTvIOgXOtOEmMlaE ZiHRTaiDfsvrHTvZ4r1AcCFoRLL8aUelqo3sywixHdLwz6ea2EvA++/ftQbxljSxjpCL zbFN7OeVDywUatLch6Xa5uw9gIflpV7jXUO9Utc0r2C29UrnpLo1Zl0oO1Lforq9BFVH d/CQ== X-Gm-Message-State: AOAM531a2vI2DNmbD6NO59z8ivH2oSjPRn92g87wnkRz0JhdaBlZ9vCu nUYyUWCvVueI3c3opDaM01R1Ug== X-Google-Smtp-Source: ABdhPJw3dJbOp8ktACPzr4lIDA10Ki7bwAn+SWgjbJ9QhO4ybGwe635VGxBCg0DmOLYWn9JLX87owg== X-Received: by 2002:a05:6830:2104:: with SMTP id i4mr946818otc.266.1600724228018; Mon, 21 Sep 2020 14:37:08 -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 a20sm7573611oos.13.2020.09.21.14.37.05 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Mon, 21 Sep 2020 14:37:06 -0700 (PDT) Date: Mon, 21 Sep 2020 14:36:52 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Alex Shi cc: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com, willy@infradead.org, hannes@cmpxchg.org, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shakeelb@google.com, iamjoonsoo.kim@lge.com, richard.weiyang@gmail.com, kirill@shutemov.name, alexander.duyck@gmail.com, rong.a.chen@intel.com, mhocko@suse.com, vdavydov.dev@gmail.com, shy828301@gmail.com Subject: Re: [PATCH v18 15/32] mm/lru: move lock into lru_note_cost In-Reply-To: <1598273705-69124-16-git-send-email-alex.shi@linux.alibaba.com> Message-ID: References: <1598273705-69124-1-git-send-email-alex.shi@linux.alibaba.com> <1598273705-69124-16-git-send-email-alex.shi@linux.alibaba.com> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 Mon, 24 Aug 2020, Alex Shi wrote: > We have to move lru_lock into lru_note_cost, since it cycle up on memcg > tree, for future per lruvec lru_lock replace. It's a bit ugly and may > cost a bit more locking, but benefit from multiple memcg locking could > cover the lost. > > Signed-off-by: Alex Shi Acked-by: Hugh Dickins In your lruv19 github tree, you have merged 14/32 into this one: thanks. > Cc: Johannes Weiner > Cc: Andrew Morton > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > --- > mm/swap.c | 5 +++-- > mm/vmscan.c | 4 +--- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/mm/swap.c b/mm/swap.c > index 906255db6006..f80ccd6f3cb4 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -269,7 +269,9 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) > { > do { > unsigned long lrusize; > + struct pglist_data *pgdat = lruvec_pgdat(lruvec); > > + spin_lock_irq(&pgdat->lru_lock); > /* Record cost event */ > if (file) > lruvec->file_cost += nr_pages; > @@ -293,15 +295,14 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) > lruvec->file_cost /= 2; > lruvec->anon_cost /= 2; > } > + spin_unlock_irq(&pgdat->lru_lock); > } while ((lruvec = parent_lruvec(lruvec))); > } > > void lru_note_cost_page(struct page *page) > { > - spin_lock_irq(&page_pgdat(page)->lru_lock); > lru_note_cost(mem_cgroup_page_lruvec(page, page_pgdat(page)), > page_is_file_lru(page), thp_nr_pages(page)); > - spin_unlock_irq(&page_pgdat(page)->lru_lock); > } > > static void __activate_page(struct page *page, struct lruvec *lruvec) > diff --git a/mm/vmscan.c b/mm/vmscan.c > index ffccb94defaf..7b7b36bd1448 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1971,19 +1971,17 @@ static int current_may_throttle(void) > &stat, false); > > spin_lock_irq(&pgdat->lru_lock); > - > move_pages_to_lru(lruvec, &page_list); > > __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); > - lru_note_cost(lruvec, file, stat.nr_pageout); > item = current_is_kswapd() ? PGSTEAL_KSWAPD : PGSTEAL_DIRECT; > if (!cgroup_reclaim(sc)) > __count_vm_events(item, nr_reclaimed); > __count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed); > __count_vm_events(PGSTEAL_ANON + file, nr_reclaimed); > - > spin_unlock_irq(&pgdat->lru_lock); > > + lru_note_cost(lruvec, file, stat.nr_pageout); > mem_cgroup_uncharge_list(&page_list); > free_unref_page_list(&page_list); > > -- > 1.8.3.1 > >