Commit b66d00df authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: memory-failure: make action_result() return int 

Check mf_result in action_result(), only return 0 when MF_RECOVERED,
or return -EBUSY, which will simplify code a bit.

[wangkefeng.wang@huawei.com: v2]
  Link: https://lkml.kernel.org/r/20221024035138.99119-1-wangkefeng.wang@huawei.com
Link: https://lkml.kernel.org/r/20221021084611.53765-3-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 183a7c5d

mm/memory-failure.c

+16 −29
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static struct page_state error_states[] = { 
 * "Dirty/Clean" indication is not 100% accurate due to the possibility of

 * setting PG_dirty outside page lock. See also comment above set_page_dirty().

 */

static void action_result(unsigned long pfn, enum mf_action_page_type type,

static int action_result(unsigned long pfn, enum mf_action_page_type type,

			 enum mf_result result)

{

	trace_memory_failure_event(pfn, type, result);
@@ -1187,6 +1187,8 @@ static void action_result(unsigned long pfn, enum mf_action_page_type type, 
	num_poisoned_pages_inc();

	pr_err("%#lx: recovery action for %s: %s\n",

		pfn, action_page_types[type], action_name[result]);



	return (result == MF_RECOVERED || result == MF_DELAYED) ? 0 : -EBUSY;

}



static int page_action(struct page_state *ps, struct page *p,
@@ -1197,14 +1199,12 @@ static int page_action(struct page_state *ps, struct page *p, 
	/* page p should be unlocked after returning from ps->action().  */

	result = ps->action(ps, p);



	action_result(pfn, ps->type, result);



	/* Could do more checks here if page looks ok */

	/*

	 * Could adjust zone counters here to correct for the missing page.

	 */



	return (result == MF_RECOVERED || result == MF_DELAYED) ? 0 : -EBUSY;

	return action_result(pfn, ps->type, result);

}



static inline bool PageHWPoisonTakenOff(struct page *page)
@@ -1853,8 +1853,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb 
			flags |= MF_NO_RETRY;

			goto retry;

		}

		action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);

		return res;

		return action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);

	}



	head = compound_head(p);
@@ -1880,22 +1879,17 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb 
		} else {

			res = MF_FAILED;

		}

		action_result(pfn, MF_MSG_FREE_HUGE, res);

		return res == MF_RECOVERED ? 0 : -EBUSY;

		return action_result(pfn, MF_MSG_FREE_HUGE, res);

	}



	page_flags = head->flags;



	if (!hwpoison_user_mappings(p, pfn, flags, head)) {

		action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

		res = -EBUSY;

		goto out;

		unlock_page(head);

		return action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

	}



	return identify_page_state(pfn, p, page_flags);

out:

	unlock_page(head);

	return res;

}



#else
@@ -2060,16 +2054,13 @@ int memory_failure(unsigned long pfn, int flags) 
					}

					res = MF_FAILED;

				}

				action_result(pfn, MF_MSG_BUDDY, res);

				res = res == MF_RECOVERED ? 0 : -EBUSY;

				res = action_result(pfn, MF_MSG_BUDDY, res);

			} else {

				action_result(pfn, MF_MSG_KERNEL_HIGH_ORDER, MF_IGNORED);

				res = -EBUSY;

				res = action_result(pfn, MF_MSG_KERNEL_HIGH_ORDER, MF_IGNORED);

			}

			goto unlock_mutex;

		} else if (res < 0) {

			action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);

			res = -EBUSY;

			res = action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);

			goto unlock_mutex;

		}

	}
@@ -2090,8 +2081,7 @@ int memory_failure(unsigned long pfn, int flags) 
		 */

		SetPageHasHWPoisoned(hpage);

		if (try_to_split_thp_page(p) < 0) {

			action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED);

			res = -EBUSY;

			res = action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED);

			goto unlock_mutex;

		}

		VM_BUG_ON_PAGE(!page_count(p), p);
@@ -2124,8 +2114,7 @@ int memory_failure(unsigned long pfn, int flags) 
			retry = false;

			goto try_again;

		}

		action_result(pfn, MF_MSG_DIFFERENT_COMPOUND, MF_IGNORED);

		res = -EBUSY;

		res = action_result(pfn, MF_MSG_DIFFERENT_COMPOUND, MF_IGNORED);

		goto unlock_page;

	}
@@ -2165,8 +2154,7 @@ int memory_failure(unsigned long pfn, int flags) 
	 * Abort on fail: __filemap_remove_folio() assumes unmapped page.

	 */

	if (!hwpoison_user_mappings(p, pfn, flags, p)) {

		action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

		res = -EBUSY;

		res = action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);

		goto unlock_page;

	}
@@ -2174,8 +2162,7 @@ int memory_failure(unsigned long pfn, int flags) 
	 * Torn down by someone else?

	 */

	if (PageLRU(p) && !PageSwapCache(p) && p->mapping == NULL) {

		action_result(pfn, MF_MSG_TRUNCATED_LRU, MF_IGNORED);

		res = -EBUSY;

		res = action_result(pfn, MF_MSG_TRUNCATED_LRU, MF_IGNORED);

		goto unlock_page;

	}