From: Song Liu <songliubraving@fb.com>
To: <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <matthew.wilcox@oracle.com>, <kirill.shutemov@linux.intel.com>,
<kernel-team@fb.com>, <william.kucharski@oracle.com>,
<akpm@linux-foundation.org>, <hdanton@sina.com>,
Song Liu <songliubraving@fb.com>
Subject: [PATCH v9 1/6] filemap: check compound_head(page)->mapping in filemap_fault()
Date: Mon, 24 Jun 2019 17:12:41 -0700 [thread overview]
Message-ID: <20190625001246.685563-2-songliubraving@fb.com> (raw)
In-Reply-To: <20190625001246.685563-1-songliubraving@fb.com>
Currently, filemap_fault() avoids trace condition with truncate by
checking page->mapping == mapping. This does not work for compound
pages. This patch let it check compound_head(page)->mapping instead.
Acked-by: Rik van Riel <riel@surriel.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
---
mm/filemap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index df2006ba0cfa..f5b79a43946d 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2517,7 +2517,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf)
goto out_retry;
/* Did it get truncated? */
- if (unlikely(page->mapping != mapping)) {
+ if (unlikely(compound_head(page)->mapping != mapping)) {
unlock_page(page);
put_page(page);
goto retry_find;
--
2.17.1
next prev parent reply other threads:[~2019-06-25 0:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 0:12 [PATCH v9 0/6] Enable THP for text section of non-shmem files Song Liu
2019-06-25 0:12 ` Song Liu [this message]
2019-07-10 17:44 ` [PATCH v9 1/6] filemap: check compound_head(page)->mapping in filemap_fault() Johannes Weiner
2019-07-10 17:51 ` Johannes Weiner
2019-06-25 0:12 ` [PATCH v9 2/6] filemap: update offset check " Song Liu
2019-07-10 17:52 ` Johannes Weiner
2019-06-25 0:12 ` [PATCH v9 3/6] mm,thp: stats for file backed THP Song Liu
2019-07-10 17:59 ` Johannes Weiner
2019-06-25 0:12 ` [PATCH v9 4/6] khugepaged: rename collapse_shmem() and khugepaged_scan_shmem() Song Liu
2019-06-27 13:19 ` Rik van Riel
2019-07-10 18:21 ` Johannes Weiner
2019-06-25 0:12 ` [PATCH v9 5/6] mm,thp: add read-only THP support for (non-shmem) FS Song Liu
2019-07-10 18:48 ` Johannes Weiner
2019-07-22 23:41 ` Song Liu
2019-07-23 23:59 ` Huang, Kai
2019-07-28 6:41 ` Song Liu
2019-06-25 0:12 ` [PATCH v9 6/6] mm,thp: avoid writes to file with THP in pagecache Song Liu
2019-06-27 13:18 ` Rik van Riel
2019-07-10 19:11 ` Johannes Weiner
2019-06-27 12:46 ` [PATCH v9 0/6] Enable THP for text section of non-shmem files Kirill A. Shutemov
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=20190625001246.685563-2-songliubraving@fb.com \
--to=songliubraving@fb.com \
--cc=akpm@linux-foundation.org \
--cc=hdanton@sina.com \
--cc=kernel-team@fb.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=matthew.wilcox@oracle.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;
as well as URLs for NNTP newsgroup(s).