dma-debug: make memory range checks more consistent
PATCH 1/1 dma-debug: make memory range checks more consistent
Impact: do range checks always when a page is mapped
Signed-off-by Joerg Roedel <[email protected]>
--- lib/dma-debug.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
lib/dma-debug.c +8 -5
@@ -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); }
Signature · 1 line
1.5.6.4
Commit-ID: 9537a48ed4b9e4b738943d6da0a0fd4278adf905 Gitweb: http://git.kernel.org/tip/9537a48ed4b9e4b738943d6da0a0fd4278adf905 Author: Joerg Roedel <[email protected]> AuthorDate: Mon, 23 Mar 2009 15:35:08 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 24 Mar 2009 08:39:32 +0100
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 <[email protected]>
Signed-off-by Joerg Roedel <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- lib/dma-debug.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
lib/dma-debug.c +8 -5
@@ -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); }