Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 207197
b: refs/heads/master
c: cba48b9
h: refs/heads/master
i:
  207195: 1733a30
v: v3
  • Loading branch information
Rik van Riel authored and Linus Torvalds committed Aug 10, 2010
1 parent 1312b19 commit d81215f
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bb4a340e075b7897ece109686bfa177f8518d2db
refs/heads/master: cba48b98f2348c814316c4b4f411a07a0e4a2bf9
10 changes: 10 additions & 0 deletions trunk/include/linux/rmap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ static inline void vma_unlock_anon_vma(struct vm_area_struct *vma)
spin_unlock(&anon_vma->lock);
}

static inline void anon_vma_lock(struct anon_vma *anon_vma)
{
spin_lock(&anon_vma->lock);
}

static inline void anon_vma_unlock(struct anon_vma *anon_vma)
{
spin_unlock(&anon_vma->lock);
}

/*
* anon_vma helper functions.
*/
Expand Down
18 changes: 9 additions & 9 deletions trunk/mm/ksm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static void drop_anon_vma(struct rmap_item *rmap_item)

if (atomic_dec_and_lock(&anon_vma->external_refcount, &anon_vma->lock)) {
int empty = list_empty(&anon_vma->head);
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
if (empty)
anon_vma_free(anon_vma);
}
Expand Down Expand Up @@ -1566,7 +1566,7 @@ int page_referenced_ksm(struct page *page, struct mem_cgroup *memcg,
struct anon_vma_chain *vmac;
struct vm_area_struct *vma;

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {
vma = vmac->vma;
if (rmap_item->address < vma->vm_start ||
Expand All @@ -1589,7 +1589,7 @@ int page_referenced_ksm(struct page *page, struct mem_cgroup *memcg,
if (!search_new_forks || !mapcount)
break;
}
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
if (!mapcount)
goto out;
}
Expand Down Expand Up @@ -1619,7 +1619,7 @@ int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
struct anon_vma_chain *vmac;
struct vm_area_struct *vma;

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {
vma = vmac->vma;
if (rmap_item->address < vma->vm_start ||
Expand All @@ -1637,11 +1637,11 @@ int try_to_unmap_ksm(struct page *page, enum ttu_flags flags)
ret = try_to_unmap_one(page, vma,
rmap_item->address, flags);
if (ret != SWAP_AGAIN || !page_mapped(page)) {
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
goto out;
}
}
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
}
if (!search_new_forks++)
goto again;
Expand Down Expand Up @@ -1671,7 +1671,7 @@ int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,
struct anon_vma_chain *vmac;
struct vm_area_struct *vma;

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {
vma = vmac->vma;
if (rmap_item->address < vma->vm_start ||
Expand All @@ -1688,11 +1688,11 @@ int rmap_walk_ksm(struct page *page, int (*rmap_one)(struct page *,

ret = rmap_one(page, vma, rmap_item->address, arg);
if (ret != SWAP_AGAIN) {
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
goto out;
}
}
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
}
if (!search_new_forks++)
goto again;
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/migrate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ static int unmap_and_move(new_page_t get_new_page, unsigned long private,
/* Drop an anon_vma reference if we took one */
if (anon_vma && atomic_dec_and_lock(&anon_vma->external_refcount, &anon_vma->lock)) {
int empty = list_empty(&anon_vma->head);
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
if (empty)
anon_vma_free(anon_vma);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/mmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2593,7 +2593,7 @@ static void vm_unlock_anon_vma(struct anon_vma *anon_vma)
if (!__test_and_clear_bit(0, (unsigned long *)
&anon_vma->head.next))
BUG();
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
}
}

Expand Down
20 changes: 10 additions & 10 deletions trunk/mm/rmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int anon_vma_prepare(struct vm_area_struct *vma)
allocated = anon_vma;
}

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
if (likely(!vma->anon_vma)) {
Expand All @@ -147,7 +147,7 @@ int anon_vma_prepare(struct vm_area_struct *vma)
avc = NULL;
}
spin_unlock(&mm->page_table_lock);
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);

if (unlikely(allocated))
anon_vma_free(allocated);
Expand All @@ -170,9 +170,9 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
avc->anon_vma = anon_vma;
list_add(&avc->same_vma, &vma->anon_vma_chain);

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_add_tail(&avc->same_anon_vma, &anon_vma->head);
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
}

/*
Expand Down Expand Up @@ -246,12 +246,12 @@ static void anon_vma_unlink(struct anon_vma_chain *anon_vma_chain)
if (!anon_vma)
return;

spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_del(&anon_vma_chain->same_anon_vma);

/* We must garbage collect the anon_vma if it's empty */
empty = list_empty(&anon_vma->head) && !anonvma_external_refcount(anon_vma);
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);

if (empty)
anon_vma_free(anon_vma);
Expand Down Expand Up @@ -302,7 +302,7 @@ struct anon_vma *page_lock_anon_vma(struct page *page)
goto out;

anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON);
spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
return anon_vma;
out:
rcu_read_unlock();
Expand All @@ -311,7 +311,7 @@ struct anon_vma *page_lock_anon_vma(struct page *page)

void page_unlock_anon_vma(struct anon_vma *anon_vma)
{
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
rcu_read_unlock();
}

Expand Down Expand Up @@ -1389,7 +1389,7 @@ static int rmap_walk_anon(struct page *page, int (*rmap_one)(struct page *,
anon_vma = page_anon_vma(page);
if (!anon_vma)
return ret;
spin_lock(&anon_vma->lock);
anon_vma_lock(anon_vma);
list_for_each_entry(avc, &anon_vma->head, same_anon_vma) {
struct vm_area_struct *vma = avc->vma;
unsigned long address = vma_address(page, vma);
Expand All @@ -1399,7 +1399,7 @@ static int rmap_walk_anon(struct page *page, int (*rmap_one)(struct page *,
if (ret != SWAP_AGAIN)
break;
}
spin_unlock(&anon_vma->lock);
anon_vma_unlock(anon_vma);
return ret;
}

Expand Down

0 comments on commit d81215f

Please sign in to comment.