Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bd1ce5f91f545730df4af492f774d9d32f5da3cb

Authored by Wu Fengguang
Committed by Andi Kleen
1 parent a7560fc80f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

HWPOISON: avoid grabbing the page count multiple times during madvise injection 

If page is double referenced in madvise_hwpoison() and __memory_failure(),
remove_mapping() will fail because it expects page_count=2. Fix it by
not grabbing extra page count in __memory_failure().

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

Showing 2 changed files with 4 additions and 5 deletions Side-by-side Diff

... ... @@ -238,7 +238,6 @@
238 238 page_to_pfn(p), start);
239 239 /* Ignore return value for now */
240 240 __memory_failure(page_to_pfn(p), 0, 1);
241   - put_page(p);
242 241 }
243 242 return ret;
244 243 }
... ... @@ -627,7 +627,7 @@
627 627 }
628 628  
629 629 static int page_action(struct page_state *ps, struct page *p,
630   - unsigned long pfn, int ref)
  630 + unsigned long pfn)
631 631 {
632 632 int result;
633 633 int count;
... ... @@ -635,7 +635,7 @@
635 635 result = ps->action(p, pfn);
636 636 action_result(pfn, ps->msg, result);
637 637  
638   - count = page_count(p) - 1 - ref;
  638 + count = page_count(p) - 1;
639 639 if (count != 0)
640 640 printk(KERN_ERR
641 641 "MCE %#lx: %s page still referenced by %d users\n",
... ... @@ -773,7 +773,7 @@
773 773 * In fact it's dangerous to directly bump up page count from 0,
774 774 * that may make page_freeze_refs()/page_unfreeze_refs() mismatch.
775 775 */
776   - if (!get_page_unless_zero(compound_head(p))) {
  776 + if (!ref && !get_page_unless_zero(compound_head(p))) {
777 777 action_result(pfn, "free or high order kernel", IGNORED);
778 778 return PageBuddy(compound_head(p)) ? 0 : -EBUSY;
779 779 }
... ... @@ -821,7 +821,7 @@
821 821 res = -EBUSY;
822 822 for (ps = error_states;; ps++) {
823 823 if (((p->flags | lru_flag)& ps->mask) == ps->res) {
824   - res = page_action(ps, p, pfn, ref);
  824 + res = page_action(ps, p, pfn);
825 825 break;
826 826 }
827 827 }