From: Greg Kroah-Hartman Date: Mon, 29 Jun 2015 22:55:12 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v3.10.83~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=429cd5d12296564f1fc181e9b595c7c612d55cd1;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch kprobes-x86-return-correct-length-in-__copy_instruction.patch --- diff --git a/queue-3.14/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch b/queue-3.14/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch new file mode 100644 index 00000000000..b40610d9fe7 --- /dev/null +++ b/queue-3.14/config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch @@ -0,0 +1,60 @@ +From a6dfa128ce5c414ab46b1d690f7a1b8decb8526d Mon Sep 17 00:00:00 2001 +From: Konrad Rzeszutek Wilk +Date: Fri, 17 Apr 2015 15:04:48 -0400 +Subject: config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected + +From: Konrad Rzeszutek Wilk + +commit a6dfa128ce5c414ab46b1d690f7a1b8decb8526d upstream. + +A huge amount of NIC drivers use the DMA API, however if +compiled under 32-bit an very important part of the DMA API can +be ommitted leading to the drivers not working at all +(especially if used with 'swiotlb=force iommu=soft'). + +As Prashant Sreedharan explains it: "the driver [tg3] uses +DEFINE_DMA_UNMAP_ADDR(), dma_unmap_addr_set() to keep a copy of +the dma "mapping" and dma_unmap_addr() to get the "mapping" +value. On most of the platforms this is a no-op, but ... with +"iommu=soft and swiotlb=force" this house keeping is required, +... otherwise we pass 0 while calling pci_unmap_/pci_dma_sync_ +instead of the DMA address." + +As such enable this even when using 32-bit kernels. + +Reported-by: Ian Jackson +Signed-off-by: Konrad Rzeszutek Wilk +Acked-by: David S. Miller +Acked-by: Prashant Sreedharan +Cc: Borislav Petkov +Cc: H. Peter Anvin +Cc: Linus Torvalds +Cc: Michael Chan +Cc: Thomas Gleixner +Cc: boris.ostrovsky@oracle.com +Cc: cascardo@linux.vnet.ibm.com +Cc: david.vrabel@citrix.com +Cc: sanjeevb@broadcom.com +Cc: siva.kallam@broadcom.com +Cc: vyasevich@gmail.com +Cc: xen-devel@lists.xensource.com +Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com +Signed-off-by: Ingo Molnar +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -160,7 +160,7 @@ config SBUS + + config NEED_DMA_MAP_STATE + def_bool y +- depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG ++ depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB + + config NEED_SG_DMA_LENGTH + def_bool y diff --git a/queue-3.14/kprobes-x86-return-correct-length-in-__copy_instruction.patch b/queue-3.14/kprobes-x86-return-correct-length-in-__copy_instruction.patch new file mode 100644 index 00000000000..6ab2be0ebd7 --- /dev/null +++ b/queue-3.14/kprobes-x86-return-correct-length-in-__copy_instruction.patch @@ -0,0 +1,58 @@ +From c80e5c0c23ce2282476fdc64c4b5e3d3a40723fd Mon Sep 17 00:00:00 2001 +From: Eugene Shatokhin +Date: Tue, 17 Mar 2015 19:09:18 +0900 +Subject: kprobes/x86: Return correct length in __copy_instruction() + +From: Eugene Shatokhin + +commit c80e5c0c23ce2282476fdc64c4b5e3d3a40723fd upstream. + +On x86-64, __copy_instruction() always returns 0 (error) if the +instruction uses %rip-relative addressing. This is because +kernel_insn_init() is called the second time for 'insn' instance +in such cases and sets all its fields to 0. + +Because of this, trying to place a kprobe on such instruction +will fail, register_kprobe() will return -EINVAL. + +This patch fixes the problem. + +Signed-off-by: Eugene Shatokhin +Signed-off-by: Masami Hiramatsu +Link: http://lkml.kernel.org/r/20150317100918.28349.94654.stgit@localhost.localdomain +Signed-off-by: Ingo Molnar +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/kernel/kprobes/core.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/arch/x86/kernel/kprobes/core.c ++++ b/arch/x86/kernel/kprobes/core.c +@@ -326,13 +326,16 @@ int __kprobes __copy_instruction(u8 *des + { + struct insn insn; + kprobe_opcode_t buf[MAX_INSN_SIZE]; ++ int length; + + kernel_insn_init(&insn, (void *)recover_probed_instruction(buf, (unsigned long)src)); + insn_get_length(&insn); ++ length = insn.length; ++ + /* Another subsystem puts a breakpoint, failed to recover */ + if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION) + return 0; +- memcpy(dest, insn.kaddr, insn.length); ++ memcpy(dest, insn.kaddr, length); + + #ifdef CONFIG_X86_64 + if (insn_rip_relative(&insn)) { +@@ -362,7 +365,7 @@ int __kprobes __copy_instruction(u8 *des + *(s32 *) disp = (s32) newdisp; + } + #endif +- return insn.length; ++ return length; + } + + static int __kprobes arch_copy_kprobe(struct kprobe *p)