From: Greg Kroah-Hartman Date: Thu, 6 Dec 2012 18:26:56 +0000 (-0800) Subject: 3.0-stable patches X-Git-Tag: v3.0.56~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21255c69813638e8ccb0dc9bf0696e30ce71c8fa;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: mm-soft-offline-split-thp-at-the-beginning-of-soft_offline_page.patch mm-vmemmap-fix-wrong-use-of-virt_to_page.patch --- diff --git a/queue-3.0/mm-soft-offline-split-thp-at-the-beginning-of-soft_offline_page.patch b/queue-3.0/mm-soft-offline-split-thp-at-the-beginning-of-soft_offline_page.patch new file mode 100644 index 00000000000..02055f53c21 --- /dev/null +++ b/queue-3.0/mm-soft-offline-split-thp-at-the-beginning-of-soft_offline_page.patch @@ -0,0 +1,47 @@ +From 783657a7dc20e5c0efbc9a09a9dd38e238a723da Mon Sep 17 00:00:00 2001 +From: Naoya Horiguchi +Date: Thu, 29 Nov 2012 13:54:34 -0800 +Subject: mm: soft offline: split thp at the beginning of soft_offline_page() + +From: Naoya Horiguchi + +commit 783657a7dc20e5c0efbc9a09a9dd38e238a723da upstream. + +When we try to soft-offline a thp tail page, put_page() is called on the +tail page unthinkingly and VM_BUG_ON is triggered in put_compound_page(). + +This patch splits thp before going into the main body of soft-offlining. + +Signed-off-by: Naoya Horiguchi +Cc: Andi Kleen +Cc: Tony Luck +Cc: Andi Kleen +Cc: Wu Fengguang +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/memory-failure.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/mm/memory-failure.c ++++ b/mm/memory-failure.c +@@ -1382,9 +1382,17 @@ int soft_offline_page(struct page *page, + { + int ret; + unsigned long pfn = page_to_pfn(page); ++ struct page *hpage = compound_trans_head(page); + + if (PageHuge(page)) + return soft_offline_huge_page(page, flags); ++ if (PageTransHuge(hpage)) { ++ if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) { ++ pr_info("soft offline: %#lx: failed to split THP\n", ++ pfn); ++ return -EBUSY; ++ } ++ } + + ret = get_any_page(page, pfn, flags); + if (ret < 0) diff --git a/queue-3.0/mm-vmemmap-fix-wrong-use-of-virt_to_page.patch b/queue-3.0/mm-vmemmap-fix-wrong-use-of-virt_to_page.patch new file mode 100644 index 00000000000..4b9adf71318 --- /dev/null +++ b/queue-3.0/mm-vmemmap-fix-wrong-use-of-virt_to_page.patch @@ -0,0 +1,80 @@ +From ae64ffcac35de0db628ba9631edf8ff34c5cd7ac Mon Sep 17 00:00:00 2001 +From: Jianguo Wu +Date: Thu, 29 Nov 2012 13:54:21 -0800 +Subject: mm/vmemmap: fix wrong use of virt_to_page + +From: Jianguo Wu + +commit ae64ffcac35de0db628ba9631edf8ff34c5cd7ac upstream. + +I enable CONFIG_DEBUG_VIRTUAL and CONFIG_SPARSEMEM_VMEMMAP, when doing +memory hotremove, there is a kernel BUG at arch/x86/mm/physaddr.c:20. + +It is caused by free_section_usemap()->virt_to_page(), virt_to_page() is +only used for kernel direct mapping address, but sparse-vmemmap uses +vmemmap address, so it is going wrong here. + + ------------[ cut here ]------------ + kernel BUG at arch/x86/mm/physaddr.c:20! + invalid opcode: 0000 [#1] SMP + Modules linked in: acpihp_drv acpihp_slot edd cpufreq_conservative cpufreq_userspace cpufreq_powersave acpi_cpufreq mperf fuse vfat fat loop dm_mod coretemp kvm crc32c_intel ipv6 ixgbe igb iTCO_wdt i7core_edac edac_core pcspkr iTCO_vendor_support ioatdma microcode joydev sr_mod i2c_i801 dca lpc_ich mfd_core mdio tpm_tis i2c_core hid_generic tpm cdrom sg tpm_bios rtc_cmos button ext3 jbd mbcache usbhid hid uhci_hcd ehci_hcd usbcore usb_common sd_mod crc_t10dif processor thermal_sys hwmon scsi_dh_alua scsi_dh_hp_sw scsi_dh_rdac scsi_dh_emc scsi_dh ata_generic ata_piix libata megaraid_sas scsi_mod + CPU 39 + Pid: 6454, comm: sh Not tainted 3.7.0-rc1-acpihp-final+ #45 QCI QSSC-S4R/QSSC-S4R + RIP: 0010:[] [] __phys_addr+0x88/0x90 + RSP: 0018:ffff8804440d7c08 EFLAGS: 00010006 + RAX: 0000000000000006 RBX: ffffea0012000000 RCX: 000000000000002c + ... + +Signed-off-by: Jianguo Wu +Signed-off-by: Jiang Liu +Reviewd-by: Wen Congyang +Acked-by: Johannes Weiner +Reviewed-by: Yasuaki Ishimatsu +Reviewed-by: Michal Hocko +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + mm/sparse.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +--- a/mm/sparse.c ++++ b/mm/sparse.c +@@ -619,7 +619,7 @@ static void __kfree_section_memmap(struc + { + return; /* XXX: Not implemented yet */ + } +-static void free_map_bootmem(struct page *page, unsigned long nr_pages) ++static void free_map_bootmem(struct page *memmap, unsigned long nr_pages) + { + } + #else +@@ -660,10 +660,11 @@ static void __kfree_section_memmap(struc + get_order(sizeof(struct page) * nr_pages)); + } + +-static void free_map_bootmem(struct page *page, unsigned long nr_pages) ++static void free_map_bootmem(struct page *memmap, unsigned long nr_pages) + { + unsigned long maps_section_nr, removing_section_nr, i; + unsigned long magic; ++ struct page *page = virt_to_page(memmap); + + for (i = 0; i < nr_pages; i++, page++) { + magic = (unsigned long) page->lru.next; +@@ -712,13 +713,10 @@ static void free_section_usemap(struct p + */ + + if (memmap) { +- struct page *memmap_page; +- memmap_page = virt_to_page(memmap); +- + nr_pages = PAGE_ALIGN(PAGES_PER_SECTION * sizeof(struct page)) + >> PAGE_SHIFT; + +- free_map_bootmem(memmap_page, nr_pages); ++ free_map_bootmem(memmap, nr_pages); + } + } + diff --git a/queue-3.0/series b/queue-3.0/series index c698120b430..6ae505ac429 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,2 +1,4 @@ dove-attempt-to-fix-pmu-rtc-interrupts.patch dove-fix-irq_to_pmu.patch +mm-vmemmap-fix-wrong-use-of-virt_to_page.patch +mm-soft-offline-split-thp-at-the-beginning-of-soft_offline_page.patch