From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Cc: David Chinner <dgc@sgi.com>
Subject: [patch 05/18] Use page_cache_xxx in mm/rmap.c
Date: Wed, 26 Dec 2007 21:32:51 -0800 [thread overview]
Message-ID: <20071227053400.750715035@sgi.com> (raw)
In-Reply-To: 20071227053246.902699851@sgi.com
[-- Attachment #1: 0006-Use-page_cache_xxx-in-mm-rmap.c.patch --]
[-- Type: text/plain, Size: 2614 bytes --]
V2->V3:
- vma_address(): Check for truncation if this is a file based page.
return -EFAULT if truncation occurred.
- page_referenced_file(): Only use mapping after we have made sure
that the mapping is valid and the page is locked.
Use page_cache_xxx in mm/rmap.c
Reviewed-by: Dave Chinner <dgc@sgi.com>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
mm/rmap.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
Index: linux-2.6.24-rc6-mm1/mm/rmap.c
===================================================================
--- linux-2.6.24-rc6-mm1.orig/mm/rmap.c 2007-12-26 20:35:03.773114182 -0800
+++ linux-2.6.24-rc6-mm1/mm/rmap.c 2007-12-26 20:40:28.693800636 -0800
@@ -190,9 +190,21 @@ static void page_unlock_anon_vma(struct
static inline unsigned long
vma_address(struct page *page, struct vm_area_struct *vma)
{
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff;
unsigned long address;
+ if (PageAnon(page))
+ pgoff = page->index;
+ else {
+ struct address_space *mapping = page->mapping;
+
+ if (!mapping)
+ /* Page was truncated */
+ return -EFAULT;
+
+ pgoff = page->index << mapping_order(mapping);
+ }
+
address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
if (unlikely(address < vma->vm_start || address >= vma->vm_end)) {
/* page should be within @vma mapping range */
@@ -348,7 +360,7 @@ static int page_referenced_file(struct p
{
unsigned int mapcount;
struct address_space *mapping = page->mapping;
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff;
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int referenced = 0;
@@ -368,6 +380,9 @@ static int page_referenced_file(struct p
*/
BUG_ON(!PageLocked(page));
+ /* Safe to use mapping */
+ pgoff = page->index << mapping_order(mapping);
+
spin_lock(&mapping->i_mmap_lock);
/*
@@ -467,7 +482,7 @@ out:
static int page_mkclean_file(struct address_space *mapping, struct page *page)
{
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff = page->index << mapping_order(mapping);
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int ret = 0;
@@ -900,7 +915,7 @@ static int try_to_unmap_anon(struct page
static int try_to_unmap_file(struct page *page, int migration)
{
struct address_space *mapping = page->mapping;
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff = page->index << mapping_order(mapping);
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int ret = SWAP_AGAIN;
--
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Lameter <clameter@sgi.com>
To: akpm@linux-foundation.org
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
David Chinner <dgc@sgi.com>
Subject: [patch 05/18] Use page_cache_xxx in mm/rmap.c
Date: Wed, 26 Dec 2007 21:32:51 -0800 [thread overview]
Message-ID: <20071227053400.750715035@sgi.com> (raw)
In-Reply-To: 20071227053246.902699851@sgi.com
[-- Attachment #1: 0006-Use-page_cache_xxx-in-mm-rmap.c.patch --]
[-- Type: text/plain, Size: 2832 bytes --]
- vma_address(): Check for truncation if this is a file based page.
return -EFAULT if truncation occurred.
- page_referenced_file(): Only use mapping after we have made sure
that the mapping is valid and the page is locked.
Use page_cache_xxx in mm/rmap.c
Reviewed-by: Dave Chinner <dgc@sgi.com>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
mm/rmap.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
Index: linux-2.6.24-rc6-mm1/mm/rmap.c
===================================================================
--- linux-2.6.24-rc6-mm1.orig/mm/rmap.c 2007-12-26 20:35:03.773114182 -0800
+++ linux-2.6.24-rc6-mm1/mm/rmap.c 2007-12-26 20:40:28.693800636 -0800
@@ -190,9 +190,21 @@ static void page_unlock_anon_vma(struct
static inline unsigned long
vma_address(struct page *page, struct vm_area_struct *vma)
{
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff;
unsigned long address;
+ if (PageAnon(page))
+ pgoff = page->index;
+ else {
+ struct address_space *mapping = page->mapping;
+
+ if (!mapping)
+ /* Page was truncated */
+ return -EFAULT;
+
+ pgoff = page->index << mapping_order(mapping);
+ }
+
address = vma->vm_start + ((pgoff - vma->vm_pgoff) << PAGE_SHIFT);
if (unlikely(address < vma->vm_start || address >= vma->vm_end)) {
/* page should be within @vma mapping range */
@@ -348,7 +360,7 @@ static int page_referenced_file(struct p
{
unsigned int mapcount;
struct address_space *mapping = page->mapping;
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff;
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int referenced = 0;
@@ -368,6 +380,9 @@ static int page_referenced_file(struct p
*/
BUG_ON(!PageLocked(page));
+ /* Safe to use mapping */
+ pgoff = page->index << mapping_order(mapping);
+
spin_lock(&mapping->i_mmap_lock);
/*
@@ -467,7 +482,7 @@ out:
static int page_mkclean_file(struct address_space *mapping, struct page *page)
{
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff = page->index << mapping_order(mapping);
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int ret = 0;
@@ -900,7 +915,7 @@ static int try_to_unmap_anon(struct page
static int try_to_unmap_file(struct page *page, int migration)
{
struct address_space *mapping = page->mapping;
- pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
+ pgoff_t pgoff = page->index << mapping_order(mapping);
struct vm_area_struct *vma;
struct prio_tree_iter iter;
int ret = SWAP_AGAIN;
--
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2007-12-27 5:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-27 5:32 [patch 00/18] Page cache: Replace PAGE_CACHE_xx with inline functions V3 Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 01/18] Define functions for page cache handling Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 02/18] Use page_cache_xxx functions in mm/filemap.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 03/18] Use page_cache_xxx in mm/page-writeback.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 04/18] Use page_cache_xxx in mm/truncate.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter [this message]
2007-12-27 5:32 ` [patch 05/18] Use page_cache_xxx in mm/rmap.c Christoph Lameter
2007-12-27 5:32 ` [patch 06/18] Use page_cache_xxx in mm/filemap_xip.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 07/18] Use page_cache_xxx in mm/migrate.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 08/18] Use page_cache_xxx in fs/libfs.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 09/18] Use page_cache_xxx in fs/sync Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 10/18] Use page_cache_xxx in fs/buffer.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 11/18] Use page_cache_xxx in mm/mpage.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 12/18] Use page_cache_xxx in mm/fadvise.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:32 ` [patch 13/18] Use page_cache_xxx in fs/splice.c Christoph Lameter
2007-12-27 5:32 ` Christoph Lameter
2007-12-27 5:33 ` [patch 14/18] Use page_cache_xxx in ext2 Christoph Lameter
2007-12-27 5:33 ` Christoph Lameter
2007-12-27 5:33 ` [patch 15/18] Use page_cache_xxx in fs/ext3 Christoph Lameter
2007-12-27 5:33 ` Christoph Lameter
2007-12-27 5:33 ` [patch 16/18] Use page_cache_xxx in fs/ext4 Christoph Lameter
2007-12-27 5:33 ` Christoph Lameter
2007-12-27 5:33 ` [patch 17/18] Use page_cache_xxx in fs/reiserfs Christoph Lameter
2007-12-27 5:33 ` Christoph Lameter
2007-12-27 5:33 ` [patch 18/18] Use page_cache_xxx for fs/xfs Christoph Lameter
2007-12-27 5:33 ` Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2008-02-16 0:47 [patch 00/18] Page cache: Replace PAGE_CACHE_xx with inline functions V4 Christoph Lameter
2008-02-16 0:47 ` [patch 05/18] Use page_cache_xxx in mm/rmap.c Christoph Lameter
2008-02-16 0:47 ` Christoph Lameter
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=20071227053400.750715035@sgi.com \
--to=clameter@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.