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 v10 3/7] filemap: update offset check in filemap_fault()
Date: Thu, 1 Aug 2019 11:42:40 -0700 [thread overview]
Message-ID: <20190801184244.3169074-4-songliubraving@fb.com> (raw)
In-Reply-To: <20190801184244.3169074-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>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
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 aaee1ef96f6d..97c7b7b92c20 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2542,7 +2542,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-08-01 18:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 18:42 [PATCH v10 0/7] Enable THP for text section of non-shmem files Song Liu
2019-08-01 18:42 ` [PATCH v10 1/7] filemap: check compound_head(page)->mapping in filemap_fault() Song Liu
2019-08-01 18:42 ` [PATCH v10 2/7] filemap: check compound_head(page)->mapping in pagecache_get_page() Song Liu
2019-08-12 20:33 ` Johannes Weiner
2019-08-01 18:42 ` Song Liu [this message]
2019-08-01 18:42 ` [PATCH v10 4/7] mm,thp: stats for file backed THP Song Liu
2019-08-01 18:42 ` [PATCH v10 5/7] khugepaged: rename collapse_shmem() and khugepaged_scan_shmem() Song Liu
2019-08-01 18:42 ` [PATCH v10 6/7] mm,thp: add read-only THP support for (non-shmem) FS Song Liu
2019-08-12 20:36 ` Johannes Weiner
2019-08-01 18:42 ` [PATCH v10 7/7] mm,thp: avoid writes to file with THP in pagecache Song Liu
2019-08-12 20:38 ` Johannes Weiner
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=20190801184244.3169074-4-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).