Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755800AbbESLeJ (ORCPT ); Tue, 19 May 2015 07:34:09 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:12934 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755782AbbESLeF (ORCPT ); Tue, 19 May 2015 07:34:05 -0400 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Tue, 19 May 2015 04:31:16 -0700 Message-ID: <555B1FA7.1080306@nvidia.com> Date: Tue, 19 May 2015 20:33:59 +0900 From: Alexandre Courbot User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk , Thierry Reding , David Airlie CC: Thomas Hellstrom , Arnd Bergmann , , , Subject: Re: [PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range References: <1431673794-16169-1-git-send-email-acourbot@nvidia.com> <20150515195551.GE23819@l.oracle.com> In-Reply-To: <20150515195551.GE23819@l.oracle.com> X-Originating-IP: [10.19.62.22] X-ClientProxiedBy: HKMAIL102.nvidia.com (10.18.16.11) To HKMAIL103.nvidia.com (10.18.16.12) Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2016 Lines: 49 On 05/16/2015 04:55 AM, Konrad Rzeszutek Wilk wrote: > On Fri, May 15, 2015 at 04:09:54PM +0900, Alexandre Courbot wrote: >> 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 { > > > Looks OK to me. Thanks guys. Could we translate these approvals into Acked-bys/Reviewed-bys so Dave (?) can merge this patch? -- 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/