From: Alex Shi <alex.shi@linux.alibaba.com>
To: willy@infradead.org
Cc: tim.c.chen@linux.intel.com,
Konstantin Khlebnikov <koct9i@gmail.com>,
Hugh Dickins <hughd@google.com>, Yu Zhao <yuzhao@google.com>,
Michal Hocko <mhocko@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
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 [thread overview]
Message-ID: <1608890390-64305-3-git-send-email-alex.shi@linux.alibaba.com> (raw)
In-Reply-To: <1608890390-64305-1-git-send-email-alex.shi@linux.alibaba.com>
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 <alex.shi@linux.alibaba.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
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)
--
2.29.GIT
next prev parent reply other threads:[~2020-12-25 10:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 8:27 [PATCH next] mm/swap.c: reduce lock contention in lru_cache_add Alex Shi
2020-11-20 23:19 ` Andrew Morton
2020-11-23 4:46 ` Alex Shi
2020-11-25 15:38 ` Vlastimil Babka
2020-11-26 3:12 ` Alex Shi
2020-11-26 11:05 ` Vlastimil Babka
2020-11-26 4:52 ` Yu Zhao
2020-11-26 6:39 ` Alex Shi
2020-11-26 7:24 ` Yu Zhao
2020-11-26 8:09 ` Alex Shi
2020-11-26 11:22 ` Vlastimil Babka
2020-11-26 15:44 ` Vlastimil Babka
2020-11-26 15:55 ` Matthew Wilcox
2020-11-27 3:14 ` Alex Shi
2020-12-01 8:02 ` [PATCH 1/3] mm/swap.c: pre-sort pages in pagevec for pagevec_lru_move_fn Alex Shi
2020-12-01 8:02 ` [PATCH 2/3] mm/swap.c: bail out early for no memcg and no numa Alex Shi
2020-12-01 8:02 ` [PATCH 3/3] mm/swap.c: extend the usage to pagevec_lru_add Alex Shi
2020-12-01 8:10 ` [PATCH 1/3] mm/swap.c: pre-sort pages in pagevec for pagevec_lru_move_fn Michal Hocko
2020-12-01 8:20 ` Alex Shi
2020-12-25 9:59 ` [RFC PATCH 0/4] pre sort pages on lruvec in pagevec Alex Shi
2020-12-25 9:59 ` [RFC PATCH 1/4] mm/swap.c: pre-sort pages in pagevec for pagevec_lru_move_fn Alex Shi
2020-12-25 9:59 ` Alex Shi [this message]
2020-12-25 9:59 ` [RFC PATCH 3/4] mm/swap.c: extend the usage to pagevec_lru_add Alex Shi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1608890390-64305-3-git-send-email-alex.shi@linux.alibaba.com \
--to=alex.shi@linux.alibaba.com \
--cc=akpm@linux-foundation.org \
--cc=hughd@google.com \
--cc=koct9i@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=tim.c.chen@linux.intel.com \
--cc=willy@infradead.org \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).