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 v7 2/6] filemap: update offset check in filemap_fault()
Date: Sat, 22 Jun 2019 22:47:45 -0700 [thread overview]
Message-ID: <20190623054749.4016638-3-songliubraving@fb.com> (raw)
In-Reply-To: <20190623054749.4016638-1-songliubraving@fb.com>
With THP, current check of offset:
VM_BUG_ON_PAGE(page->index != offset, page);
is no longer accurate. Update it to:
VM_BUG_ON_PAGE(page_to_pgoff(page) != offset, page);
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 f5b79a43946d..5f072a113535 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2522,7 +2522,7 @@ vm_fault_t filemap_fault(struct vm_fault *vmf)
put_page(page);
goto retry_find;
}
- VM_BUG_ON_PAGE(page->index != offset, page);
+ VM_BUG_ON_PAGE(page_to_pgoff(page) != offset, page);
/*
* We have a locked page in the page cache, now we need to check
--
2.17.1
next prev parent reply other threads:[~2019-06-23 5:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 5:47 [PATCH v7 0/6] Enable THP for text section of non-shmem files Song Liu
2019-06-23 5:47 ` [PATCH v7 1/6] filemap: check compound_head(page)->mapping in filemap_fault() Song Liu
2019-06-23 5:47 ` Song Liu [this message]
2019-06-23 5:47 ` [PATCH v7 3/6] mm,thp: stats for file backed THP Song Liu
2019-06-23 5:47 ` [PATCH v7 4/6] khugepaged: rename collapse_shmem() and khugepaged_scan_shmem() Song Liu
2019-06-23 5:47 ` [PATCH v7 5/6] mm,thp: add read-only THP support for (non-shmem) FS Song Liu
2019-06-24 12:47 ` Kirill A. Shutemov
2019-06-24 14:01 ` Song Liu
2019-06-24 14:27 ` Kirill A. Shutemov
2019-06-24 14:42 ` Song Liu
2019-06-24 14:54 ` Kirill A. Shutemov
2019-06-24 15:04 ` Song Liu
2019-06-24 15:15 ` Kirill A. Shutemov
2019-06-24 16:33 ` Song Liu
2019-06-23 5:47 ` [PATCH v7 6/6] mm,thp: avoid writes to file with THP in pagecache Song Liu
2019-06-24 12:49 ` Kirill A. Shutemov
2019-06-24 14:01 ` Song Liu
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=20190623054749.4016638-3-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).