Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754359AbbEOHKK (ORCPT ); Fri, 15 May 2015 03:10:10 -0400 Received: from hqemgate15.nvidia.com ([216.228.121.64]:8229 "EHLO hqemgate15.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754179AbbEOHKG (ORCPT ); Fri, 15 May 2015 03:10:06 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Fri, 15 May 2015 00:07:34 -0700 From: Alexandre Courbot To: Thierry Reding , Konrad Rzeszutek Wilk , Thomas Hellstrom , Arnd Bergmann CC: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, gnurou@gmail.com, Alexandre Courbot Subject: [PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range Date: Fri, 15 May 2015 16:09:54 +0900 Message-ID: <1431673794-16169-1-git-send-email-acourbot@nvidia.com> X-Mailer: git-send-email 2.4.0 X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1703 Lines: 47 dma_alloc_coherent() can return memory in the vmalloc range. virt_to_page() cannot handle such addresses and crashes. This patch detects such cases and obtains the struct page * using vmalloc_to_page() instead. Signed-off-by: Alexandre Courbot --- This patch is a follow-up of the following discussion: https://www.marc.info/?l=dri-devel&m=141579595431254&w=3 It works for me on both 32-bit and 64-bit Tegra, so I am not convinced that Thierry's initial change from virt_to_page() to phys_to_page() is still required - Thierry, can you confirm whether your patch is still relevant after this one? drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 01e1d27eb078..3077f1554099 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c @@ -342,9 +342,12 @@ static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool) d_page->vaddr = dma_alloc_coherent(pool->dev, pool->size, &d_page->dma, pool->gfp_flags); - if (d_page->vaddr) - d_page->p = virt_to_page(d_page->vaddr); - else { + if (d_page->vaddr) { + if (is_vmalloc_addr(d_page->vaddr)) + d_page->p = vmalloc_to_page(d_page->vaddr); + else + d_page->p = virt_to_page(d_page->vaddr); + } else { kfree(d_page); d_page = NULL; } -- 2.4.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/