linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Song Liu <songliubraving@fb.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	akpm@linux-foundation.org, matthew.wilcox@oracle.com,
	kernel-team@fb.com, william.kucharski@oracle.com,
	kirill.shutemov@linux.intel.com,
	Johannes Weiner <hannes@cmpxchg.org>,
	Hugh Dickins <hughd@google.com>
Subject: Re: [PATCH] mm,thp: recheck each page before collapsing file THP
Date: Fri, 18 Oct 2019 16:34:44 +0300	[thread overview]
Message-ID: <20191018133444.iif7b33muxmus6lb@box> (raw)
In-Reply-To: <20191018050832.1251306-1-songliubraving@fb.com>

On Thu, Oct 17, 2019 at 10:08:32PM -0700, Song Liu wrote:
> In collapse_file(), after locking the page, it is necessary to recheck
> that the page is up-to-date, clean, and pointing to the proper mapping.
> If any check fails, abort the collapse.
> 
> Fixes: 99cb0dbd47a1 ("mm,thp: add read-only THP support for (non-shmem) FS")
> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Cc: Johannes Weiner <hannes@cmpxchg.org>
> Cc: Hugh Dickins <hughd@google.com>
> Cc: William Kucharski <william.kucharski@oracle.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>  mm/khugepaged.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 0a1b4b484ac5..7da49b643c4d 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -1619,6 +1619,14 @@ static void collapse_file(struct mm_struct *mm,
>  				result = SCAN_PAGE_LOCK;
>  				goto xa_locked;
>  			}
> +
> +			/* double check the page is correct and clean */
> +			if (unlikely(!PageUptodate(page)) ||
> +			    unlikely(PageDirty(page)) ||
> +			    unlikely(page->mapping != mapping)) {
> +				result = SCAN_FAIL;
> +				goto out_unlock;
> +			}
>  		}
>  
>  		/*

Hm. But why only for !is_shmem? Or I read it wrong?

-- 
 Kirill A. Shutemov


  parent reply	other threads:[~2019-10-18 13:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18  5:08 Song Liu
2019-10-18 13:06 ` Rik van Riel
2019-10-18 13:34 ` Kirill A. Shutemov [this message]
2019-10-18 15:41   ` Rik van Riel
2019-10-18 16:23     ` Song Liu
2019-10-18 14:25 ` Matthew Wilcox

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=20191018133444.iif7b33muxmus6lb@box \
    --to=kirill@shutemov.name \
    --cc=akpm@linux-foundation.org \
    --cc=hannes@cmpxchg.org \
    --cc=hughd@google.com \
    --cc=kernel-team@fb.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=matthew.wilcox@oracle.com \
    --cc=songliubraving@fb.com \
    --cc=william.kucharski@oracle.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