Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752102AbbHGKRD (ORCPT ); Fri, 7 Aug 2015 06:17:03 -0400 Received: from blu004-omc1s32.hotmail.com ([65.55.116.43]:62230 "EHLO BLU004-OMC1S32.hotmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750920AbbHGKRA (ORCPT ); Fri, 7 Aug 2015 06:17:00 -0400 X-TMN: [q3oNXC0Ic+qzH4ufA0JOcl/xVneKpv4t] X-Originating-Email: [wanpeng.li@hotmail.com] Message-ID: From: Wanpeng Li To: Andrew Morton CC: Naoya Horiguchi , Tony Luck , Andi Kleen , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wanpeng Li , Subject: [PATCH v2 2/2] mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held Date: Fri, 7 Aug 2015 18:16:42 +0800 X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438942602-55614-1-git-send-email-wanpeng.li@hotmail.com> References: <1438942602-55614-1-git-send-email-wanpeng.li@hotmail.com> X-OriginalArrivalTime: 07 Aug 2015 10:16:58.0281 (UTC) FILETIME=[31646990:01D0D0FA] MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1421 Lines: 43 Hugetlbfs pages will get a refcount in get_any_page() or madvise_hwpoison() if soft offline through madvise. The refcount which held by soft offline path should be released if fail to isolate hugetlbfs pages. This patch fix it by reducing a refcount for both isolate successfully and failure. Cc: # 3.9+ Signed-off-by: Wanpeng Li --- mm/memory-failure.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 001f1ba..8077b1c 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1557,13 +1557,12 @@ static int soft_offline_huge_page(struct page *page, int flags) unlock_page(hpage); ret = isolate_huge_page(hpage, &pagelist); - if (ret) { - /* - * get_any_page() and isolate_huge_page() takes a refcount each, - * so need to drop one here. - */ - put_page(hpage); - } else { + /* + * get_any_page() and isolate_huge_page() takes a refcount each, + * so need to drop one here. + */ + put_page(hpage); + if (!ret) { pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn); return -EBUSY; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/