From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755484AbaHARiL (ORCPT ); Fri, 1 Aug 2014 13:38:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26223 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751204AbaHARiG (ORCPT ); Fri, 1 Aug 2014 13:38:06 -0400 From: Naoya Horiguchi To: Andrew Morton , Hugh Dickins Cc: David Rientjes , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Naoya Horiguchi Subject: [PATCH v2 2/3] mm/hugetlb: use get_page_unless_zero() in hugetlb_fault() Date: Fri, 1 Aug 2014 13:37:42 -0400 Message-Id: <1406914663-8631-2-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1406914663-8631-1-git-send-email-n-horiguchi@ah.jp.nec.com> References: <1406914663-8631-1-git-send-email-n-horiguchi@ah.jp.nec.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After fixing locking in follow_page(FOLL_GET) for hugepages, I start to observe the BUG of "get_page() on refcount 0 page" in hugetlb_fault() in the same test. I'm not exactly sure about how this race is triggered, but hugetlb_fault() calls pte_page() and get_page() outside page table lock, so it's not safe. This patch checks the refcount of the gotten page, and aborts the page fault if the refcount is 0, expecting to retry. Signed-off-by: Naoya Horiguchi Cc: # [3.12+] --- mm/hugetlb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git mmotm-2014-07-22-15-58.orig/mm/hugetlb.c mmotm-2014-07-22-15-58/mm/hugetlb.c index 4437896cd6ed..863f45f63cd5 100644 --- mmotm-2014-07-22-15-58.orig/mm/hugetlb.c +++ mmotm-2014-07-22-15-58/mm/hugetlb.c @@ -3189,7 +3189,8 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * so no worry about deadlock. */ page = pte_page(entry); - get_page(page); + if (!get_page_unless_zero(page)) + goto out_put_pagecache; if (page != pagecache_page) lock_page(page); @@ -3215,15 +3216,14 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, out_ptl: spin_unlock(ptl); - + if (page != pagecache_page) + unlock_page(page); + put_page(page); +out_put_pagecache: if (pagecache_page) { unlock_page(pagecache_page); put_page(pagecache_page); } - if (page != pagecache_page) - unlock_page(page); - put_page(page); - out_mutex: mutex_unlock(&htlb_fault_mutex_table[hash]); return ret; -- 1.9.3