All of lore.kernel.org
 help / color / mirror / Atom feed
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>,
	Hugh Dickins <hughd@google.com>, Christoph Lameter <cl@linux.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Rik van Riel <riel@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Andi Kleen <andi@firstfloor.org>, linux-mm <linux-mm@kvack.org>
Subject: [PATCH 1/4] hugetlb, rmap: always use anon_vma root pointer
Date: Fri, 10 Sep 2010 13:23:03 +0900	[thread overview]
Message-ID: <1284092586-1179-2-git-send-email-n-horiguchi@ah.jp.nec.com> (raw)
In-Reply-To: <1284092586-1179-1-git-send-email-n-horiguchi@ah.jp.nec.com>

This patch applies Andrea's fix given by the following patch into hugepage
rmapping code:

  commit 288468c334e98aacbb7e2fb8bde6bc1adcd55e05
  Author: Andrea Arcangeli <aarcange@redhat.com>
  Date:   Mon Aug 9 17:19:09 2010 -0700

This patch uses anon_vma->root and avoids unnecessary overwriting when
anon_vma is already set up.

Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
---
 mm/rmap.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git v2.6.36-rc3/mm/rmap.c v2.6.36-rc3/mm/rmap.c
index f6f0d2d..2854857 100644
--- v2.6.36-rc3/mm/rmap.c
+++ v2.6.36-rc3/mm/rmap.c
@@ -1564,13 +1564,14 @@ static void __hugepage_set_anon_rmap(struct page *page,
 	struct vm_area_struct *vma, unsigned long address, int exclusive)
 {
 	struct anon_vma *anon_vma = vma->anon_vma;
+
 	BUG_ON(!anon_vma);
-	if (!exclusive) {
-		struct anon_vma_chain *avc;
-		avc = list_entry(vma->anon_vma_chain.prev,
-				 struct anon_vma_chain, same_vma);
-		anon_vma = avc->anon_vma;
-	}
+
+	if (PageAnon(page))
+		return;
+	if (!exclusive)
+		anon_vma = anon_vma->root;
+
 	anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
 	page->mapping = (struct address_space *) anon_vma;
 	page->index = linear_page_index(vma, address);
-- 
1.7.2.2


WARNING: multiple messages have this Message-ID (diff)
From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>,
	Hugh Dickins <hughd@google.com>, Christoph Lameter <cl@linux.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Rik van Riel <riel@redhat.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Andi Kleen <andi@firstfloor.org>, linux-mm <linux-mm@kvack.org>
Subject: [PATCH 1/4] hugetlb, rmap: always use anon_vma root pointer
Date: Fri, 10 Sep 2010 13:23:03 +0900	[thread overview]
Message-ID: <1284092586-1179-2-git-send-email-n-horiguchi@ah.jp.nec.com> (raw)
In-Reply-To: <1284092586-1179-1-git-send-email-n-horiguchi@ah.jp.nec.com>

This patch applies Andrea's fix given by the following patch into hugepage
rmapping code:

  commit 288468c334e98aacbb7e2fb8bde6bc1adcd55e05
  Author: Andrea Arcangeli <aarcange@redhat.com>
  Date:   Mon Aug 9 17:19:09 2010 -0700

This patch uses anon_vma->root and avoids unnecessary overwriting when
anon_vma is already set up.

Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
---
 mm/rmap.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git v2.6.36-rc3/mm/rmap.c v2.6.36-rc3/mm/rmap.c
index f6f0d2d..2854857 100644
--- v2.6.36-rc3/mm/rmap.c
+++ v2.6.36-rc3/mm/rmap.c
@@ -1564,13 +1564,14 @@ static void __hugepage_set_anon_rmap(struct page *page,
 	struct vm_area_struct *vma, unsigned long address, int exclusive)
 {
 	struct anon_vma *anon_vma = vma->anon_vma;
+
 	BUG_ON(!anon_vma);
-	if (!exclusive) {
-		struct anon_vma_chain *avc;
-		avc = list_entry(vma->anon_vma_chain.prev,
-				 struct anon_vma_chain, same_vma);
-		anon_vma = avc->anon_vma;
-	}
+
+	if (PageAnon(page))
+		return;
+	if (!exclusive)
+		anon_vma = anon_vma->root;
+
 	anon_vma = (void *) anon_vma + PAGE_MAPPING_ANON;
 	page->mapping = (struct address_space *) anon_vma;
 	page->index = linear_page_index(vma, address);
-- 
1.7.2.2

--
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>

  reply	other threads:[~2010-09-10  4:26 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-10  4:23 [PATCH 0/4] hugetlb, rmap: fixes and cleanups Naoya Horiguchi
2010-09-10  4:23 ` Naoya Horiguchi
2010-09-10  4:23 ` Naoya Horiguchi [this message]
2010-09-10  4:23   ` [PATCH 1/4] hugetlb, rmap: always use anon_vma root pointer Naoya Horiguchi
2010-09-10 14:37   ` Andrea Arcangeli
2010-09-10 14:37     ` Andrea Arcangeli
2010-09-10 14:40   ` Rik van Riel
2010-09-10 14:40     ` Rik van Riel
2010-09-10 17:19   ` Linus Torvalds
2010-09-10 17:19     ` Linus Torvalds
2010-09-10 21:50     ` Andi Kleen
2010-09-10 21:50       ` Andi Kleen
2010-09-10 22:07       ` Linus Torvalds
2010-09-10 22:07         ` Linus Torvalds
2010-09-11  2:09       ` Rik van Riel
2010-09-11  2:09         ` Rik van Riel
2010-09-10  4:23 ` [PATCH 2/4] hugetlb, rmap: use hugepage_add_new_anon_rmap() in hugetlb_cow() Naoya Horiguchi
2010-09-10  4:23   ` Naoya Horiguchi
2010-09-10 14:39   ` Andrea Arcangeli
2010-09-10 14:39     ` Andrea Arcangeli
2010-09-10 14:40   ` Rik van Riel
2010-09-10 14:40     ` Rik van Riel
2010-09-10  4:23 ` [PATCH 3/4] hugetlb, rmap: fix confusing page locking " Naoya Horiguchi
2010-09-10  4:23   ` Naoya Horiguchi
2010-09-10 14:41   ` Rik van Riel
2010-09-10 14:41     ` Rik van Riel
2010-09-10 17:15   ` Linus Torvalds
2010-09-10 17:15     ` Linus Torvalds
2010-09-23 23:50     ` Naoya Horiguchi
2010-09-23 23:50       ` Naoya Horiguchi
2010-09-10  4:23 ` [PATCH 4/4] hugetlb, rmap: add BUG_ON(!PageLocked) in hugetlb_add_anon_rmap() Naoya Horiguchi
2010-09-10  4:23   ` Naoya Horiguchi
2010-09-10 14:42   ` Rik van Riel
2010-09-10 14:42     ` Rik van Riel
2010-09-10 14:44   ` Andrea Arcangeli
2010-09-10 14:44     ` Andrea Arcangeli
2010-09-10  9:04 ` [PATCH 0/4] hugetlb, rmap: fixes and cleanups Andi Kleen
2010-09-10  9:04   ` Andi Kleen
2010-09-10 11:47   ` Naoya Horiguchi
2010-09-10 11:47     ` Naoya Horiguchi
2010-09-10 14:30     ` Andi Kleen
2010-09-10 14:30       ` Andi Kleen

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=1284092586-1179-2-git-send-email-n-horiguchi@ah.jp.nec.com \
    --to=n-horiguchi@ah.jp.nec.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=andi@firstfloor.org \
    --cc=cl@linux.com \
    --cc=hughd@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=peterz@infradead.org \
    --cc=riel@redhat.com \
    --cc=torvalds@linux-foundation.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.