aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memory-failure.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 1ec68c80788..fee648b9d39 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -920,6 +920,22 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,
920 return ret; 920 return ret;
921} 921}
922 922
923static void set_page_hwpoison_huge_page(struct page *hpage)
924{
925 int i;
926 int nr_pages = 1 << compound_order(hpage);
927 for (i = 0; i < nr_pages; i++)
928 SetPageHWPoison(hpage + i);
929}
930
931static void clear_page_hwpoison_huge_page(struct page *hpage)
932{
933 int i;
934 int nr_pages = 1 << compound_order(hpage);
935 for (i = 0; i < nr_pages; i++)
936 ClearPageHWPoison(hpage + i);
937}
938
923int __memory_failure(unsigned long pfn, int trapno, int flags) 939int __memory_failure(unsigned long pfn, int trapno, int flags)
924{ 940{
925 struct page_state *ps; 941 struct page_state *ps;
@@ -1014,6 +1030,26 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
1014 return 0; 1030 return 0;
1015 } 1031 }
1016 1032
1033 /*
1034 * For error on the tail page, we should set PG_hwpoison
1035 * on the head page to show that the hugepage is hwpoisoned
1036 */
1037 if (PageTail(p) && TestSetPageHWPoison(hpage)) {
1038 action_result(pfn, "hugepage already hardware poisoned",
1039 IGNORED);
1040 unlock_page(hpage);
1041 put_page(hpage);
1042 return 0;
1043 }
1044 /*
1045 * Set PG_hwpoison on all pages in an error hugepage,
1046 * because containment is done in hugepage unit for now.
1047 * Since we have done TestSetPageHWPoison() for the head page with
1048 * page lock held, we can safely set PG_hwpoison bits on tail pages.
1049 */
1050 if (PageHuge(p))
1051 set_page_hwpoison_huge_page(hpage);
1052
1017 wait_on_page_writeback(p); 1053 wait_on_page_writeback(p);
1018 1054
1019 /* 1055 /*
@@ -1118,6 +1154,8 @@ int unpoison_memory(unsigned long pfn)
1118 atomic_long_dec(&mce_bad_pages); 1154 atomic_long_dec(&mce_bad_pages);
1119 freeit = 1; 1155 freeit = 1;
1120 } 1156 }
1157 if (PageHuge(p))
1158 clear_page_hwpoison_huge_page(page);
1121 unlock_page(page); 1159 unlock_page(page);
1122 1160
1123 put_page(page); 1161 put_page(page);