From: Byungchul Park <byungchul.park@lge.com>
To: peterz@infradead.org, mingo@kernel.org
Cc: tglx@linutronix.de, walken@google.com, boqun.feng@gmail.com,
kirill@shutemov.name, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, iamjoonsoo.kim@lge.com,
akpm@linux-foundation.org, npiggin@gmail.com
Subject: [PATCH v5 11/13] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked
Date: Wed, 18 Jan 2017 22:17:37 +0900 [thread overview]
Message-ID: <1484745459-2055-12-git-send-email-byungchul.park@lge.com> (raw)
In-Reply-To: <1484745459-2055-1-git-send-email-byungchul.park@lge.com>
Usually PG_locked bit is updated by lock_page() or unlock_page().
However, it can be also updated through __SetPageLocked() or
__ClearPageLockded(). They have to be considered, to get paired between
acquire and release.
Furthermore, e.g. __SetPageLocked() in add_to_page_cache_lru() is called
frequently. We might miss many chances to check deadlock if we ignore it.
Make __Set(__Clear)PageLockded considered as well.
Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
include/linux/page-flags.h | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 74e4dda..9d5f79d 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -252,7 +252,6 @@ static __always_inline int PageCompound(struct page *page)
#define TESTSCFLAG_FALSE(uname) \
TESTSETFLAG_FALSE(uname) TESTCLEARFLAG_FALSE(uname)
-__PAGEFLAG(Locked, locked, PF_NO_TAIL)
PAGEFLAG(Error, error, PF_NO_COMPOUND) TESTCLEARFLAG(Error, error, PF_NO_COMPOUND)
PAGEFLAG(Referenced, referenced, PF_HEAD)
TESTCLEARFLAG(Referenced, referenced, PF_HEAD)
@@ -354,6 +353,35 @@ static __always_inline int PageCompound(struct page *page)
PAGEFLAG(Idle, idle, PF_ANY)
#endif
+#ifdef CONFIG_LOCKDEP_PAGELOCK
+#include <linux/lockdep.h>
+
+TESTPAGEFLAG(Locked, locked, PF_NO_TAIL)
+
+static __always_inline void __SetPageLocked(struct page *page)
+{
+ __set_bit(PG_locked, &PF_NO_TAIL(page, 1)->flags);
+
+ page = compound_head(page);
+ lock_acquire_exclusive((struct lockdep_map *)&page->map, 0, 1, NULL, _RET_IP_);
+}
+
+static __always_inline void __ClearPageLocked(struct page *page)
+{
+ __clear_bit(PG_locked, &PF_NO_TAIL(page, 1)->flags);
+
+ page = compound_head(page);
+ /*
+ * lock_commit_crosslock() is necessary for crosslock
+ * when the lock is released, before lock_release().
+ */
+ lock_commit_crosslock((struct lockdep_map *)&page->map);
+ lock_release((struct lockdep_map *)&page->map, 0, _RET_IP_);
+}
+#else
+__PAGEFLAG(Locked, locked, PF_NO_TAIL)
+#endif
+
/*
* On an anonymous page mapped into a user virtual memory area,
* page->mapping points to its anon_vma, not to a struct address_space;
--
1.9.1
next prev parent reply other threads:[~2017-01-18 13:19 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 13:17 [PATCH v5 00/13] lockdep: Implement crossrelease feature Byungchul Park
2017-01-18 13:17 ` [PATCH v5 01/13] lockdep: Refactor lookup_chain_cache() Byungchul Park
2017-01-19 9:16 ` Boqun Feng
2017-01-19 9:52 ` Byungchul Park
2017-01-26 7:53 ` Byungchul Park
2017-01-18 13:17 ` [PATCH v5 02/13] lockdep: Fix wrong condition to print bug msgs for MAX_LOCKDEP_CHAIN_HLOCKS Byungchul Park
2017-01-18 13:17 ` [PATCH v5 03/13] lockdep: Add a function building a chain between two classes Byungchul Park
2017-01-18 13:17 ` [PATCH v5 04/13] lockdep: Refactor save_trace() Byungchul Park
2017-01-18 13:17 ` [PATCH v5 05/13] lockdep: Pass a callback arg to check_prev_add() to handle stack_trace Byungchul Park
2017-01-26 7:43 ` Byungchul Park
2017-01-18 13:17 ` [PATCH v5 06/13] lockdep: Implement crossrelease feature Byungchul Park
2017-02-28 12:26 ` Peter Zijlstra
2017-02-28 12:45 ` Peter Zijlstra
2017-02-28 12:49 ` Peter Zijlstra
2017-03-01 6:20 ` Byungchul Park
2017-02-28 13:05 ` Peter Zijlstra
2017-02-28 13:28 ` Byungchul Park
2017-02-28 13:35 ` Peter Zijlstra
2017-02-28 14:00 ` Byungchul Park
2017-02-28 13:10 ` Peter Zijlstra
2017-02-28 13:24 ` Byungchul Park
2017-02-28 18:29 ` Peter Zijlstra
2017-03-01 4:40 ` Byungchul Park
2017-03-01 10:45 ` Peter Zijlstra
2017-03-01 12:10 ` Byungchul Park
2017-02-28 13:40 ` Peter Zijlstra
2017-03-01 5:43 ` Byungchul Park
2017-03-01 12:28 ` Peter Zijlstra
2017-03-02 13:40 ` Peter Zijlstra
2017-03-03 0:17 ` Byungchul Park
2017-03-03 8:14 ` Peter Zijlstra
2017-03-03 9:13 ` Peter Zijlstra
2017-03-03 9:32 ` Peter Zijlstra
2017-03-05 3:33 ` Byungchul Park
2017-08-10 12:18 ` [tip:locking/core] locking/lockdep: Avoid creating redundant links tip-bot for Peter Zijlstra
2017-03-05 3:08 ` [PATCH v5 06/13] lockdep: Implement crossrelease feature Byungchul Park
2017-03-07 11:42 ` Peter Zijlstra
2017-03-03 0:39 ` Byungchul Park
2017-02-28 15:49 ` Peter Zijlstra
2017-03-01 5:17 ` Byungchul Park
2017-03-01 6:18 ` Byungchul Park
2017-03-02 2:52 ` Byungchul Park
2017-02-28 18:15 ` Peter Zijlstra
2017-03-01 7:21 ` Byungchul Park
2017-03-01 10:43 ` Peter Zijlstra
2017-03-01 12:27 ` Byungchul Park
2017-03-02 4:20 ` Matthew Wilcox
2017-03-02 4:45 ` byungchul.park
2017-03-02 14:39 ` Matthew Wilcox
2017-03-02 23:50 ` Byungchul Park
2017-03-05 8:01 ` Byungchul Park
2017-03-14 7:36 ` Byungchul Park
2017-03-02 13:41 ` Peter Zijlstra
2017-03-02 23:43 ` Byungchul Park
2017-01-18 13:17 ` [PATCH v5 07/13] lockdep: Make print_circular_bug() aware of crossrelease Byungchul Park
2017-01-18 13:17 ` [PATCH v5 08/13] lockdep: Apply crossrelease to completions Byungchul Park
2017-01-18 13:17 ` [PATCH v5 09/13] pagemap.h: Remove trailing white space Byungchul Park
2017-01-18 13:17 ` [PATCH v5 10/13] lockdep: Apply crossrelease to PG_locked locks Byungchul Park
2017-01-18 13:17 ` Byungchul Park [this message]
2017-01-18 13:17 ` [PATCH v5 12/13] lockdep: Move data of CONFIG_LOCKDEP_PAGELOCK from page to page_ext Byungchul Park
2017-01-18 13:17 ` [PATCH v5 13/13] lockdep: Crossrelease feature documentation Byungchul Park
2017-01-20 9:08 ` [REVISED DOCUMENT] " Byungchul Park
2017-02-20 8:38 ` [PATCH v5 00/13] lockdep: Implement crossrelease feature Byungchul Park
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=1484745459-2055-12-git-send-email-byungchul.park@lge.com \
--to=byungchul.park@lge.com \
--cc=akpm@linux-foundation.org \
--cc=boqun.feng@gmail.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=walken@google.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).