diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2702a1369c58e382c3068073db59b14f1aef7fae..98199d3ae7419d2707ef840a2877c7a8f5270586 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1613,6 +1613,9 @@
 			off: Disable the feature
 			     Equivalent to: nohugevmalloc
 
+	hugetlb_hwpoison_full
+			[HW] Enable memory error handling of 1GB hugepage.
+
 	hung_task_panic=
 			[KNL] Should the hung task detector generate panics.
 			Format: 0 | 1
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 509fe34a0421f27e7100ec620dc6c7d3134f3539..63bacfcca122ce34b37fc06caf426c66631ebaf8 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1148,6 +1148,15 @@ static int try_to_split_thp_page(struct page *page, const char *msg)
 	return 0;
 }
 
+static bool hugetlb_hwpoison_full;
+
+static int __init enable_hugetlb_hwpoison_full(char *str)
+{
+	hugetlb_hwpoison_full = true;
+	return 0;
+}
+early_param("hugetlb_hwpoison_full", enable_hugetlb_hwpoison_full);
+
 static int memory_failure_hugetlb(unsigned long pfn, int flags)
 {
 	struct page *p = pfn_to_page(pfn);
@@ -1197,7 +1206,8 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags)
 	 *  - other mm code walking over page table is aware of pud-aligned
 	 *    hwpoison entries.
 	 */
-	if (huge_page_size(page_hstate(head)) > PMD_SIZE) {
+	if (!hugetlb_hwpoison_full &&
+	    huge_page_size(page_hstate(head)) > PMD_SIZE) {
 		action_result(pfn, MF_MSG_NON_PMD_HUGE, MF_IGNORED);
 		res = -EBUSY;
 		goto out;