aboutsummaryrefslogtreecommitdiffstats
path: root/lib/dma-debug.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-03-23 15:35:08 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-24 08:39:32 +0100
commit9537a48ed4b9e4b738943d6da0a0fd4278adf905 (patch)
tree06f512876680265ece3bd46b14c2b1c234202918 /lib/dma-debug.c
parent35d40952dba7b0689a16bd1463fb7698f8dbe639 (diff)
downloadmrst-s0i3-test-9537a48ed4b9e4b738943d6da0a0fd4278adf905.tar.gz
mrst-s0i3-test-9537a48ed4b9e4b738943d6da0a0fd4278adf905.tar.xz
mrst-s0i3-test-9537a48ed4b9e4b738943d6da0a0fd4278adf905.zip
dma-debug: make memory range checks more consistent
Impact: extend on-kernel-stack DMA debug checks to all !highmem pages We only checked dma_map_single() - extend it to dma_map_page() and dma_map_sg() as well. Also, fix dma_map_single() corner case bug: make sure we dont stack-check highmem (not mapped) pages. Reported-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Cc: iommu@lists.linux-foundation.org LKML-Reference: <1237818908-26516-1-git-send-email-joerg.roedel@amd.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/dma-debug.c')
-rw-r--r--lib/dma-debug.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index f9e6d38b4b3..1a992089486 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -722,10 +722,11 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
entry->size = size;
entry->direction = direction;
- if (map_single) {
- void *addr = ((char *)page_address(page)) + offset;
-
+ if (map_single)
entry->type = dma_debug_single;
+
+ if (!PageHighMem(page)) {
+ void *addr = ((char *)page_address(page)) + offset;
check_for_stack(dev, addr);
check_for_illegal_area(dev, addr, size);
}
@@ -779,8 +780,10 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
entry->sg_call_ents = nents;
entry->sg_mapped_ents = mapped_ents;
- check_for_stack(dev, sg_virt(s));
- check_for_illegal_area(dev, sg_virt(s), s->length);
+ if (!PageHighMem(sg_page(s))) {
+ check_for_stack(dev, sg_virt(s));
+ check_for_illegal_area(dev, sg_virt(s), s->length);
+ }
add_dma_entry(entry);
}