linux-kernel - [PATCH 3.2 144/164] config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 02 Aug 2015 01:02:38 +0100
From:	Ben Hutchings <ben@...adent.org.uk>
To:	linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC:	akpm@...ux-foundation.org, vyasevich@...il.com,
	boris.ostrovsky@...cle.com, siva.kallam@...adcom.com,
	"Ian Jackson" <Ian.Jackson@...citrix.com>, sanjeevb@...adcom.com,
	"Linus Torvalds" <torvalds@...ux-foundation.org>,
	"Thomas Gleixner" <tglx@...utronix.de>,
	"Ingo Molnar" <mingo@...nel.org>,
	"Prashant Sreedharan" <prashant@...adcom.com>,
	"David S. Miller" <davem@...emloft.net>,
	xen-devel@...ts.xensource.com, david.vrabel@...rix.com,
	"H. Peter Anvin" <hpa@...or.com>,
	"Konrad Rzeszutek Wilk" <konrad.wilk@...cle.com>,
	"Michael Chan" <mchan@...adcom.com>,
	"Borislav Petkov" <bp@...en8.de>, cascardo@...ux.vnet.ibm.com
Subject: [PATCH 3.2 144/164] config: Enable NEED_DMA_MAP_STATE by default
 when SWIOTLB is selected

3.2.70-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>

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 <Ian.Jackson@...citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Acked-by: David S. Miller <davem@...emloft.net>
Acked-by: Prashant Sreedharan <prashant@...adcom.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Michael Chan <mchan@...adcom.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: boris.ostrovsky@...cle.com
Cc: cascardo@...ux.vnet.ibm.com
Cc: david.vrabel@...rix.com
Cc: sanjeevb@...adcom.com
Cc: siva.kallam@...adcom.com
Cc: vyasevich@...il.com
Cc: xen-devel@...ts.xensource.com
Link: http://lkml.kernel.org/r/20150417190448.GA9462@l.oracle.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
[bwh: Backported to 3.2: also change the def_bool (cond) to
 def_bool y + depends]
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -133,7 +133,8 @@ config SBUS
 	bool
 
 config NEED_DMA_MAP_STATE
-       def_bool (X86_64 || INTEL_IOMMU || DMA_API_DEBUG)
+	def_bool y
+	depends on X86_64 || INTEL_IOMMU || DMA_API_DEBUG || SWIOTLB
 
 config NEED_SG_DMA_LENGTH
 	def_bool y

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/