Skip to contentSkip to conversation

New: sky2 0000:06:00.0: DMA-API: device driver frees DMA memory with different size

Bug 487894 Stephen Hemminger 3 participants 8 messages Apr 1, 2009 – Apr 2, 2009 1 message not in the archive x86

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 123 lines

ummary: sky2 0000:06:00.0: DMA-API: device driver frees DMA memory with different size

https://bugzilla.redhat.com/show_bug.cgi?id=487894

Summary: sky2 0000:06:00.0: DMA-API: device driver frees DMA
memory with different size
Product: Fedora
Version: rawhide
Platform: i686
OS/Version: Linux
Status: NEW
Severity: low
Priority: low
Component: kernel
AssignedTo: [email protected]
ReportedBy: [email protected]
QAContact: [email protected]
CC: [email protected], [email protected]
Estimated Hours: 0.0
Classification: Fedora

Description of problem:

After building and installing kernel-2.6.29-0.159.rc6.git3.fc11.src.rpm on a Fedora 10 machine (i7 Core)

The kernel boots up OK, but displays this error message:

-----------[ cut here ]------------

WARNING: at lib/dma-debug.c:470 check_unmap+0x1cd/0x42e() (Not tainted)
Hardware name: System Product Name
sky2 0000:06:00.0: DMA-API: device driver frees DMA memory with different size
[device address=0x0000000033171042] [map size=1520 bytes] [unmap size=0 bytes]
Modules linked in: aoe sky2 e1000e
Pid: 0, comm: swapper Not tainted 2.6.29-0.159.rc6.git3.fc10.i686.PAE #1
Call Trace:
 [<c04383c5>] warn_slowpath+0x7c/0xbd
 [<c04585ae>] ? trace_hardirqs_on_caller+0x10b/0x145
 [<c0448c8b>] ? __kernel_text_address+0x39/0x43
 [<c040c067>] ? print_context_stack+0x8d/0x9e
 [<c0458079>] ? mark_lock+0x1e/0x349
 [<c04572f9>] ? register_lock_class+0x17/0x290
 [<c0558db9>] ? check_unmap+0x65/0x42e
 [<c0558f21>] check_unmap+0x1cd/0x42e
 [<c0552653>] ? random32+0x16/0x18
 [<c05584c5>] ? should_fail+0x80/0x14b
 [<c040df5b>] ? sched_clock+0x8/0xb
 [<c040df5b>] ? sched_clock+0x8/0xb
 [<c04adeb0>] ? check_valid_pointer+0x24/0x53
 [<c04ae51d>] ? check_object+0x131/0x165
 [<c0559358>] debug_dma_unmap_page+0x59/0x61
 [<f80a25f9>] dma_unmap_single+0x4c/0x57 [sky2]
 [<f80a263f>] sky2_rx_unmap_skb+0x3b/0xa5 [sky2]
 [<f80a2052>] ? sky2_rx_alloc+0x61/0xdb [sky2]
 [<f80a4e77>] sky2_poll+0x569/0x97a [sky2]
 [<c06852a4>] ? net_rx_action+0x189/0x1ca
 [<c06851bc>] net_rx_action+0xa1/0x1ca
 [<c043d276>] __do_softirq+0x9d/0x157
 [<c043d1d9>] ? __do_softirq+0x0/0x157
 <IRQ>  [<c047b642>] ? handle_edge_irq+0x0/0xf2
 [<c043cf1a>] ? irq_exit+0x49/0x77
 [<c040b2b3>] ? do_IRQ+0xf5/0x10b
 [<c0409dac>] ? common_interrupt+0x2c/0x34
 [<c045007b>] ? __async_schedule+0x90/0x120
 [<c040ee11>] ? mwait_idle+0x77/0xa7
 [<c0408798>] ? cpu_idle+0x70/0x90
 [<c07093a5>] ? start_secondary+0x1c9/0x1d1
---[ end trace bf70a1302e043c63 ]---

Version-Release number of selected component (if applicable):
2.6.29-0.159.rc6.git3.fc10.i686.PAE

How reproducible:

I boot the kernel via PXE, I've modified the initrd so load the Sky ethernet driver so that I can boot from an AOE server.

I've added the following to the init script (so I can boot via AOE)

echo "Loading sky2 module"
modprobe -q sky2
sleep 2
#==============================
busybox ifconfig eth0 up
busybox ifconfig eth1 up
sleep 4
echo "Creatig AOE /dev entries"

mknod /dev/etherd/stat       c 152 1
mknod /dev/etherd/err        c 152 2
mknod /dev/etherd/discover   c 152 3

mknod /dev/etherd/interfaces c 152 4
mknod /dev/etherd/revalidate c 152 5
mknod /dev/etherd/flush c 152 6
echo "Loading aoe module"
modprobe -q aoe aoe_iflist="eth0,eth1"
echo "Scanning AOE network for disks"
echo "1" > /dev/etherd/discover
sleep 1
mkblkdevs
#=============================

Steps to Reproduce:
1. boot via PXE with modified initrd
2.
3.

Actual results:

sky2 0000:06:00.0: DMA-API: device driver frees DMA memory with different size [device address=0x0000000033171042] [map size=1520 bytes] [unmap size=0 bytes]

Expected results:

No message should appear.

I would imagine that the above unmap should release 1520 bytes rather than 0 bytes.

Additional info:

The above works fine with all previous kernels, so I would expect it to work with the newer .28/.29 kernels too.

Quoted 5 lines · On Wed, 1 Apr 2009 13:27:08 -0400 Dave Jones <[email protected]> wrote:

I'm not sure _what_ to make of this one..

Null fragment ? How can that happen?

Dave

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is. How about?
========================================================
Unstub pci_unmap macros if doing DMA-API checks

If doing device driver DMA-API tests then need to keep track of address/length even on 32-bit x86 where the information is not normally needed.

arch/x86/include/asm/pci_32.h +12 -3
@@ -17,16 +17,25 @@ struct pci_dev;
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
+#ifdef CONFIG_DMA_API_DEBUG
+/* keep real values */
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		__u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)		((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	(((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))
+#else
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME[0];
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)	unsigned LEN_NAME[0];
-#define pci_unmap_addr(PTR, ADDR_NAME)	sizeof((PTR)->ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		__u32 LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)		sizeof((PTR)->ADDR_NAME)
 #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
 	do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
 #define pci_unmap_len(PTR, LEN_NAME)		sizeof((PTR)->LEN_NAME)
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
 	do { break; } while (pci_unmap_len(PTR, LEN_NAME))
-
+#endif
 
 #endif /* __KERNEL__ */
 
#2 lore raw
Quoted 4 lines · Stephen Hemminger

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.
The other question is why pci_unmap_* functions are not defined as a nop too and call dma_unmap_* instead? This looks inconsisent to me.

Quoted 27 lines

========================================================
Unstub pci_unmap macros if doing DMA-API checks

If doing device driver DMA-API tests then need to keep track of address/length even on 32-bit x86 where the information is not normally needed.

arch/x86/include/asm/pci_32.h +9 -1
@@ -17,16 +17,25 @@ struct pci_dev;
  */
 #define PCI_DMA_BUS_IS_PHYS	(1)
 
+#ifdef CONFIG_DMA_API_DEBUG
+/* keep real values */
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		__u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)		((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	(((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)		((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	(((PTR)->LEN_NAME) = (VAL))
+#else
 /* pci_unmap_{page,single} is a nop so... */
 #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME[0];
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)	unsigned LEN_NAME[0];

arch/x86/include/asm/pci_32.h struct pci_dev; · line 38

Quoted 10 lines
arch/x86/include/asm/pci_32.h +3 -2
-#define pci_unmap_addr(PTR, ADDR_NAME)	sizeof((PTR)->ADDR_NAME)
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		__u32 LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)		sizeof((PTR)->ADDR_NAME)
 #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
 	do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
 #define pci_unmap_len(PTR, LEN_NAME)		sizeof((PTR)->LEN_NAME)
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
 	do { break; } while (pci_unmap_len(PTR, LEN_NAME))
-
+#endif

I think we need another solution which takes into account that there might be VT-d enabled and which defines the pci_unmap_* functions also as a nop when it is not. I suggest to make a CONFIG option for these functions nit being a nop and let DMA_API_DEBUG select it on x86. So we get proper checking for drivers on 32bit x86 too which helps other architectures where these drivers can be used.

Joerg

Signature · 6 lines
           | Advanced Micro Devices GmbH
 Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
 System    | 
 Research  | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
 Center    | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
           | Registergericht München, HRB Nr. 43632
#3 lore raw
Quoted 8 lines · On Thu, 2 Apr 2009 12:54:15 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.

VT-d is available on only x86_64.

#4 lore raw
Quoted 5 lines · FUJITA Tomonori
Quoted 2 lines · On Thu, 2 Apr 2009 12:54:15 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 1 line · Stephen Hemminger
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.

VT-d is available on only x86_64.

At least there was a patch to enable it on 32 bit too. See

https://lists.linux-foundation.org/pipermail/iommu/2009-February/001080.html

It seems not to be upstream yet.

Joerg

Signature · 6 lines
           | Advanced Micro Devices GmbH
 Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
 System    | 
 Research  | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
 Center    | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
           | Registergericht München, HRB Nr. 43632
#5 lore raw
Quoted 13 lines · On Thu, 2 Apr 2009 13:18:39 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 12 lines · FUJITA Tomonori
Quoted 8 lines · On Thu, 2 Apr 2009 12:54:15 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 4 lines · Stephen Hemminger

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.

Quoted 7 lines
Quoted 1 line

VT-d is available on only x86_64.

At least there was a patch to enable it on 32 bit too. See

https://lists.linux-foundation.org/pipermail/iommu/2009-February/001080.html

It seems not to be upstream yet.

It's not in upstream.

Anyway, about the original problem, I think that the best fix is not to stub out the dma API; using the dma API properly is always a good thing.

#6 lore raw
Quoted 22 lines · FUJITA Tomonori
Quoted 19 lines · On Thu, 2 Apr 2009 13:18:39 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 5 lines · FUJITA Tomonori
Quoted 2 lines · On Thu, 2 Apr 2009 12:54:15 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 1 line · Stephen Hemminger
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.

VT-d is available on only x86_64.

At least there was a patch to enable it on 32 bit too. See

https://lists.linux-foundation.org/pipermail/iommu/2009-February/001080.html

Quoted 8 lines
Quoted 1 line

It seems not to be upstream yet.

It's not in upstream.

Anyway, about the original problem, I think that the best fix is not to stub out the dma API; using the dma API properly is always a good thing.

True.

For the real fix I prepared this fix. We still should find a better #ifdef condition but that should not be a seperate patch. Does that look ok to everyone? If yes, I send it to Ingo.

commit e8cdd3b8d2fc3ec2a1dd337cba94feb7a7442751

Author: Joerg Roedel <[email protected]>
Date:   Thu Apr 2 15:55:55 2009 +0200

x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

Impact: unification of pci-dma macros and pci_32h removal

This patch unifies the definition of the pci_unmap_addr*, pci_unmap_len* and DECLARE_PCI_UNMAP* macros. This makes sense because the pci_unmap functions are no longer no-ops anymore when the kernel runs with CONFIG_DMA_API_DEBUG. This also simplifies the port of x86_64 iommu drivers to 32 bit x86 and let us get rid of pci_32.h.

arch/x86/include/asm/pci.h +32 -4
index a977de2..ad8f991 100644
@@ -86,12 +86,40 @@ static inline void early_quirks(void) { }
 
 extern void pci_iommu_alloc(void);
 
-#endif  /* __KERNEL__ */
+#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
+
+#if defined(CONFIG_X86_64) || defined CONFIG_DMA_API_DEBUG
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
+	        dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
+	        __u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)                  \
+	        ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
+	        (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)                    \
+	        ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
+	        (((PTR)->LEN_NAME) = (VAL))
 
-#ifdef CONFIG_X86_32
-# include "pci_32.h"
 #else
-# include "pci_64.h"
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+	        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
+#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+	        do { break; } while (pci_unmap_len(PTR, LEN_NAME))
+
+#endif
+
+#endif  /* __KERNEL__ */
+
+#ifdef CONFIG_X86_64
+#include "pci_64.h"
 #endif
 
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
arch/x86/include/asm/pci_32.h deleted +0 -34
deleted file mode 100644
index 6f1213a..0000000
@@ -1,34 +0,0 @@
-#ifndef _ASM_X86_PCI_32_H
-#define _ASM_X86_PCI_32_H
-
-
-#ifdef __KERNEL__
-
-
-/* Dynamic DMA mapping stuff.
- * i386 has everything mapped statically.
- */
-
-struct pci_dev;
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS	(1)
-
-/* pci_unmap_{page,single} is a nop so... */
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME[0];
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)	unsigned LEN_NAME[0];
-#define pci_unmap_addr(PTR, ADDR_NAME)	sizeof((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
-	do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
-#define pci_unmap_len(PTR, LEN_NAME)		sizeof((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
-	do { break; } while (pci_unmap_len(PTR, LEN_NAME))
-
-
-#endif /* __KERNEL__ */
-
-
-#endif /* _ASM_X86_PCI_32_H */
arch/x86/include/asm/pci_64.h +0 -22
index 4da2079..ae5e40f 100644
@@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
 
 extern void dma32_reserve_bootmem(void);
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions
- *
- * On AMD64 it mostly equals, but we set it to zero if a hardware
- * IOMMU (gart) of sotware IOMMU (swiotlb) is available.
- */
-#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\
-	dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\
-	__u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)			\
-	((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\
-	(((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)			\
-	((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\
-	(((PTR)->LEN_NAME) = (VAL))
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_X86_PCI_64_H */
Signature · 6 lines
           | Advanced Micro Devices GmbH
 Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
 System    | 
 Research  | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
 Center    | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
           | Registergericht München, HRB Nr. 43632
author Acked-by
#7 lore raw
Quoted 46 lines · On Thu, 2 Apr 2009 16:31:42 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 22 lines · FUJITA Tomonori
Quoted 19 lines · On Thu, 2 Apr 2009 13:18:39 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 5 lines · FUJITA Tomonori
Quoted 2 lines · On Thu, 2 Apr 2009 12:54:15 +0200 Joerg Roedel <[email protected]> wrote:
Quoted 1 line · Stephen Hemminger
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

The sky2 driver uses pci_unmap_len and pci_unmap_len_set which on 32 bit platforms are meaningless so they are stubbed out. Basically, DMA-API checks are wrong/bogus to enforce on 32bit x86 as is.

As far as I know the VT-d driver is available on 32 bit x86 too. So this should not always be a nop.

VT-d is available on only x86_64.

At least there was a patch to enable it on 32 bit too. See

https://lists.linux-foundation.org/pipermail/iommu/2009-February/001080.html

Quoted 8 lines
Quoted 1 line

It seems not to be upstream yet.

It's not in upstream.

Anyway, about the original problem, I think that the best fix is not to stub out the dma API; using the dma API properly is always a good thing.

True.

For the real fix I prepared this fix. We still should find a better #ifdef condition but that should not be a seperate patch. Does that look ok to everyone? If yes, I send it to Ingo.

commit e8cdd3b8d2fc3ec2a1dd337cba94feb7a7442751

Author: Joerg Roedel <[email protected]>
Date:   Thu Apr 2 15:55:55 2009 +0200

x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

Impact: unification of pci-dma macros and pci_32h removal

Quoted 7 lines

This patch unifies the definition of the pci_unmap_addr*, pci_unmap_len* and DECLARE_PCI_UNMAP* macros. This makes sense because the pci_unmap functions are no longer no-ops anymore when the kernel runs with CONFIG_DMA_API_DEBUG. This also simplifies the port of x86_64 iommu drivers to 32 bit x86 and let us get rid of pci_32.h.

Would also like some more comments to explain to the kernel neophytes why the 32 bit version is no-op. Do other arch have same issue?

Acked-by Stephen Hemminger
#8 lore raw
Quoted 15 lines · Stephen Hemminger
Quoted 13 lines · On Thu, 2 Apr 2009 16:31:42 +0200 Joerg Roedel <[email protected]> wrote:
Author: Joerg Roedel <[email protected]>
Date:   Thu Apr 2 15:55:55 2009 +0200

x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

Impact: unification of pci-dma macros and pci_32h removal

This patch unifies the definition of the pci_unmap_addr*, pci_unmap_len* and DECLARE_PCI_UNMAP* macros. This makes sense because the pci_unmap functions are no longer no-ops anymore when the kernel runs with CONFIG_DMA_API_DEBUG. This also simplifies the port of x86_64 iommu drivers to 32 bit x86 and let us get rid of pci_32.h.

Quoted 7 lines
Quoted 1 line

Would also like some more comments to explain to the kernel neophytes why the 32 bit version is no-op. Do other arch have same issue?

Ok, changed the patch description to

x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros

Impact: unification of pci-dma macros and pci_32.h removal

This patch unifies the definition of the pci_unmap_addr*, pci_unmap_len* and DECLARE_PCI_UNMAP* macros. This makes sense because the pci_unmap functions are no longer no-ops anymore when the kernel runs with CONFIG_DMA_API_DEBUG. Without an iommu or DMA_API_DEBUG it is a no-op on 32 bit because the dma mapping path returns a physical address and therefore the dma-api implementation has no internal state which needs to be destroyed with an unmap call.
This unification also simplifies the port of x86_64 iommu drivers to 32 bit x86 and let us get rid of pci_32.h.

Joerg

Signature · 6 lines
           | Advanced Micro Devices GmbH
 Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
 System    | 
 Research  | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
 Center    | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
           | Registergericht München, HRB Nr. 43632