Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27f83f1c authored by Liu Shixin's avatar Liu Shixin Committed by Greg Kroah-Hartman
Browse files

mm/memory-failure: fix an incorrect use of tail pages 



When backport commit c79c5a0a00a9 to 4.19-stable, there is a mistake change.
The head page instead of tail page should be passed to try_to_unmap(),
otherwise unmap will failed as follows.

 Memory failure: 0x121c10: failed to unmap page (mapcount=1)
 Memory failure: 0x121c10: recovery action for unmapping failed page: Ignored

Fixes: c6f50413 ("mm/memory-failure: check the mapcount of the precise page")
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8686c01

mm/memory-failure.c

+1 −1
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, 
	if (kill)

		collect_procs(hpage, &tokill, flags & MF_ACTION_REQUIRED);



	unmap_success = try_to_unmap(p, ttu);

	unmap_success = try_to_unmap(hpage, ttu);

	if (!unmap_success)

		pr_err("Memory failure: %#lx: failed to unmap page (mapcount=%d)\n",

		       pfn, page_mapcount(p));