Skip to content

Commit

Permalink
rmap: annotate lock context change on page_[un]lock_anon_vma()
Browse files Browse the repository at this point in the history
The page_lock_anon_vma() conditionally grabs RCU and anon_vma lock but
page_unlock_anon_vma() releases them unconditionally.  This leads sparse
to complain about context imbalance.  Annotate them.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Namhyung Kim authored and Linus Torvalds committed Oct 26, 2010
1 parent 1b36ba8 commit ea4525b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
15 changes: 14 additions & 1 deletion include/linux/rmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,20 @@ int try_to_munlock(struct page *);
/*
* Called by memory-failure.c to kill processes.
*/
struct anon_vma *page_lock_anon_vma(struct page *page);
struct anon_vma *__page_lock_anon_vma(struct page *page);

static inline struct anon_vma *page_lock_anon_vma(struct page *page)
{
struct anon_vma *anon_vma;

__cond_lock(RCU, anon_vma = __page_lock_anon_vma(page));

/* (void) is needed to make gcc happy */
(void) __cond_lock(&anon_vma->root->lock, anon_vma);

return anon_vma;
}

void page_unlock_anon_vma(struct anon_vma *anon_vma);
int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);

Expand Down
4 changes: 3 additions & 1 deletion mm/rmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void __init anon_vma_init(void)
* Getting a lock on a stable anon_vma from a page off the LRU is
* tricky: page_lock_anon_vma rely on RCU to guard against the races.
*/
struct anon_vma *page_lock_anon_vma(struct page *page)
struct anon_vma *__page_lock_anon_vma(struct page *page)
{
struct anon_vma *anon_vma, *root_anon_vma;
unsigned long anon_mapping;
Expand Down Expand Up @@ -348,6 +348,8 @@ struct anon_vma *page_lock_anon_vma(struct page *page)
}

void page_unlock_anon_vma(struct anon_vma *anon_vma)
__releases(&anon_vma->root->lock)
__releases(RCU)
{
anon_vma_unlock(anon_vma);
rcu_read_unlock();
Expand Down

0 comments on commit ea4525b

Please sign in to comment.