Unverified Commit 4af0214f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11125 mm/memory-failure: fix handling of dissolved but not taken off from buddy pages 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjiang Tu <tujinjiang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YEVUZPSD6OETQSOCNP4LXWXG7KYT3G25/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA8AE1 
 
Link:https://gitee.com/openeuler/kernel/pulls/11125

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ef2a3e78 ac0d5402

mm/memory-failure.c

+2 −2
Original line number Diff line number Diff line
@@ -1214,7 +1214,7 @@ static int me_huge_page(struct page_state *ps, struct page *p) 
		 * subpages.

		 */

		folio_put(folio);

		if (__page_handle_poison(p) >= 0) {

		if (__page_handle_poison(p) > 0) {

			page_ref_inc(p);

			res = MF_RECOVERED;

		} else {
@@ -2088,7 +2088,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb 
	 */

	if (res == 0) {

		folio_unlock(folio);

		if (__page_handle_poison(p) >= 0) {

		if (__page_handle_poison(p) > 0) {

			page_ref_inc(p);

			res = MF_RECOVERED;

		} else if (page_in_dynamic_pool(p)) {