From: Shakeel Butt <shakeelb@google.com>
To: Henry Burns <henryburns@google.com>
Cc: Vitaly Wool <vitalywool@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vitaly Vul <vitaly.vul@sony.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Xidong Wang <wangxidong_97@163.com>,
Jonathan Adams <jwadams@google.com>,
Linux MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2] mm/z3fold.c: Lock z3fold page before __SetPageMovable()
Date: Mon, 1 Jul 2019 18:00:31 -0700 [thread overview]
Message-ID: <CALvZod5Fb+2mR_KjKq06AHeRYyykZatA4woNt_K5QZNETvw4nw@mail.gmail.com> (raw)
In-Reply-To: <20190702005122.41036-1-henryburns@google.com>
On Mon, Jul 1, 2019 at 5:51 PM Henry Burns <henryburns@google.com> wrote:
>
> __SetPageMovable() expects it's page to be locked, but z3fold.c doesn't
> lock the page. Following zsmalloc.c's example we call trylock_page() and
> unlock_page(). Also makes z3fold_page_migrate() assert that newpage is
> passed in locked, as documentation.
>
> Signed-off-by: Henry Burns <henryburns@google.com>
> Suggested-by: Vitaly Wool <vitalywool@gmail.com>
> ---
> Changelog since v1:
> - Added an if statement around WARN_ON(trylock_page(page)) to avoid
> unlocking a page locked by a someone else.
>
> mm/z3fold.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/mm/z3fold.c b/mm/z3fold.c
> index e174d1549734..6341435b9610 100644
> --- a/mm/z3fold.c
> +++ b/mm/z3fold.c
> @@ -918,7 +918,10 @@ static int z3fold_alloc(struct z3fold_pool *pool, size_t size, gfp_t gfp,
> set_bit(PAGE_HEADLESS, &page->private);
> goto headless;
> }
> - __SetPageMovable(page, pool->inode->i_mapping);
> + if (!WARN_ON(!trylock_page(page))) {
> + __SetPageMovable(page, pool->inode->i_mapping);
> + unlock_page(page);
> + }
Can you please comment why lock_page() is not used here?
> z3fold_page_lock(zhdr);
>
> found:
> @@ -1325,6 +1328,7 @@ static int z3fold_page_migrate(struct address_space *mapping, struct page *newpa
>
> VM_BUG_ON_PAGE(!PageMovable(page), page);
> VM_BUG_ON_PAGE(!PageIsolated(page), page);
> + VM_BUG_ON_PAGE(!PageLocked(newpage), newpage);
>
> zhdr = page_address(page);
> pool = zhdr_to_pool(zhdr);
> --
> 2.22.0.410.gd8fdbe21b5-goog
>
next prev parent reply other threads:[~2019-07-02 1:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-02 0:51 [PATCH v2] mm/z3fold.c: Lock z3fold page before __SetPageMovable() Henry Burns
2019-07-02 1:00 ` Shakeel Butt [this message]
2019-07-02 1:16 ` Henry Burns
2019-07-02 21:19 ` Andrew Morton
2019-07-02 22:17 ` Henry Burns
2019-07-02 22:24 ` Andrew Morton
2019-07-03 5:53 ` Vitaly Wool
2019-07-03 16:39 ` Henry Burns
2019-07-03 5:54 ` Vitaly Wool
2019-07-02 9:53 ` Vitaly Wool
2019-07-02 18:58 ` David Rientjes
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=CALvZod5Fb+2mR_KjKq06AHeRYyykZatA4woNt_K5QZNETvw4nw@mail.gmail.com \
--to=shakeelb@google.com \
--cc=akpm@linux-foundation.org \
--cc=henryburns@google.com \
--cc=jwadams@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=vitaly.vul@sony.com \
--cc=vitalywool@gmail.com \
--cc=wangxidong_97@163.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).