--- mm/hugetlb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index c007fb5..ba693bb 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1248,10 +1248,11 @@ void free_huge_page(struct page *page) (struct hugepage_subpool *)page_private(page); bool restore_reserve; + VM_BUG_ON_PAGE(page_count(page), page); + VM_BUG_ON_PAGE(page_mapcount(page), page); + set_page_private(page, 0); page->mapping = NULL; - VM_BUG_ON_PAGE(page_count(page), page); - VM_BUG_ON_PAGE(page_mapcount(page), page); restore_reserve = PagePrivate(page); ClearPagePrivate(page); -- 1.8.3.1 --00000000000017adeb057a8b18d7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

It is better to keep page mapping in= fo when free_huge_page() hit the VM_BUG_ON_PAGE,

so we can get mo= re infomation from the coredump for further analysis.

<= div>Signed-off-by: Yongkai Wu <nic_w@16= 3.com>

---

=C2=A0mm/hugetlb.c | 5 +++--

=C2=A01 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c

index c007fb5..ba6= 93bb 100644

--- a/mm/hugetlb.c

+++ b/mm/hugetlb.c

@@ -1248,10 +1248,11 @@ void free_huge_page(struct page *page)

=C2=A0 (struct hugepage_subpool = *)page_private(page);

=C2=A0 bool restore_reserve;

=C2=A0

+=C2=A0 =C2=A0 =C2=A0 = =C2=A0 VM_BUG_ON_PAGE(page_count(page), page);

+=C2=A0 =C2=A0 =C2= =A0 =C2=A0 VM_BUG_ON_PAGE(page_mapcount(page), page);

=C2=A0 set_page_private(page, 0);

=C2=A0 page->mapping =3D= NULL;

- VM_BUG_ON_PAGE(pa= ge_count(page), page);

- V= M_BUG_ON_PAGE(page_mapcount(page), page);

=C2=A0 restore_reserve =3D PagePrivate(page);

=C2= =A0 ClearPagePrivate(page);

=C2=A0

--=C2=A0

1.8.3.1

--00000000000017adeb057a8b18d7--