From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755556AbcHXNDn (ORCPT ); Wed, 24 Aug 2016 09:03:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48622 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755500AbcHXNDl (ORCPT ); Wed, 24 Aug 2016 09:03:41 -0400 Date: Wed, 24 Aug 2016 06:02:39 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: peterz@infradead.org, bp@alien8.de, torvalds@linux-foundation.org, mingo@kernel.org, tglx@linutronix.de, dvlasenk@redhat.com, brgerst@gmail.com, luto@kernel.org, hpa@zytor.com, arnd@arndb.de, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Reply-To: torvalds@linux-foundation.org, bp@alien8.de, peterz@infradead.org, brgerst@gmail.com, dvlasenk@redhat.com, tglx@linutronix.de, mingo@kernel.org, arnd@arndb.de, hpa@zytor.com, luto@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com In-Reply-To: <448460622731312298bf19dcbacb1606e75de7a9.1470907718.git.luto@kernel.org> References: <448460622731312298bf19dcbacb1606e75de7a9.1470907718.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] dma-api: Teach the "DMA-from-stack" check about vmapped stacks Git-Commit-ID: b4a0f533e5976cb1a79f31d6152e1d322d79b7f1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b4a0f533e5976cb1a79f31d6152e1d322d79b7f1 Gitweb: http://git.kernel.org/tip/b4a0f533e5976cb1a79f31d6152e1d322d79b7f1 Author: Andy Lutomirski AuthorDate: Thu, 11 Aug 2016 02:35:22 -0700 Committer: Ingo Molnar CommitDate: Wed, 24 Aug 2016 12:11:41 +0200 dma-api: Teach the "DMA-from-stack" check about vmapped stacks If we're using CONFIG_VMAP_STACK=y and we manage to point an sg entry at the stack, then either the sg page will be in highmem or sg_virt() will return the direct-map alias. In neither case will the existing check_for_stack() implementation realize that it's a stack page. Fix it by explicitly checking for stack pages. This has no effect by itself. It's broken out for ease of review. Signed-off-by: Andy Lutomirski Cc: Andrew Morton Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/448460622731312298bf19dcbacb1606e75de7a9.1470907718.git.luto@kernel.org [ Minor edits. ] Signed-off-by: Ingo Molnar --- lib/dma-debug.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/lib/dma-debug.c b/lib/dma-debug.c index fcfa193..06f02f6 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1164,11 +1165,32 @@ static void check_unmap(struct dma_debug_entry *ref) put_hash_bucket(bucket, &flags); } -static void check_for_stack(struct device *dev, void *addr) +static void check_for_stack(struct device *dev, + struct page *page, size_t offset) { - if (object_is_on_stack(addr)) - err_printk(dev, NULL, "DMA-API: device driver maps memory from " - "stack [addr=%p]\n", addr); + void *addr; + struct vm_struct *stack_vm_area = task_stack_vm_area(current); + + if (!stack_vm_area) { + /* Stack is direct-mapped. */ + if (PageHighMem(page)) + return; + addr = page_address(page) + offset; + if (object_is_on_stack(addr)) + err_printk(dev, NULL, "DMA-API: device driver maps memory from stack [addr=%p]\n", addr); + } else { + /* Stack is vmalloced. */ + int i; + + for (i = 0; i < stack_vm_area->nr_pages; i++) { + if (page != stack_vm_area->pages[i]) + continue; + + addr = (u8 *)current->stack + i * PAGE_SIZE + offset; + err_printk(dev, NULL, "DMA-API: device driver maps memory from stack [probable addr=%p]\n", addr); + break; + } + } } static inline bool overlap(void *addr, unsigned long len, void *start, void *end) @@ -1291,10 +1313,11 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset, if (map_single) entry->type = dma_debug_single; + check_for_stack(dev, page, offset); + if (!PageHighMem(page)) { void *addr = page_address(page) + offset; - check_for_stack(dev, addr); check_for_illegal_area(dev, addr, size); } @@ -1386,8 +1409,9 @@ 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_page(s), s->offset); + if (!PageHighMem(sg_page(s))) { - check_for_stack(dev, sg_virt(s)); check_for_illegal_area(dev, sg_virt(s), sg_dma_len(s)); }