Re: [PATCH 3/3] HWPOISON, hugetlbfs: fix RSS-counter warning

[Andrew Morton]

On Thu,  6 Dec 2012 20:22:42 -0500 Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> wrote:

> > --- a/mm/rmap.c~hwpoison-hugetlbfs-fix-rss-counter-warning-fix
> > +++ a/mm/rmap.c
> > @@ -1249,14 +1249,14 @@ int try_to_unmap_one(struct page *page, 
> >  	update_hiwater_rss(mm);
> >  
> >  	if (PageHWPoison(page) && !(flags & TTU_IGNORE_HWPOISON)) {
> > -		if (PageHuge(page))
> > -			;
> > -		else if (PageAnon(page))
> > -			dec_mm_counter(mm, MM_ANONPAGES);
> > -		else
> > -			dec_mm_counter(mm, MM_FILEPAGES);
> > -		set_pte_at(mm, address, pte,
> > -				swp_entry_to_pte(make_hwpoison_entry(page)));
> > +		if (!PageHuge(page)) {
> > +			if (PageAnon(page))
> > +				dec_mm_counter(mm, MM_ANONPAGES);
> > +			else
> > +				dec_mm_counter(mm, MM_FILEPAGES);
> > +			set_pte_at(mm, address, pte,
> > +				   swp_entry_to_pte(make_hwpoison_entry(page)));
> > +		}
> 
> This set_pte_at() should come outside the if-block, or error containment
> does not work.

Doh.  C is really hard!

--- a/mm/rmap.c~hwpoison-hugetlbfs-fix-rss-counter-warning-fix-fix
+++ a/mm/rmap.c
@@ -1254,9 +1254,9 @@ int try_to_unmap_one(struct page *page, 
 				dec_mm_counter(mm, MM_ANONPAGES);
 			else
 				dec_mm_counter(mm, MM_FILEPAGES);
-			set_pte_at(mm, address, pte,
-				   swp_entry_to_pte(make_hwpoison_entry(page)));
 		}
+		set_pte_at(mm, address, pte,
+			   swp_entry_to_pte(make_hwpoison_entry(page)));
 	} else if (PageAnon(page)) {
 		swp_entry_t entry = { .val = page_private(page) };
 
_

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/