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>, <willy@infradead.org>, <npiggin@gmail.com>, <kernel-team@lge.com> Subject: [PATCH v6 13/15] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked Date: Tue, 14 Mar 2017 17:19:00 +0900 [thread overview] Message-ID: <1489479542-27030-14-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1489479542-27030-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
WARNING: multiple messages have this Message-ID (diff)
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, willy@infradead.org, npiggin@gmail.com, kernel-team@lge.com Subject: [PATCH v6 13/15] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked Date: Tue, 14 Mar 2017 17:19:00 +0900 [thread overview] Message-ID: <1489479542-27030-14-git-send-email-byungchul.park@lge.com> (raw) In-Reply-To: <1489479542-27030-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 -- 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:[~2017-03-14 8:26 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-14 8:18 [PATCH v6 00/15] lockdep: Implement crossrelease feature Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 01/15] lockdep: Refactor lookup_chain_cache() Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 02/15] lockdep: Add a function building a chain between two classes Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 03/15] lockdep: Change the meaning of check_prev_add()'s return value Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 04/15] lockdep: Make check_prev_add() able to handle external stack_trace Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 05/15] lockdep: Implement crossrelease feature Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-04-19 14:25 ` Peter Zijlstra 2017-04-19 14:25 ` Peter Zijlstra 2017-04-24 5:11 ` Byungchul Park 2017-04-24 5:11 ` Byungchul Park 2017-04-24 10:17 ` Peter Zijlstra 2017-04-24 10:17 ` Peter Zijlstra 2017-04-25 5:40 ` Byungchul Park 2017-04-25 5:40 ` Byungchul Park 2017-05-16 14:18 ` Peter Zijlstra 2017-05-16 14:18 ` Peter Zijlstra 2017-05-18 6:22 ` Byungchul Park 2017-05-18 6:22 ` Byungchul Park 2017-04-19 15:08 ` Peter Zijlstra 2017-04-19 15:08 ` Peter Zijlstra 2017-04-24 4:36 ` Byungchul Park 2017-04-24 4:36 ` Byungchul Park 2017-04-19 17:19 ` Peter Zijlstra 2017-04-19 17:19 ` Peter Zijlstra 2017-04-24 3:04 ` Byungchul Park 2017-04-24 3:04 ` Byungchul Park 2017-04-24 9:30 ` Peter Zijlstra 2017-04-24 9:30 ` Peter Zijlstra 2017-04-25 6:59 ` Byungchul Park 2017-04-25 6:59 ` Byungchul Park 2017-04-19 17:20 ` Peter Zijlstra 2017-04-19 17:20 ` Peter Zijlstra 2017-04-24 3:13 ` Byungchul Park 2017-04-24 3:13 ` Byungchul Park 2017-05-19 8:07 ` Byungchul Park 2017-05-19 8:07 ` Byungchul Park 2017-05-19 10:30 ` Peter Zijlstra 2017-05-19 10:30 ` Peter Zijlstra 2017-05-19 10:56 ` Byungchul Park 2017-05-19 10:56 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 06/15] lockdep: Handle non(or multi)-acquisition of a crosslock Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 07/15] lockdep: Avoid adding redundant direct links of crosslocks Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 08/15] lockdep: Fix incorrect condition to print bug msgs for MAX_LOCKDEP_CHAIN_HLOCKS Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 09/15] lockdep: Make print_circular_bug() aware of crossrelease Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 10/15] lockdep: Apply crossrelease to completions Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 11/15] pagemap.h: Remove trailing white space Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:18 ` [PATCH v6 12/15] lockdep: Apply crossrelease to PG_locked locks Byungchul Park 2017-03-14 8:18 ` Byungchul Park 2017-03-14 8:19 ` Byungchul Park [this message] 2017-03-14 8:19 ` [PATCH v6 13/15] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked Byungchul Park 2017-03-14 8:19 ` [PATCH v6 14/15] lockdep: Move data of CONFIG_LOCKDEP_PAGELOCK from page to page_ext Byungchul Park 2017-03-14 8:19 ` Byungchul Park 2017-03-14 8:19 ` [PATCH v6 15/15] lockdep: Crossrelease feature documentation Byungchul Park 2017-03-14 8:19 ` 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=1489479542-27030-14-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=kernel-team@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 \ --cc=willy@infradead.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: linkBe 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.