From: Andrea Arcangeli <aarcange@redhat.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
Adam Litke <agl@us.ibm.com>, Avi Kivity <avi@redhat.com>,
Izik Eidus <ieidus@redhat.com>,
Hugh Dickins <hugh.dickins@tiscali.co.uk>,
Nick Piggin <npiggin@suse.de>, Rik van Riel <riel@redhat.com>,
Mel Gorman <mel@csn.ul.ie>, Dave Hansen <dave@linux.vnet.ibm.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Ingo Molnar <mingo@elte.hu>, Mike Travis <travis@sgi.com>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Christoph Lameter <cl@linux-foundation.org>,
Chris Wright <chrisw@sous-sol.org>,
bpicco@redhat.com,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Balbir Singh <balbir@linux.vnet.ibm.com>,
Arnd Bergmann <arnd@arndb.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Subject: [PATCH 04 of 41] update futex compound knowledge
Date: Fri, 02 Apr 2010 02:41:31 +0200 [thread overview]
Message-ID: <de03af04f729a91d8ef0.1270168891@v2.random> (raw)
In-Reply-To: <patchbomb.1270168887@v2.random>
From: Andrea Arcangeli <aarcange@redhat.com>
Futex code is smarter than most other gup_fast O_DIRECT code and knows about
the compound internals. However now doing a put_page(head_page) will not
release the pin on the tail page taken by gup-fast, leading to all sort of
refcounting bugchecks. Getting a stable head_page is a little tricky.
page_head = page is there because if this is not a tail page it's also the
page_head. Only in case this is a tail page, compound_head is called, otherwise
it's guaranteed unnecessary. And if it's a tail page compound_head has to run
atomically inside irq disabled section __get_user_pages_fast before returning.
Otherwise ->first_page won't be a stable pointer.
Disableing irq before __get_user_page_fast and releasing irq after running
compound_head is needed because if __get_user_page_fast returns == 1, it means
the huge pmd is established and cannot go away from under us.
pmdp_splitting_flush_notify in __split_huge_page_splitting will have to wait
for local_irq_enable before the IPI delivery can return. This means
__split_huge_page_refcount can't be running from under us, and in turn when we
run compound_head(page) we're not reading a dangling pointer from
tailpage->first_page. Then after we get to stable head page, we are always safe
to call compound_lock and after taking the compound lock on head page we can
finally re-check if the page returned by gup-fast is still a tail page. in
which case we're set and we didn't need to split the hugepage in order to take
a futex on it.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Acked-by: Rik van Riel <riel@redhat.com>
---
diff --git a/kernel/futex.c b/kernel/futex.c
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -218,7 +218,7 @@ get_futex_key(u32 __user *uaddr, int fsh
{
unsigned long address = (unsigned long)uaddr;
struct mm_struct *mm = current->mm;
- struct page *page;
+ struct page *page, *page_head;
int err;
/*
@@ -250,10 +250,53 @@ again:
if (err < 0)
return err;
- page = compound_head(page);
- lock_page(page);
- if (!page->mapping) {
- unlock_page(page);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+ page_head = page;
+ if (unlikely(PageTail(page))) {
+ put_page(page);
+ /* serialize against __split_huge_page_splitting() */
+ local_irq_disable();
+ if (likely(__get_user_pages_fast(address, 1, 1, &page) == 1)) {
+ page_head = compound_head(page);
+ /*
+ * page_head is valid pointer but we must pin
+ * it before taking the PG_lock and/or
+ * PG_compound_lock. The moment we re-enable
+ * irqs __split_huge_page_splitting() can
+ * return and the head page can be freed from
+ * under us. We can't take the PG_lock and/or
+ * PG_compound_lock on a page that could be
+ * freed from under us.
+ */
+ if (page != page_head)
+ get_page(page_head);
+ local_irq_enable();
+ } else {
+ local_irq_enable();
+ goto again;
+ }
+ }
+#else
+ page_head = compound_head(page);
+ if (page != page_head)
+ get_page(page_head);
+#endif
+
+ lock_page(page_head);
+ if (unlikely(page_head != page)) {
+ compound_lock(page_head);
+ if (unlikely(!PageTail(page))) {
+ compound_unlock(page_head);
+ unlock_page(page_head);
+ put_page(page_head);
+ put_page(page);
+ goto again;
+ }
+ }
+ if (!page_head->mapping) {
+ unlock_page(page_head);
+ if (page_head != page)
+ put_page(page_head);
put_page(page);
goto again;
}
@@ -265,19 +308,25 @@ again:
* it's a read-only handle, it's expected that futexes attach to
* the object not the particular process.
*/
- if (PageAnon(page)) {
+ if (PageAnon(page_head)) {
key->both.offset |= FUT_OFF_MMSHARED; /* ref taken on mm */
key->private.mm = mm;
key->private.address = address;
} else {
key->both.offset |= FUT_OFF_INODE; /* inode-based key */
- key->shared.inode = page->mapping->host;
- key->shared.pgoff = page->index;
+ key->shared.inode = page_head->mapping->host;
+ key->shared.pgoff = page_head->index;
}
get_futex_key_refs(key);
- unlock_page(page);
+ unlock_page(page_head);
+ if (page != page_head) {
+ VM_BUG_ON(!PageTail(page));
+ /* releasing compound_lock after page_lock won't matter */
+ compound_unlock(page_head);
+ put_page(page_head);
+ }
put_page(page);
return 0;
}
--
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:[~2010-04-02 0:45 UTC|newest]
Thread overview: 208+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-02 0:41 [PATCH 00 of 41] Transparent Hugepage Support #17 Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 01 of 41] define MADV_HUGEPAGE Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 02 of 41] compound_lock Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 03 of 41] alter compound get_page/put_page Andrea Arcangeli
2010-04-02 0:41 ` Andrea Arcangeli [this message]
2010-04-02 0:41 ` [PATCH 05 of 41] fix bad_page to show the real reason the page is bad Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 06 of 41] clear compound mapping Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 07 of 41] add native_set_pmd_at Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 08 of 41] add pmd paravirt ops Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 09 of 41] no paravirt version of pmd ops Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 10 of 41] export maybe_mkwrite Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 11 of 41] comment reminder in destroy_compound_page Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 12 of 41] config_transparent_hugepage Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 13 of 41] special pmd_trans_* functions Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 14 of 41] add pmd mangling generic functions Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 15 of 41] add pmd mangling functions to x86 Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 16 of 41] bail out gup_fast on splitting pmd Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 17 of 41] pte alloc trans splitting Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 18 of 41] add pmd mmu_notifier helpers Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 19 of 41] clear page compound Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 20 of 41] add pmd_huge_pte to mm_struct Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 21 of 41] split_huge_page_mm/vma Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 22 of 41] split_huge_page paging Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 23 of 41] clear_copy_huge_page Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 24 of 41] kvm mmu transparent hugepage support Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 25 of 41] _GFP_NO_KSWAPD Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 26 of 41] don't alloc harder for gfp nomemalloc even if nowait Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 27 of 41] transparent hugepage core Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 28 of 41] verify pmd_trans_huge isn't leaking Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 29 of 41] madvise(MADV_HUGEPAGE) Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 30 of 41] pmd_trans_huge migrate bugcheck Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 31 of 41] memcg compound Andrea Arcangeli
2010-04-02 0:41 ` [PATCH 32 of 41] memcg huge memory Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 33 of 41] transparent hugepage vmstat Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 34 of 41] khugepaged Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 35 of 41] skip transhuge pages in ksm for now Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 36 of 41] remove PG_buddy Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 37 of 41] add x86 32bit support Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 38 of 41] mincore transparent hugepage support Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 39 of 41] add pmd_modify Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 40 of 41] mprotect: pass vma down to page table walkers Andrea Arcangeli
2010-04-02 0:42 ` [PATCH 41 of 41] mprotect: transparent huge page support Andrea Arcangeli
2010-04-05 19:09 ` [PATCH 00 of 41] Transparent Hugepage Support #17 Andrew Morton
2010-04-05 19:36 ` Ingo Molnar
2010-04-05 20:26 ` Pekka Enberg
2010-04-05 20:32 ` Linus Torvalds
2010-04-05 20:46 ` Pekka Enberg
2010-04-05 20:58 ` Linus Torvalds
2010-04-05 21:54 ` Ingo Molnar
2010-04-05 23:21 ` Andrea Arcangeli
2010-04-06 0:26 ` Linus Torvalds
2010-04-06 1:08 ` [RFD] " Linus Torvalds
2010-04-06 1:26 ` Andrea Arcangeli
2010-04-06 1:35 ` Linus Torvalds
2010-04-06 1:13 ` Andrea Arcangeli
2010-04-06 1:38 ` Linus Torvalds
2010-04-06 2:23 ` Linus Torvalds
2010-04-06 5:25 ` Nick Piggin
2010-04-06 9:08 ` Ingo Molnar
2010-04-06 9:13 ` Ingo Molnar
2010-04-10 18:47 ` Andrea Arcangeli
2010-04-10 19:02 ` Ingo Molnar
2010-04-10 19:22 ` Avi Kivity
2010-04-10 19:47 ` Ingo Molnar
2010-04-10 20:00 ` Andrea Arcangeli
2010-04-10 20:10 ` Andrea Arcangeli
2010-04-10 20:21 ` Jason Garrett-Glaser
2010-04-10 20:24 ` Avi Kivity
2010-04-10 20:42 ` Avi Kivity
2010-04-10 20:47 ` Andrea Arcangeli
2010-04-10 21:00 ` Avi Kivity
2010-04-10 21:47 ` Andrea Arcangeli
2010-04-11 1:05 ` Andrea Arcangeli
2010-04-11 11:24 ` Ingo Molnar
2010-04-11 11:33 ` Avi Kivity
2010-04-11 12:11 ` Ingo Molnar
2010-04-25 19:27 ` Andrea Arcangeli
2010-04-26 18:01 ` Andrea Arcangeli
2010-04-30 9:55 ` Ingo Molnar
2010-04-30 15:19 ` Andrea Arcangeli
2010-05-02 12:17 ` Ingo Molnar
2010-04-10 20:49 ` Jason Garrett-Glaser
2010-04-10 20:53 ` Avi Kivity
2010-04-10 20:58 ` Jason Garrett-Glaser
2010-04-11 9:29 ` Avi Kivity
2010-04-11 9:37 ` Jason Garrett-Glaser
2010-04-11 9:40 ` Avi Kivity
2010-04-11 10:22 ` Jason Garrett-Glaser
2010-04-11 11:00 ` Ingo Molnar
2010-04-11 11:19 ` Avi Kivity
2010-04-11 11:30 ` Jason Garrett-Glaser
2010-04-11 11:52 ` hugepages will matter more in the future Ingo Molnar
2010-04-11 12:01 ` Avi Kivity
2010-04-11 12:35 ` Ingo Molnar
2010-04-11 15:22 ` Linus Torvalds
2010-04-11 15:43 ` Avi Kivity
2010-04-11 15:52 ` Linus Torvalds
2010-04-11 16:04 ` Avi Kivity
2010-04-12 7:45 ` Ingo Molnar
2010-04-12 8:14 ` Nick Piggin
2010-04-12 8:22 ` Ingo Molnar
2010-04-12 8:34 ` Nick Piggin
2010-04-12 8:47 ` Avi Kivity
2010-04-12 8:45 ` Andrea Arcangeli
2010-04-11 19:35 ` Andrea Arcangeli
2010-04-12 16:20 ` Rik van Riel
2010-04-12 16:40 ` Linus Torvalds
2010-04-12 16:56 ` Linus Torvalds
2010-04-12 17:06 ` Randy Dunlap
2010-04-12 17:36 ` Andrea Arcangeli
2010-04-12 17:46 ` Rik van Riel
2010-04-11 19:40 ` Andrea Arcangeli
2010-04-12 15:41 ` Linus Torvalds
2010-04-12 11:22 ` Arjan van de Ven
2010-04-12 11:29 ` Avi Kivity
2010-04-17 15:12 ` Arjan van de Ven
2010-04-17 18:18 ` Avi Kivity
2010-04-17 19:05 ` Arjan van de Ven
2010-04-17 19:05 ` Avi Kivity
2010-04-17 19:18 ` Arjan van de Ven
2010-04-17 19:20 ` Avi Kivity
2010-04-12 13:30 ` Andrea Arcangeli
2010-04-12 13:33 ` Avi Kivity
2010-04-12 13:39 ` Andrea Arcangeli
2010-04-12 13:53 ` Avi Kivity
2010-04-13 11:38 ` Ingo Molnar
2010-04-13 13:17 ` Andrea Arcangeli
2010-04-11 10:46 ` [PATCH 00 of 41] Transparent Hugepage Support #17 Ingo Molnar
2010-04-11 10:49 ` Ingo Molnar
2010-04-11 11:30 ` Avi Kivity
2010-04-11 12:08 ` Ingo Molnar
2010-04-11 12:24 ` Avi Kivity
2010-04-11 12:46 ` Ingo Molnar
2010-04-12 6:09 ` Nick Piggin
2010-04-12 6:18 ` Pekka Enberg
2010-04-12 6:48 ` Nick Piggin
2010-04-12 14:29 ` Christoph Lameter
2010-04-12 16:06 ` Nick Piggin
2010-04-12 6:36 ` Avi Kivity
2010-04-12 6:55 ` Ingo Molnar
2010-04-12 7:15 ` Nick Piggin
2010-04-12 7:45 ` Avi Kivity
2010-04-12 8:28 ` Nick Piggin
2010-04-12 9:01 ` Andrea Arcangeli
2010-04-12 9:03 ` Avi Kivity
2010-04-12 9:26 ` Nick Piggin
2010-04-12 9:39 ` Andrea Arcangeli
2010-04-12 10:02 ` Avi Kivity
2010-04-12 10:08 ` Andrea Arcangeli
2010-04-12 10:10 ` Avi Kivity
2010-04-12 10:23 ` Andrea Arcangeli
2010-04-12 10:37 ` Nick Piggin
2010-04-12 10:59 ` Avi Kivity
2010-04-12 12:23 ` Avi Kivity
2010-04-12 13:25 ` Andrea Arcangeli
2010-04-13 0:38 ` Andrew Morton
2010-04-13 6:18 ` Neil Brown
2010-04-13 13:31 ` Andrea Arcangeli
2010-04-13 13:40 ` Mel Gorman
2010-04-13 13:44 ` Andrea Arcangeli
2010-04-13 13:55 ` Mel Gorman
2010-04-13 14:03 ` Andrea Arcangeli
2010-04-12 7:51 ` Ingo Molnar
2010-04-12 7:18 ` Andrea Arcangeli
2010-04-12 6:49 ` Ingo Molnar
2010-04-12 7:35 ` Andrea Arcangeli
2010-04-12 7:08 ` Andrea Arcangeli
2010-04-12 7:21 ` Nick Piggin
2010-04-12 7:50 ` Avi Kivity
2010-04-12 8:07 ` Ingo Molnar
2010-04-12 8:21 ` Andrea Arcangeli
2010-04-12 10:27 ` Mel Gorman
2010-04-12 8:18 ` Andrea Arcangeli
2010-04-12 8:06 ` Andrea Arcangeli
2010-04-12 10:44 ` Mel Gorman
2010-04-12 11:12 ` Avi Kivity
2010-04-12 13:17 ` Andrea Arcangeli
2010-04-12 14:24 ` Christoph Lameter
2010-04-12 14:49 ` Avi Kivity
2010-04-06 9:55 ` Avi Kivity
2010-04-06 9:57 ` Avi Kivity
2010-04-06 11:55 ` Avi Kivity
2010-04-06 13:10 ` Nick Piggin
2010-04-06 13:22 ` Avi Kivity
2010-04-06 13:45 ` Nick Piggin
2010-04-06 13:57 ` Avi Kivity
2010-04-06 16:50 ` Andrea Arcangeli
2010-04-06 17:31 ` Avi Kivity
2010-04-06 18:00 ` Christoph Lameter
2010-04-06 18:04 ` Avi Kivity
2010-04-06 18:47 ` Avi Kivity
2010-04-06 14:44 ` Rik van Riel
2010-04-06 16:43 ` Andrea Arcangeli
2010-04-06 9:30 ` Mel Gorman
2010-04-06 10:32 ` Theodore Tso
2010-04-06 11:16 ` Mel Gorman
2010-04-06 13:13 ` Theodore Tso
2010-04-06 14:55 ` Mel Gorman
2010-04-06 16:46 ` Andrea Arcangeli
2010-04-05 21:01 ` Chris Mason
2010-04-05 21:18 ` Avi Kivity
2010-04-05 21:33 ` Linus Torvalds
2010-04-05 22:33 ` Chris Mason
2010-04-06 8:30 ` Mel Gorman
2010-04-06 11:35 ` Chris Mason
-- strict thread matches above, loose matches on Subject: below --
2010-03-29 18:37 [PATCH 00 of 41] Transparent Hugepage Support #16 Andrea Arcangeli
2010-03-29 18:37 ` [PATCH 04 of 41] update futex compound knowledge Andrea Arcangeli
2010-03-26 17:00 [PATCH 00 of 41] Transparent Hugepage Support #15 Andrea Arcangeli
2010-03-26 17:00 ` [PATCH 04 of 41] update futex compound knowledge Andrea Arcangeli
2010-03-26 16:48 [PATCH 00 of 41] Transparent Hugepage Support #15 Andrea Arcangeli
2010-03-26 16:48 ` [PATCH 04 of 41] update futex compound knowledge Andrea Arcangeli
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=de03af04f729a91d8ef0.1270168891@v2.random \
--to=aarcange@redhat.com \
--cc=agl@us.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=avi@redhat.com \
--cc=balbir@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bpicco@redhat.com \
--cc=chrisw@sous-sol.org \
--cc=cl@linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=hannes@cmpxchg.org \
--cc=hugh.dickins@tiscali.co.uk \
--cc=ieidus@redhat.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=mel@csn.ul.ie \
--cc=mingo@elte.hu \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=nishimura@mxp.nes.nec.co.jp \
--cc=npiggin@suse.de \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=travis@sgi.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 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.