From: Kent Overstreet <kent.overstreet@gmail.com>
To: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, hch@lst.de
Subject: Re: [PATCH 1/4] pagevec: Allow pagevecs to be different sizes
Date: Sat, 7 Nov 2020 12:08:13 -0500 [thread overview]
Message-ID: <20201107170813.GD3365678@moria.home.lan> (raw)
In-Reply-To: <20201106123040.28451-1-willy@infradead.org>
On Fri, Nov 06, 2020 at 12:30:37PM +0000, Matthew Wilcox (Oracle) wrote:
> Declaring a pagevec continues to create a pagevec which is the same size,
> but functions which manipulate pagevecs no longer rely on this.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
> include/linux/pagevec.h | 20 ++++++++++++++++----
> mm/swap.c | 8 ++++++++
> 2 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/pagevec.h b/include/linux/pagevec.h
> index 875a3f0d9dd2..ee5d3c4da8da 100644
> --- a/include/linux/pagevec.h
> +++ b/include/linux/pagevec.h
> @@ -18,9 +18,15 @@ struct page;
> struct address_space;
>
> struct pagevec {
> - unsigned char nr;
> - bool percpu_pvec_drained;
> - struct page *pages[PAGEVEC_SIZE];
> + union {
> + struct {
> + unsigned char sz;
> + unsigned char nr;
> + bool percpu_pvec_drained;
This should probably be removed, it's only used by the swap code and I don't
think it belongs in the generic data structure. That would mean nr and size (and
let's please use more standard naming...) can be u32, not u8s.
> + struct page *pages[PAGEVEC_SIZE];
> + };
> + void *__p[PAGEVEC_SIZE + 1];
What's up with this union?
> + };
> };
>
> void __pagevec_release(struct pagevec *pvec);
> @@ -41,6 +47,7 @@ static inline unsigned pagevec_lookup_tag(struct pagevec *pvec,
>
> static inline void pagevec_init(struct pagevec *pvec)
> {
> + pvec->sz = PAGEVEC_SIZE;
> pvec->nr = 0;
> pvec->percpu_pvec_drained = false;
> }
> @@ -50,6 +57,11 @@ static inline void pagevec_reinit(struct pagevec *pvec)
> pvec->nr = 0;
> }
>
> +static inline unsigned pagevec_size(struct pagevec *pvec)
> +{
> + return pvec->sz;
> +}
> +
> static inline unsigned pagevec_count(struct pagevec *pvec)
> {
> return pvec->nr;
> @@ -57,7 +69,7 @@ static inline unsigned pagevec_count(struct pagevec *pvec)
>
> static inline unsigned pagevec_space(struct pagevec *pvec)
> {
> - return PAGEVEC_SIZE - pvec->nr;
> + return pvec->sz - pvec->nr;
> }
>
> /*
> diff --git a/mm/swap.c b/mm/swap.c
> index 2ee3522a7170..d093fb30f038 100644
> --- a/mm/swap.c
> +++ b/mm/swap.c
> @@ -52,6 +52,7 @@ struct lru_rotate {
> };
> static DEFINE_PER_CPU(struct lru_rotate, lru_rotate) = {
> .lock = INIT_LOCAL_LOCK(lock),
> + .pvec.sz = PAGEVEC_SIZE,
> };
>
> /*
> @@ -70,6 +71,13 @@ struct lru_pvecs {
> };
> 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,
> +#ifdef CONFIG_SMP
> + .activate_page.sz = PAGEVEC_SIZE,
> +#endif
> };
>
> /*
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-11-07 17:08 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 ` [PATCH 2/4] pagevec: Increase the size of LRU pagevecs Matthew Wilcox (Oracle)
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 ` Kent Overstreet [this message]
2020-11-07 17:20 ` [PATCH 1/4] pagevec: Allow pagevecs to be different sizes 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=20201107170813.GD3365678@moria.home.lan \
--to=kent.overstreet@gmail.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.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).