From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, hch@lst.de,
kent.overstreet@gmail.com
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 2/4] pagevec: Increase the size of LRU pagevecs
Date: Fri, 6 Nov 2020 12:30:38 +0000 [thread overview]
Message-ID: <20201106123040.28451-2-willy@infradead.org> (raw)
In-Reply-To: <20201106123040.28451-1-willy@infradead.org>
Tim Chen reports that increasing the size of LRU pagevecs is advantageous
with a workload he has:
https://lore.kernel.org/linux-mm/d1cc9f12a8ad6c2a52cb600d93b06b064f2bbc57.1593205965.git.tim.c.chen@linux.intel.com/
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/pagevec.h | 5 +++++
mm/swap.c | 27 +++++++++++++++------------
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
index ee5d3c4da8da..4dc45392d776 100644
--- a/include/linux/pagevec.h
+++ b/include/linux/pagevec.h
@@ -29,6 +29,11 @@ struct pagevec {
};
};
+#define declare_pagevec(name, size) union { \
+ struct pagevec name; \
+ void *__p ##name [size + 1]; \
+}
+
void __pagevec_release(struct pagevec *pvec);
void __pagevec_lru_add(struct pagevec *pvec);
void pagevec_remove_exceptionals(struct pagevec *pvec);
diff --git a/mm/swap.c b/mm/swap.c
index d093fb30f038..1e6f50b312ea 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -45,14 +45,17 @@
/* How many pages do we try to swap or page in/out together? */
int page_cluster;
+#define LRU_PAGEVEC_SIZE 63
+#define lru_pagevec(name) declare_pagevec(name, LRU_PAGEVEC_SIZE)
+
/* Protecting only lru_rotate.pvec which requires disabling interrupts */
struct lru_rotate {
local_lock_t lock;
- struct pagevec pvec;
+ lru_pagevec(pvec);
};
static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) = {
.lock = INIT_LOCAL_LOCK(lock),
- .pvec.sz = PAGEVEC_SIZE,
+ .pvec.sz = LRU_PAGEVEC_SIZE,
};
/*
@@ -61,22 +64,22 @@ static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) = {
*/
struct lru_pvecs {
local_lock_t lock;
- struct pagevec lru_add;
- struct pagevec lru_deactivate_file;
- struct pagevec lru_deactivate;
- struct pagevec lru_lazyfree;
+ lru_pagevec(lru_add);
+ lru_pagevec(lru_deactivate_file);
+ lru_pagevec(lru_deactivate);
+ lru_pagevec(lru_lazyfree);
#ifdef CONFIG_SMP
- struct pagevec activate_page;
+ lru_pagevec(activate_page);
#endif
};
static DEFINE_PER_CPU(struct lru_pvecs, lru_pvecs) = {
.lock = INIT_LOCAL_LOCK(lock),
- .lru_add.sz = PAGEVEC_SIZE,
- .lru_deactivate_file.sz = PAGEVEC_SIZE,
- .lru_deactivate.sz = PAGEVEC_SIZE,
- .lru_lazyfree.sz = PAGEVEC_SIZE,
+ .lru_add.sz = LRU_PAGEVEC_SIZE,
+ .lru_deactivate_file.sz = LRU_PAGEVEC_SIZE,
+ .lru_deactivate.sz = LRU_PAGEVEC_SIZE,
+ .lru_lazyfree.sz = LRU_PAGEVEC_SIZE,
#ifdef CONFIG_SMP
- .activate_page.sz = PAGEVEC_SIZE,
+ .activate_page.sz = LRU_PAGEVEC_SIZE,
#endif
};
--
2.28.0
next prev parent reply other threads:[~2020-11-06 12:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20201104204219.23810-1-willy@infradead.org>
[not found] ` <20201104204219.23810-2-willy@infradead.org>
2020-11-06 8:07 ` [PATCH v2 01/18] mm/filemap: Rename generic_file_buffered_read subfunctions Christoph Hellwig
[not found] ` <20201104204219.23810-3-willy@infradead.org>
[not found] ` <20201104213005.GB3365678@moria.home.lan>
2020-11-05 4:52 ` [PATCH v2 02/18] mm/filemap: Remove dynamically allocated array from filemap_read Matthew Wilcox
[not found] ` <20201105001302.GF17076@casper.infradead.org>
2020-11-06 8:08 ` Christoph Hellwig
2020-11-06 12:30 ` [PATCH 1/4] pagevec: Allow pagevecs to be different sizes Matthew Wilcox (Oracle)
2020-11-06 12:30 ` Matthew Wilcox (Oracle) [this message]
2020-11-06 12:30 ` [PATCH 3/4] pagevec: Add dynamically allocated pagevecs Matthew Wilcox (Oracle)
2020-11-06 12:30 ` [PATCH 4/4] mm/filemap: Use a dynamically allocated pagevec in filemap_read Matthew Wilcox (Oracle)
2020-11-07 17:08 ` [PATCH 1/4] pagevec: Allow pagevecs to be different sizes Kent Overstreet
2020-11-07 17:20 ` Matthew Wilcox
2020-11-06 8:07 ` [PATCH v2 02/18] mm/filemap: Remove dynamically allocated array from filemap_read Christoph Hellwig
[not found] ` <20201104204219.23810-4-willy@infradead.org>
2020-11-06 8:08 ` [PATCH v2 03/18] mm/filemap: Convert filemap_get_pages to take a pagevec Christoph Hellwig
[not found] ` <20201104204219.23810-10-willy@infradead.org>
2020-11-06 8:11 ` [PATCH v2 09/18] mm/filemap: Change filemap_read_page calling conventions Christoph Hellwig
[not found] ` <20201104204219.23810-12-willy@infradead.org>
2020-11-06 8:14 ` [PATCH v2 11/18] mm/filemap: Convert filemap_update_page to return an errno Christoph Hellwig
2020-11-06 8:37 ` Christoph Hellwig
2020-11-09 13:29 ` Matthew Wilcox
[not found] ` <20201104204219.23810-14-willy@infradead.org>
2020-11-06 8:16 ` [PATCH v2 13/18] mm/filemap: Add filemap_range_uptodate Christoph Hellwig
[not found] ` <20201104204219.23810-15-willy@infradead.org>
2020-11-06 8:19 ` [PATCH v2 14/18] mm/filemap: Split filemap_readahead out of filemap_get_pages Christoph Hellwig
[not found] ` <20201104204219.23810-16-willy@infradead.org>
2020-11-06 8:21 ` [PATCH v2 15/18] mm/filemap: Restructure filemap_get_pages Christoph Hellwig
[not found] ` <20201104204219.23810-17-willy@infradead.org>
2020-11-06 8:21 ` [PATCH v2 16/18] mm/filemap: Don't relock the page after calling readpage Christoph Hellwig
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=20201106123040.28451-2-willy@infradead.org \
--to=willy@infradead.org \
--cc=hch@lst.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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).