Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4998a6c0 authored by Chris Metcalf's avatar Chris Metcalf Committed by Linus Torvalds
Browse files

hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()



Commit 66aebce7 ("hugetlb: fix race condition in hugetlb_fault()")
added code to avoid a race condition by elevating the page refcount in
hugetlb_fault() while calling hugetlb_cow().

However, one code path in hugetlb_cow() includes an assertion that the
page count is 1, whereas it may now also have the value 2 in this path.

The consensus is that this BUG_ON has served its purpose, so rather than
extending it to cover both cases, we just remove it.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Acked-by: default avatarHillf Danton <dhillf@gmail.com>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@vger.kernel.org>	[3.0.29+, 3.2.16+, 3.3.3+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93278814
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -2498,7 +2498,6 @@ retry_avoidcopy:
		if (outside_reserve) {
			BUG_ON(huge_pte_none(pte));
			if (unmap_ref_private(mm, vma, old_page, address)) {
				BUG_ON(page_count(old_page) != 1);
				BUG_ON(huge_pte_none(pte));
				spin_lock(&mm->page_table_lock);
				ptep = huge_pte_offset(mm, address & huge_page_mask(h));