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.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 97ABFC433E0 for ; Wed, 5 Aug 2020 21:18:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 32D9C2076E for ; Wed, 5 Aug 2020 21:18:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hOGXqAlm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32D9C2076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 77CDC6B0003; Wed, 5 Aug 2020 17:18:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72F6F6B0005; Wed, 5 Aug 2020 17:18:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61C096B0006; Wed, 5 Aug 2020 17:18:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id 493D36B0003 for ; Wed, 5 Aug 2020 17:18:41 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id C62E83622 for ; Wed, 5 Aug 2020 21:18:40 +0000 (UTC) X-FDA: 77117779200.30.brush82_26062e526fb2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 95AEE180B3C8E for ; Wed, 5 Aug 2020 21:18:40 +0000 (UTC) X-HE-Tag: brush82_26062e526fb2 X-Filterd-Recvd-Size: 6509 Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by imf46.hostedemail.com (Postfix) with ESMTP for ; Wed, 5 Aug 2020 21:18:40 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id y18so30216185ilp.10 for ; Wed, 05 Aug 2020 14:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=47Asclv1FK7U2jk7VK/Qqzc/1uZms3QEdnET+4/Hxhw=; b=hOGXqAlmNmwjcpWgNq+i7sz0gXOY45BTpoSEyZ7rQgxc8KoTFIq72+Sp3FqRmWUGch BzMjQw9EsuXc1EkXuw4M/HNTKNKhWg44QfrlbEhDfVbFKVwxiTH5fO+RBDpeSKYxhAOr 97nXaQN3SqulrQyeviEqOelMhLmtmdfPAGHC0nT6CaFiG+qOGEZpu2Ks27v8ughOlpC1 us7d21TosVqDjmVTvwK4B6ovXoFxFbmAQXDdijY/4Ha+hwaSLqvZ1ShYcNjiOS3ASxsx nfMOwaEzMpqofoyw6UO9W6ksT52pUAYn7Fq1VrJHLjX1Fae7VbB0QTJ/W1+55pFwDJNQ CPqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=47Asclv1FK7U2jk7VK/Qqzc/1uZms3QEdnET+4/Hxhw=; b=jrgYio7iQ9Phzy3Ai8TJBM5CpvQ2s0ccbEYV6mNH4noXvdKGE5g64hiU8F1C+0BFef Lu9w19GKQ5BEOHi9AfA3nCbA3hR2bmVodoJ3WGwMJPNwr/eu6Y73zUhtGe/nE0ZiThde sPj7LlyGYC0mWoguM3RNY4MtFIU4La3ncRTDRvqXlhFgWYvIwvc1LcMR7yIgXf5Cu1L+ zcLIqEEH2JsyIOu9gsotdpG62MbXTFwXyB2ag7Y/OXksU6RU6ZENm5Ki1MzPgrbyqKWJ TZ3QJoPfn0kVMS5V3oa4KGDJ7WfoVusfhyMNFcdAlbdcCWvFeQ8HeJxlqoxWLo5rLuNJ jYBQ== X-Gm-Message-State: AOAM530DHtHkgt3qGTGlyOZY+bphecjV/wxY5EPNy34d/IZbL/7VgwJZ RTlCIGujuaVc1rBcGBgoDxfdw7e3nw888EiB1xs= X-Google-Smtp-Source: ABdhPJz5HQXy+KXF8yn3h980J3l9bX6POO/8Sp49m+jlrztwg9zijubXJFLCSGZH4IRvp2PhB9SCfieVsb8nS8m+WR0= X-Received: by 2002:a92:bb92:: with SMTP id x18mr5788263ilk.64.1596662319442; Wed, 05 Aug 2020 14:18:39 -0700 (PDT) MIME-Version: 1.0 References: <1595681998-19193-1-git-send-email-alex.shi@linux.alibaba.com> <1595681998-19193-12-git-send-email-alex.shi@linux.alibaba.com> In-Reply-To: <1595681998-19193-12-git-send-email-alex.shi@linux.alibaba.com> From: Alexander Duyck Date: Wed, 5 Aug 2020 14:18:28 -0700 Message-ID: Subject: Re: [PATCH v17 11/21] mm/lru: move lru_lock holding in func lru_note_cost_page To: Alex Shi Cc: Andrew Morton , Mel Gorman , Tejun Heo , Hugh Dickins , Konstantin Khlebnikov , Daniel Jordan , Yang Shi , Matthew Wilcox , Johannes Weiner , kbuild test robot , linux-mm , LKML , cgroups@vger.kernel.org, Shakeel Butt , Joonsoo Kim , Wei Yang , "Kirill A. Shutemov" , Rong Chen Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 95AEE180B3C8E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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 Sat, Jul 25, 2020 at 6:00 AM Alex Shi wrote: > > It's a clean up patch w/o function changes. > > Signed-off-by: Alex Shi > Cc: Johannes Weiner > Cc: Andrew Morton > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org Reviewed-by: Alexander Duyck > --- > mm/memory.c | 3 --- > mm/swap.c | 2 ++ > mm/swap_state.c | 2 -- > mm/workingset.c | 2 -- > 4 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/mm/memory.c b/mm/memory.c > index 87ec87cdc1ff..dafc5585517e 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3150,10 +3150,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf) > * XXX: Move to lru_cache_add() when it > * supports new vs putback > */ > - spin_lock_irq(&page_pgdat(page)->lru_lock); > lru_note_cost_page(page); > - spin_unlock_irq(&page_pgdat(page)->lru_lock); > - > lru_cache_add(page); > swap_readpage(page, true); > } > diff --git a/mm/swap.c b/mm/swap.c > index dc8b02cdddcb..b88ca630db70 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -298,8 +298,10 @@ void lru_note_cost(struct lruvec *lruvec, bool file, unsigned int nr_pages) > > 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), hpage_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/swap_state.c b/mm/swap_state.c > index 05889e8e3c97..080be52db6a8 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -440,9 +440,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, > } > > /* XXX: Move to lru_cache_add() when it supports new vs putback */ > - spin_lock_irq(&page_pgdat(page)->lru_lock); > lru_note_cost_page(page); > - spin_unlock_irq(&page_pgdat(page)->lru_lock); > > /* Caller will initiate read into locked page */ > SetPageWorkingset(page); > diff --git a/mm/workingset.c b/mm/workingset.c > index 50b7937bab32..337d5b9ad132 100644 > --- a/mm/workingset.c > +++ b/mm/workingset.c > @@ -372,9 +372,7 @@ void workingset_refault(struct page *page, void *shadow) > if (workingset) { > SetPageWorkingset(page); > /* XXX: Move to lru_cache_add() when it supports new vs putback */ > - spin_lock_irq(&page_pgdat(page)->lru_lock); > lru_note_cost_page(page); > - spin_unlock_irq(&page_pgdat(page)->lru_lock); > inc_lruvec_state(lruvec, WORKINGSET_RESTORE); > } > out: > -- > 1.8.3.1 >