public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86: avoid unnecessary low zone allocation in AMD IOMMU's alloc_coherent
@ 2008-09-10 11:19 FUJITA Tomonori
  2008-09-10 11:57 ` Ingo Molnar
  2008-09-10 12:03 ` Joerg Roedel
  0 siblings, 2 replies; 23+ messages in thread
From: FUJITA Tomonori @ 2008-09-10 11:19 UTC (permalink / raw)
  To: joerg.roedel; +Cc: linux-kernel, mingo

This is for tip/iommu.

btw, Joery, what happens if map_sg (or map_single) gets
not-DMA-capable buffer in the case of !iommu || !domain?


==
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Subject: [PATCH] x86: avoid unnecessary low zone allocation in AMD IOMMU's alloc_coherent

x86's common alloc_coherent (dma_alloc_coherent in dma-mapping.h) sets
up the gfp flag according to the device dma_mask but AMD IOMMU doesn't
need it for devices that the IOMMU can do virtual mappings for. This
patch avoids unnecessary low zone allocation.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 arch/x86/kernel/amd_iommu.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 01c68c3..8efd249 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -999,6 +999,11 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	u16 devid;
 	phys_addr_t paddr;
 
+	get_device_resources(dev, &iommu, &domain, &devid);
+
+	if (iommu && domain)
+		flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
+
 	virt_addr = (void *)__get_free_pages(flag, get_order(size));
 	if (!virt_addr)
 		return 0;
@@ -1006,8 +1011,6 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	memset(virt_addr, 0, size);
 	paddr = virt_to_phys(virt_addr);
 
-	get_device_resources(dev, &iommu, &domain, &devid);
-
 	if (!iommu || !domain) {
 		*dma_addr = (dma_addr_t)paddr;
 		return virt_addr;
-- 
1.5.4.2


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2008-09-11 13:37 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-10 11:19 [PATCH] x86: avoid unnecessary low zone allocation in AMD IOMMU's alloc_coherent FUJITA Tomonori
2008-09-10 11:57 ` Ingo Molnar
2008-09-10 12:03 ` Joerg Roedel
2008-09-10 12:18   ` Ingo Molnar
2008-09-10 12:38   ` FUJITA Tomonori
2008-09-10 12:48     ` Joerg Roedel
2008-09-10 13:03       ` FUJITA Tomonori
2008-09-10 13:10         ` Joerg Roedel
2008-09-10 13:37           ` FUJITA Tomonori
2008-09-10 13:53             ` Joerg Roedel
2008-09-10 14:24               ` FUJITA Tomonori
2008-09-10 14:38                 ` Joerg Roedel
2008-09-10 14:45                   ` FUJITA Tomonori
2008-09-11  9:10                     ` Joerg Roedel
2008-09-11 13:36                       ` FUJITA Tomonori
2008-09-10 14:39                 ` FUJITA Tomonori
2008-09-10 14:52                   ` Joerg Roedel
2008-09-10 15:09                     ` FUJITA Tomonori
2008-09-10 15:29                       ` Joerg Roedel
2008-09-10 16:29                         ` FUJITA Tomonori
2008-09-10 17:05                           ` Joerg Roedel
2008-09-10 17:15                             ` FUJITA Tomonori
2008-09-10 17:25                               ` Joerg Roedel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox