Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751496AbbDXAmn (ORCPT ); Thu, 23 Apr 2015 20:42:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40518 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765AbbDXAmm (ORCPT ); Thu, 23 Apr 2015 20:42:42 -0400 Message-ID: <55399166.8050709@redhat.com> Date: Thu, 23 Apr 2015 19:42:14 -0500 From: Dean Nelson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Naoya Horiguchi CC: Andrew Morton , Andi Kleen , Andrea Arcangeli , Hidetoshi Seto , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 1/2] mm/hwpoison-inject: fix refcounting in no-injection case References: <1429236509-8796-1-git-send-email-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1429236509-8796-1-git-send-email-n-horiguchi@ah.jp.nec.com> Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1667 Lines: 51 On 04/16/2015 09:08 PM, Naoya Horiguchi wrote: > Hwpoison injection via debugfs:hwpoison/corrupt-pfn takes a refcount of > the target page. But current code doesn't release it if the target page > is not supposed to be injected, which results in memory leak. > This patch simply adds the refcount releasing code. > > Signed-off-by: Naoya Horiguchi Acked-by: Dean Nelson > --- > mm/hwpoison-inject.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git v4.0.orig/mm/hwpoison-inject.c v4.0/mm/hwpoison-inject.c > index 329caf56df22..2b3f933e3282 100644 > --- v4.0.orig/mm/hwpoison-inject.c > +++ v4.0/mm/hwpoison-inject.c > @@ -40,7 +40,7 @@ static int hwpoison_inject(void *data, u64 val) > * This implies unable to support non-LRU pages. > */ > if (!PageLRU(p) && !PageHuge(p)) > - return 0; > + goto put_out; > > /* > * do a racy check with elevated page count, to make sure PG_hwpoison > @@ -52,11 +52,14 @@ static int hwpoison_inject(void *data, u64 val) > err = hwpoison_filter(hpage); > unlock_page(hpage); > if (err) > - return 0; > + goto put_out; > > inject: > pr_info("Injecting memory failure at pfn %#lx\n", pfn); > return memory_failure(pfn, 18, MF_COUNT_INCREASED); > +put_out: > + put_page(hpage); > + return 0; > } > > static int hwpoison_unpoison(void *data, u64 val) > -- 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/