[PATCH] mm: hugetlb: fix non-atomic enqueue of huge page

From: Hillf Danton
Date: Fri Dec 23 2011 - 08:35:30 EST


From: Hillf Danton <dhillf@xxxxxxxxx>
Subject: [PATCH] mm: hugetlb: fix non-atomic enqueue of huge page

If huge page is enqueued under the protection of hugetlb_lock, then
the operation is atomic and safe.

Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Hillf Danton <dhillf@xxxxxxxxx>
---

--- a/mm/hugetlb.c Tue Dec 20 21:26:30 2011
+++ b/mm/hugetlb.c Fri Dec 23 21:16:28 2011
@@ -901,7 +901,6 @@ retry:
h->resv_huge_pages += delta;
ret = 0;

- spin_unlock(&hugetlb_lock);
/* Free the needed pages to the hugetlb pool */
list_for_each_entry_safe(page, tmp, &surplus_list, lru) {
if ((--needed) < 0)
@@ -915,6 +914,7 @@ retry:
VM_BUG_ON(page_count(page));
enqueue_huge_page(h, page);
}
+ spin_unlock(&hugetlb_lock);

/* Free unnecessary surplus pages to the buddy allocator */
free:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/