Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754307AbbHJJWA (ORCPT ); Mon, 10 Aug 2015 05:22:00 -0400 Received: from TYO201.gate.nec.co.jp ([210.143.35.51]:34005 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753851AbbHJJV7 convert rfc822-to-8bit (ORCPT ); Mon, 10 Aug 2015 05:21:59 -0400 From: Naoya Horiguchi To: Wanpeng Li CC: Andrew Morton , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 2/2] mm/hwpoison: fix refcount of THP head page in no-injection case Thread-Topic: [PATCH 2/2] mm/hwpoison: fix refcount of THP head page in no-injection case Thread-Index: AQHQ0zjJFF+Ln+B3nEavQuvZcEKyVp4EUbSAgAAFW4CAAANKgIAAA+MA Date: Mon, 10 Aug 2015 09:20:20 +0000 Message-ID: <20150810092020.GB28025@hori1.linux.bs1.fc.nec.co.jp> References: <1439188351-24292-1-git-send-email-wanpeng.li@hotmail.com> <20150810083529.GB21282@hori1.linux.bs1.fc.nec.co.jp> In-Reply-To: Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.31] Content-Type: text/plain; charset="iso-2022-jp" Content-ID: <5A7E6C0848CAAB46B5D541334679DB88@gisp.nec.co.jp> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2049 Lines: 66 On Mon, Aug 10, 2015 at 05:06:25PM +0800, Wanpeng Li wrote: ... > >>>diff --git a/mm/hwpoison-inject.c b/mm/hwpoison-inject.c > >>>index 5015679..c343a45 100644 > >>>--- a/mm/hwpoison-inject.c > >>>+++ b/mm/hwpoison-inject.c > >>>@@ -56,6 +56,8 @@ inject: > >>> return memory_failure(pfn, 18, MF_COUNT_INCREASED); > >>> put_out: > >>> put_page(p); > >>>+ if (p != hpage) > >>>+ put_page(hpage); > >>Yes, we need this when we inject to a thp tail page and "goto put_out" > >>is > >>called. But it seems that this code can be called also when injecting > >>error > >>to a hugetlb tail page and hwpoison_filter() returns non-zero, which is > >>not > >>expected. Unfortunately simply doing like below > >> > >>+ if (!PageHuge(p) && p != hpage) > >>+ put_page(hpage); > >> > >>doesn't work, because exisiting put_page(p) can release refcount of > >>hugetlb > >>tail page, while get_hwpoison_page() takes refcount of hugetlb head > >>page. > >> > >>So I feel that we need put_hwpoison_page() to properly release the > >>refcount > >>taken by memory error handlers. > > > >Good point. I think I will continue to do it and will post it out soon. :) > > How about something like this: > > +void put_hwpoison_page(struct page *page) > +{ > + struct page *head = compound_head(page); > + > + if (PageHuge(head)) > + goto put_out; > + > + if (PageTransHuge(head)) > + if (page != head) > + put_page(head); > + > +put_out: > + put_page(page); > + return; > +} > + Looks good. > Any comments are welcome, I can update the patch by myself. :) Most of callsites of put_page() in memory_failure(), soft_offline_page(), and unpoison_page() can be replaced with put_hwpoison_page(). Thanks, Naoya Horiguchi-- 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/