From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx193.postini.com [74.125.245.193]) by kanga.kvack.org (Postfix) with SMTP id 2B6D66B0006 for ; Mon, 4 Mar 2013 07:23:02 -0500 (EST) Received: by mail-ob0-f171.google.com with SMTP id x4so1832750obh.16 for ; Mon, 04 Mar 2013 04:23:01 -0800 (PST) MIME-Version: 1.0 Date: Mon, 4 Mar 2013 20:23:00 +0800 Message-ID: Subject: [PATCH] rmap: recompute pgoff for unmapping huge page From: Hillf Danton Content-Type: multipart/alternative; boundary=bcaec54d43fe002ee804d7186b91 Sender: owner-linux-mm@kvack.org List-ID: To: Linux-MM , Hillf Danton Cc: Michal Hocko , Michel Lespinasse , Andrew Morton , LKML --bcaec54d43fe002ee804d7186b91 Content-Type: text/plain; charset=UTF-8 We have to recompute pgoff if the given page is huge, since result based on HPAGE_SIZE is inappropriate for scanning the vma interval tree, as shown by commit 36e4f20af833(hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach) Signed-off-by: Hillf Danton --- --- a/mm/rmap.c Mon Mar 4 20:00:00 2013 +++ b/mm/rmap.c Mon Mar 4 20:02:16 2013 @@ -1513,6 +1513,9 @@ static int try_to_unmap_file(struct page unsigned long max_nl_size = 0; unsigned int mapcount; + if (PageHuge(page)) + pgoff = page->index << compound_order(page); + mutex_lock(&mapping->i_mmap_mutex); vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { unsigned long address = vma_address(page, vma); -- --bcaec54d43fe002ee804d7186b91 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
We have to recompute pgoff if the given page is huge,= since result based on
HPAGE_SIZE is inappropriate for scanni= ng the vma interval tree, as shown
by commit 36e4f20af833(hugetlb= : do not use vma_hugecache_offset() for
vma_prio_tree_foreach)


Signed-= off-by: Hillf Danton <dhillf@gmail.c= om>
---

--- a/mm/rmap.c Mon Mar =C2=A04 20:00:00 2013
+++ b/mm/rmap.c Mon = Mar =C2=A04 20:02:16 2013
@@ -1513,6 +1513,9 @@ static int try_to= _unmap_file(struct page
=C2=A0 unsigned long max_nl_size =3D 0;
=C2=A0 unsigned int = mapcount;
=C2=A0
+ if (PageHuge(page))
+ pgoff =3D page->index << compound_order(page= );
+
=C2=A0 m= utex_lock(&mapping->i_mmap_mutex);
=C2=A0 vma_interval_tree_foreach(vma, &mappi= ng->i_mmap, pgoff, pgoff) {
=C2=A0 unsigned lon= g address =3D vma_address(page, vma);
--

--bcaec54d43fe002ee804d7186b91-- -- 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: email@kvack.org