From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: lkml <linux-kernel@vger.kernel.org>, linux-arch@vger.kernel.org
Cc: Zach Brown <zach.brown@oracle.com>, Ingo Molnar <mingo@elte.hu>,
akpm@linux-foundation.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 07/12] lockdep: page lock hooks
Date: Fri, 28 Sep 2007 09:42:07 +0200 [thread overview]
Message-ID: <20070928080042.146800000@chello.nl> (raw)
In-Reply-To: 20070928074200.436463000@chello.nl
[-- Attachment #1: lockdep-page_lock-hooks.patch --]
[-- Type: text/plain, Size: 4269 bytes --]
rework the now complete page lock API to provide acquisition and release hooks.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
include/linux/pagemap.h | 40 +++++++++++++++++++++++++++++++---------
mm/filemap.c | 13 +++++++------
2 files changed, 38 insertions(+), 15 deletions(-)
Index: linux-2.6/include/linux/pagemap.h
===================================================================
--- linux-2.6.orig/include/linux/pagemap.h
+++ linux-2.6/include/linux/pagemap.h
@@ -153,23 +153,45 @@ static inline pgoff_t linear_page_index(
return pgoff >> (PAGE_CACHE_SHIFT - PAGE_SHIFT);
}
-extern void FASTCALL(__lock_page(struct page *page));
-extern void FASTCALL(__lock_page_nosync(struct page *page));
-extern void FASTCALL(unlock_page(struct page *page));
+extern void FASTCALL(__lock_page(struct page *page, unsigned long ip));
+extern void FASTCALL(__lock_page_nosync(struct page *page, unsigned long ip));
+extern void FASTCALL(unlock_page_nocheck(struct page *page));
+
+static inline void __lock_page_check(struct page *page, int try, unsigned long ip)
+{
+}
+
+static inline void __unlock_page_check(struct page *page, unsigned long ip)
+{
+}
/*
* lock_page may only be called if we have the page's inode pinned.
*/
+static inline int __trylock_page(struct page *page, int try)
+{
+ int ret = !TestSetPageLocked(page);
+ if (ret)
+ __lock_page_check(page, try, _RET_IP_);
+ return ret;
+}
+
+static inline int trylock_page(struct page *page)
+{
+ return __trylock_page(page, 1);
+}
+
static inline void lock_page(struct page *page)
{
might_sleep();
- if (TestSetPageLocked(page))
- __lock_page(page);
+ if (!__trylock_page(page, 0))
+ __lock_page(page, _RET_IP_);
}
-static inline int trylock_page(struct page *page)
+static inline void unlock_page(struct page *page)
{
- return !TestSetPageLocked(page);
+ __unlock_page_check(page, _RET_IP_);
+ unlock_page_nocheck(page);
}
/*
@@ -179,8 +201,8 @@ static inline int trylock_page(struct pa
static inline void lock_page_nosync(struct page *page)
{
might_sleep();
- if (TestSetPageLocked(page))
- __lock_page_nosync(page);
+ if (!__trylock_page(page, 0))
+ __lock_page_nosync(page, _RET_IP_);
}
/*
Index: linux-2.6/mm/filemap.c
===================================================================
--- linux-2.6.orig/mm/filemap.c
+++ linux-2.6/mm/filemap.c
@@ -531,7 +531,7 @@ EXPORT_SYMBOL(wait_on_page_bit);
* the clear_bit and the read of the waitqueue (to avoid SMP races with a
* parallel wait_on_page_locked()).
*/
-void fastcall unlock_page(struct page *page)
+void fastcall unlock_page_nocheck(struct page *page)
{
smp_mb__before_clear_bit();
if (!TestClearPageLocked(page))
@@ -539,7 +539,7 @@ void fastcall unlock_page(struct page *p
smp_mb__after_clear_bit();
wake_up_page(page, PG_locked);
}
-EXPORT_SYMBOL(unlock_page);
+EXPORT_SYMBOL(unlock_page_nocheck);
/**
* end_page_writeback - end writeback against a page
@@ -565,12 +565,12 @@ EXPORT_SYMBOL(end_page_writeback);
* chances are that on the second loop, the block layer's plug list is empty,
* so sync_page() will then return in state TASK_UNINTERRUPTIBLE.
*/
-void fastcall __lock_page(struct page *page)
+void fastcall __lock_page(struct page *page, unsigned long ip)
{
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
-
__wait_on_bit_lock(page_waitqueue(page), &wait, sync_page,
TASK_UNINTERRUPTIBLE);
+ __lock_page_check(page, 0, ip);
}
EXPORT_SYMBOL(__lock_page);
@@ -578,11 +578,12 @@ EXPORT_SYMBOL(__lock_page);
* Variant of lock_page that does not require the caller to hold a reference
* on the page's mapping.
*/
-void fastcall __lock_page_nosync(struct page *page)
+void fastcall __lock_page_nosync(struct page *page, unsigned long ip)
{
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
__wait_on_bit_lock(page_waitqueue(page), &wait, __sleep_on_page_lock,
TASK_UNINTERRUPTIBLE);
+ __lock_page_check(page, 0, ip);
}
/**
@@ -628,7 +629,7 @@ repeat:
page_cache_get(page);
if (!trylock_page(page)) {
read_unlock_irq(&mapping->tree_lock);
- __lock_page(page);
+ __lock_page(page, _THIS_IP_);
read_lock_irq(&mapping->tree_lock);
/* Has the page been truncated while we slept? */
--
next prev parent reply other threads:[~2007-09-28 8:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 7:42 [PATCH 00/12] various lockdep patches Peter Zijlstra
2007-09-28 7:42 ` [PATCH 01/12] lockdep: syscall exit check Peter Zijlstra
2007-09-28 12:03 ` Heiko Carstens
2007-09-28 12:14 ` Peter Zijlstra
2007-09-28 12:21 ` Heiko Carstens
2007-09-28 7:42 ` [PATCH 02/12] lockdep: i386: connect the sysexit hook Peter Zijlstra
2007-09-28 7:42 ` [PATCH 03/12] lockdep: x86_64: " Peter Zijlstra
2007-09-28 7:42 ` [PATCH 04/12] lockdep: annotate journal_start() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 05/12] mm: trylock_page Peter Zijlstra
2007-09-28 3:11 ` Nick Piggin
2007-09-29 15:01 ` Peter Zijlstra
2007-10-02 8:44 ` Nick Piggin
2007-09-28 7:42 ` [PATCH 06/12] mm: remove raw SetPageLocked() usage Peter Zijlstra
2007-09-28 8:22 ` Christoph Hellwig
2007-09-28 7:42 ` Peter Zijlstra [this message]
2007-09-28 7:42 ` [PATCH 08/12] lockdep: increase MAX_LOCK_DEPTH Peter Zijlstra
2007-09-28 7:42 ` [PATCH 09/12] lockdep: add a page lock class per filesystem type Peter Zijlstra
2007-09-28 7:42 ` [PATCH 10/12] lockdep: lock_page: handle IO-completions Peter Zijlstra
2007-09-28 7:42 ` [PATCH 11/12] mm: set_page_mapping() Peter Zijlstra
2007-09-28 7:42 ` [PATCH 12/12] lockdep: enable lock_page lockdep annotation Peter Zijlstra
2007-09-28 11:49 ` [PATCH 00/12] various lockdep patches Heiko Carstens
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=20070928080042.146800000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=zach.brown@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).