From: Greg Kroah-Hartman Date: Mon, 15 Apr 2013 01:22:53 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.0.74~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f0eb374a47ad43528da5c2054488d04f2788f10;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: x86-mm-paravirt-fix-vmalloc_fault-oops-during-lazy-mmu-updates.patch x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch --- diff --git a/queue-3.4/series b/queue-3.4/series index 5708dffe6c7..342ad1177bf 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -10,4 +10,6 @@ vfs-revert-spurious-fix-to-spinning-prevention-in-prune_icache_sb.patch kref-implement-kref_get_unless_zero-v3.patch udl-handle-edid-failure-properly.patch sched_clock-prevent-64bit-inatomicity-on-32bit-systems.patch +x86-mm-paravirt-fix-vmalloc_fault-oops-during-lazy-mmu-updates.patch +x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch kobject-fix-kset_find_obj-race-with-concurrent-last-kobject_put.patch diff --git a/queue-3.4/x86-mm-paravirt-fix-vmalloc_fault-oops-during-lazy-mmu-updates.patch b/queue-3.4/x86-mm-paravirt-fix-vmalloc_fault-oops-during-lazy-mmu-updates.patch new file mode 100644 index 00000000000..6b3d26da539 --- /dev/null +++ b/queue-3.4/x86-mm-paravirt-fix-vmalloc_fault-oops-during-lazy-mmu-updates.patch @@ -0,0 +1,88 @@ +From 1160c2779b826c6f5c08e5cc542de58fd1f667d5 Mon Sep 17 00:00:00 2001 +From: Samu Kallio +Date: Sat, 23 Mar 2013 09:36:35 -0400 +Subject: x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates + +From: Samu Kallio + +commit 1160c2779b826c6f5c08e5cc542de58fd1f667d5 upstream. + +In paravirtualized x86_64 kernels, vmalloc_fault may cause an oops +when lazy MMU updates are enabled, because set_pgd effects are being +deferred. + +One instance of this problem is during process mm cleanup with memory +cgroups enabled. The chain of events is as follows: + +- zap_pte_range enables lazy MMU updates +- zap_pte_range eventually calls mem_cgroup_charge_statistics, + which accesses the vmalloc'd mem_cgroup per-cpu stat area +- vmalloc_fault is triggered which tries to sync the corresponding + PGD entry with set_pgd, but the update is deferred +- vmalloc_fault oopses due to a mismatch in the PUD entries + +The OOPs usually looks as so: + +------------[ cut here ]------------ +kernel BUG at arch/x86/mm/fault.c:396! +invalid opcode: 0000 [#1] SMP +.. snip .. +CPU 1 +Pid: 10866, comm: httpd Not tainted 3.6.10-4.fc18.x86_64 #1 +RIP: e030:[] [] vmalloc_fault+0x11f/0x208 +.. snip .. +Call Trace: + [] do_page_fault+0x399/0x4b0 + [] ? xen_mc_extend_args+0xec/0x110 + [] page_fault+0x25/0x30 + [] ? mem_cgroup_charge_statistics.isra.13+0x13/0x50 + [] __mem_cgroup_uncharge_common+0xd8/0x350 + [] mem_cgroup_uncharge_page+0x57/0x60 + [] page_remove_rmap+0xe0/0x150 + [] ? vm_normal_page+0x1a/0x80 + [] unmap_single_vma+0x531/0x870 + [] unmap_vmas+0x52/0xa0 + [] ? pte_mfn_to_pfn+0x72/0x100 + [] exit_mmap+0x98/0x170 + [] ? __raw_callee_save_xen_pmd_val+0x11/0x1e + [] mmput+0x83/0xf0 + [] exit_mm+0x104/0x130 + [] do_exit+0x15a/0x8c0 + [] do_group_exit+0x3f/0xa0 + [] sys_exit_group+0x17/0x20 + [] system_call_fastpath+0x16/0x1b + +Calling arch_flush_lazy_mmu_mode immediately after set_pgd makes the +changes visible to the consistency checks. + +RedHat-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=914737 +Tested-by: Josh Boyer +Reported-and-Tested-by: Krishna Raman +Signed-off-by: Samu Kallio +Link: http://lkml.kernel.org/r/1364045796-10720-1-git-send-email-konrad.wilk@oracle.com +Tested-by: Konrad Rzeszutek Wilk +Signed-off-by: Konrad Rzeszutek Wilk +Signed-off-by: H. Peter Anvin +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/mm/fault.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/x86/mm/fault.c ++++ b/arch/x86/mm/fault.c +@@ -377,10 +377,12 @@ static noinline __kprobes int vmalloc_fa + if (pgd_none(*pgd_ref)) + return -1; + +- if (pgd_none(*pgd)) ++ if (pgd_none(*pgd)) { + set_pgd(pgd, *pgd_ref); +- else ++ arch_flush_lazy_mmu_mode(); ++ } else { + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref)); ++ } + + /* + * Below here mismatches are bugs because these lower tables diff --git a/queue-3.4/x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch b/queue-3.4/x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch new file mode 100644 index 00000000000..b157613fda0 --- /dev/null +++ b/queue-3.4/x86-mm-patch-out-arch_flush_lazy_mmu_mode-when-running-on-bare-metal.patch @@ -0,0 +1,138 @@ +From 511ba86e1d386f671084b5d0e6f110bb30b8eeb2 Mon Sep 17 00:00:00 2001 +From: Boris Ostrovsky +Date: Sat, 23 Mar 2013 09:36:36 -0400 +Subject: x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal + +From: Boris Ostrovsky + +commit 511ba86e1d386f671084b5d0e6f110bb30b8eeb2 upstream. + +Invoking arch_flush_lazy_mmu_mode() results in calls to +preempt_enable()/disable() which may have performance impact. + +Since lazy MMU is not used on bare metal we can patch away +arch_flush_lazy_mmu_mode() so that it is never called in such +environment. + +[ hpa: the previous patch "Fix vmalloc_fault oops during lazy MMU + updates" may cause a minor performance regression on + bare metal. This patch resolves that performance regression. It is + somewhat unclear to me if this is a good -stable candidate. ] + +Signed-off-by: Boris Ostrovsky +Link: http://lkml.kernel.org/r/1364045796-10720-2-git-send-email-konrad.wilk@oracle.com +Tested-by: Josh Boyer +Tested-by: Konrad Rzeszutek Wilk +Acked-by: Borislav Petkov +Signed-off-by: Konrad Rzeszutek Wilk +Signed-off-by: H. Peter Anvin +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/include/asm/paravirt.h | 5 ++++- + arch/x86/include/asm/paravirt_types.h | 2 ++ + arch/x86/kernel/paravirt.c | 25 +++++++++++++------------ + arch/x86/lguest/boot.c | 1 + + arch/x86/xen/mmu.c | 1 + + 5 files changed, 21 insertions(+), 13 deletions(-) + +--- a/arch/x86/include/asm/paravirt.h ++++ b/arch/x86/include/asm/paravirt.h +@@ -741,7 +741,10 @@ static inline void arch_leave_lazy_mmu_m + PVOP_VCALL0(pv_mmu_ops.lazy_mode.leave); + } + +-void arch_flush_lazy_mmu_mode(void); ++static inline void arch_flush_lazy_mmu_mode(void) ++{ ++ PVOP_VCALL0(pv_mmu_ops.lazy_mode.flush); ++} + + static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, + phys_addr_t phys, pgprot_t flags) +--- a/arch/x86/include/asm/paravirt_types.h ++++ b/arch/x86/include/asm/paravirt_types.h +@@ -91,6 +91,7 @@ struct pv_lazy_ops { + /* Set deferred update mode, used for batching operations. */ + void (*enter)(void); + void (*leave)(void); ++ void (*flush)(void); + }; + + struct pv_time_ops { +@@ -680,6 +681,7 @@ void paravirt_end_context_switch(struct + + void paravirt_enter_lazy_mmu(void); + void paravirt_leave_lazy_mmu(void); ++void paravirt_flush_lazy_mmu(void); + + void _paravirt_nop(void); + u32 _paravirt_ident_32(u32); +--- a/arch/x86/kernel/paravirt.c ++++ b/arch/x86/kernel/paravirt.c +@@ -263,6 +263,18 @@ void paravirt_leave_lazy_mmu(void) + leave_lazy(PARAVIRT_LAZY_MMU); + } + ++void paravirt_flush_lazy_mmu(void) ++{ ++ preempt_disable(); ++ ++ if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) { ++ arch_leave_lazy_mmu_mode(); ++ arch_enter_lazy_mmu_mode(); ++ } ++ ++ preempt_enable(); ++} ++ + void paravirt_start_context_switch(struct task_struct *prev) + { + BUG_ON(preemptible()); +@@ -292,18 +304,6 @@ enum paravirt_lazy_mode paravirt_get_laz + return percpu_read(paravirt_lazy_mode); + } + +-void arch_flush_lazy_mmu_mode(void) +-{ +- preempt_disable(); +- +- if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) { +- arch_leave_lazy_mmu_mode(); +- arch_enter_lazy_mmu_mode(); +- } +- +- preempt_enable(); +-} +- + struct pv_info pv_info = { + .name = "bare hardware", + .paravirt_enabled = 0, +@@ -477,6 +477,7 @@ struct pv_mmu_ops pv_mmu_ops = { + .lazy_mode = { + .enter = paravirt_nop, + .leave = paravirt_nop, ++ .flush = paravirt_nop, + }, + + .set_fixmap = native_set_fixmap, +--- a/arch/x86/lguest/boot.c ++++ b/arch/x86/lguest/boot.c +@@ -1333,6 +1333,7 @@ __init void lguest_init(void) + pv_mmu_ops.read_cr3 = lguest_read_cr3; + pv_mmu_ops.lazy_mode.enter = paravirt_enter_lazy_mmu; + pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mmu_mode; ++ pv_mmu_ops.lazy_mode.flush = paravirt_flush_lazy_mmu; + pv_mmu_ops.pte_update = lguest_pte_update; + pv_mmu_ops.pte_update_defer = lguest_pte_update; + +--- a/arch/x86/xen/mmu.c ++++ b/arch/x86/xen/mmu.c +@@ -2076,6 +2076,7 @@ static const struct pv_mmu_ops xen_mmu_o + .lazy_mode = { + .enter = paravirt_enter_lazy_mmu, + .leave = xen_leave_lazy_mmu, ++ .flush = paravirt_flush_lazy_mmu, + }, + + .set_fixmap = xen_set_fixmap,