From patchwork Fri Dec 25 09:59:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 11990091 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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_GIT 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 5120BC433E0 for ; Fri, 25 Dec 2020 10:02:06 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D4AF7230FF for ; Fri, 25 Dec 2020 10:02:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4AF7230FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 763348D0085; Fri, 25 Dec 2020 05:02:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 713FA8D0080; Fri, 25 Dec 2020 05:02:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 656DE8D0085; Fri, 25 Dec 2020 05:02:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0201.hostedemail.com [216.40.44.201]) by kanga.kvack.org (Postfix) with ESMTP id 4CFF78D0080 for ; Fri, 25 Dec 2020 05:02:02 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 19F1B18059B73 for ; Fri, 25 Dec 2020 10:02:02 +0000 (UTC) X-FDA: 77631363684.06.slip12_3f1753127479 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id BEAD8100372E7 for ; Fri, 25 Dec 2020 10:02:01 +0000 (UTC) X-HE-Tag: slip12_3f1753127479 X-Filterd-Recvd-Size: 3715 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by imf44.hostedemail.com (Postfix) with ESMTP for ; Fri, 25 Dec 2020 10:02:00 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R341e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=9;SR=0;TI=SMTPD_---0UJjFIVO_1608890514; Received: from aliy80.localdomain(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0UJjFIVO_1608890514) by smtp.aliyun-inc.com(127.0.0.1); Fri, 25 Dec 2020 18:01:55 +0800 From: Alex Shi To: willy@infradead.org Cc: tim.c.chen@linux.intel.com, Konstantin Khlebnikov , Hugh Dickins , Yu Zhao , Michal Hocko , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/4] mm/swap.c: bail out early for no memcg and no numa Date: Fri, 25 Dec 2020 17:59:48 +0800 Message-Id: <1608890390-64305-3-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1608890390-64305-1-git-send-email-alex.shi@linux.alibaba.com> References: <20201126155553.GT4327@casper.infradead.org> <1608890390-64305-1-git-send-email-alex.shi@linux.alibaba.com> 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: If a system has memcg disabled and no numa node, like a embedded system, there is no needs to do the pagevec sort, since only just one lruvec in system. In this situation, we could skip the pagevec sorting. Signed-off-by: Alex Shi Cc: Konstantin Khlebnikov Cc: Hugh Dickins Cc: Yu Zhao Cc: Michal Hocko Cc: Matthew Wilcox (Oracle) Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/swap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/swap.c b/mm/swap.c index 994641331bf7..bb5300b7e321 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -235,6 +235,7 @@ void sort_isopv(struct pagevec *pvec, struct pagevec *isopv, pagevec_init(&busypv); + for (i = 0, j = 0; i < pagevec_count(pvec); i++) { struct page *page = pvec->pages[i]; @@ -253,7 +254,8 @@ void sort_isopv(struct pagevec *pvec, struct pagevec *isopv, if (pagevec_count(&busypv)) release_pages(busypv.pages, busypv.nr); - shell_sort(isopv, lvaddr); + if (!mem_cgroup_disabled() || num_online_nodes() > 1) + shell_sort(isopv, lvaddr); } static void pagevec_lru_move_fn(struct pagevec *pvec, @@ -263,13 +265,12 @@ static void pagevec_lru_move_fn(struct pagevec *pvec, struct lruvec *lruvec = NULL; unsigned long flags = 0; unsigned long lvaddr[PAGEVEC_SIZE]; - struct pagevec isopv; - - pagevec_init(&isopv); + struct pagevec sortedpv; - sort_isopv(pvec, &isopv, lvaddr); + pagevec_init(&sortedpv); + sort_isopv(pvec, &sortedpv, lvaddr); - n = pagevec_count(&isopv); + n = pagevec_count(&sortedpv); if (!n) return; @@ -284,12 +285,12 @@ static void pagevec_lru_move_fn(struct pagevec *pvec, spin_lock_irqsave(&lruvec->lru_lock, flags); } - (*move_fn)(isopv.pages[i], lruvec); + (*move_fn)(sortedpv.pages[i], lruvec); - SetPageLRU(isopv.pages[i]); + SetPageLRU(sortedpv.pages[i]); } spin_unlock_irqrestore(&lruvec->lru_lock, flags); - release_pages(isopv.pages, isopv.nr); + release_pages(sortedpv.pages, sortedpv.nr); } static void pagevec_move_tail_fn(struct page *page, struct lruvec *lruvec)