From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandre Courbot Subject: Re: [PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range Date: Tue, 19 May 2015 20:33:59 +0900 Message-ID: <555B1FA7.1080306@nvidia.com> References: <1431673794-16169-1-git-send-email-acourbot@nvidia.com> <20150515195551.GE23819@l.oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com [216.228.121.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A10A289F0A for ; Tue, 19 May 2015 04:34:04 -0700 (PDT) In-Reply-To: <20150515195551.GE23819@l.oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Konrad Rzeszutek Wilk , Thierry Reding , David Airlie Cc: gnurou@gmail.com, Thomas Hellstrom , dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gMDUvMTYvMjAxNSAwNDo1NSBBTSwgS29ucmFkIFJ6ZXN6dXRlayBXaWxrIHdyb3RlOgo+IE9u IEZyaSwgTWF5IDE1LCAyMDE1IGF0IDA0OjA5OjU0UE0gKzA5MDAsIEFsZXhhbmRyZSBDb3VyYm90 IHdyb3RlOgo+PiBkbWFfYWxsb2NfY29oZXJlbnQoKSBjYW4gcmV0dXJuIG1lbW9yeSBpbiB0aGUg dm1hbGxvYyByYW5nZS4KPj4gdmlydF90b19wYWdlKCkgY2Fubm90IGhhbmRsZSBzdWNoIGFkZHJl c3NlcyBhbmQgY3Jhc2hlcy4gVGhpcwo+PiBwYXRjaCBkZXRlY3RzIHN1Y2ggY2FzZXMgYW5kIG9i dGFpbnMgdGhlIHN0cnVjdCBwYWdlICogdXNpbmcKPj4gdm1hbGxvY190b19wYWdlKCkgaW5zdGVh ZC4KPj4KPj4gU2lnbmVkLW9mZi1ieTogQWxleGFuZHJlIENvdXJib3QgPGFjb3VyYm90QG52aWRp YS5jb20+Cj4+IC0tLQo+PiBUaGlzIHBhdGNoIGlzIGEgZm9sbG93LXVwIG9mIHRoZSBmb2xsb3dp bmcgZGlzY3Vzc2lvbjoKPj4KPj4gaHR0cHM6Ly93d3cubWFyYy5pbmZvLz9sPWRyaS1kZXZlbCZt PTE0MTU3OTU5NTQzMTI1NCZ3PTMKPj4KPj4gSXQgd29ya3MgZm9yIG1lIG9uIGJvdGggMzItYml0 IGFuZCA2NC1iaXQgVGVncmEsIHNvIEkgYW0gbm90IGNvbnZpbmNlZAo+PiB0aGF0IFRoaWVycnkn cyBpbml0aWFsIGNoYW5nZSBmcm9tIHZpcnRfdG9fcGFnZSgpIHRvIHBoeXNfdG9fcGFnZSgpIGlz Cj4+IHN0aWxsIHJlcXVpcmVkIC0gVGhpZXJyeSwgY2FuIHlvdSBjb25maXJtIHdoZXRoZXIgeW91 ciBwYXRjaCBpcyBzdGlsbAo+PiByZWxldmFudCBhZnRlciB0aGlzIG9uZT8KPj4KPj4gICBkcml2 ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jX2RtYS5jIHwgOSArKysrKystLS0KPj4gICAx IGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvY19kbWEuYyBiL2RyaXZl cnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2NfZG1hLmMKPj4gaW5kZXggMDFlMWQyN2ViMDc4 Li4zMDc3ZjE1NTQwOTkgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3Bh Z2VfYWxsb2NfZG1hLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxv Y19kbWEuYwo+PiBAQCAtMzQyLDkgKzM0MiwxMiBAQCBzdGF0aWMgc3RydWN0IGRtYV9wYWdlICpf X3R0bV9kbWFfYWxsb2NfcGFnZShzdHJ1Y3QgZG1hX3Bvb2wgKnBvb2wpCj4+ICAgCWRfcGFnZS0+ dmFkZHIgPSBkbWFfYWxsb2NfY29oZXJlbnQocG9vbC0+ZGV2LCBwb29sLT5zaXplLAo+PiAgIAkJ CQkJICAgJmRfcGFnZS0+ZG1hLAo+PiAgIAkJCQkJICAgcG9vbC0+Z2ZwX2ZsYWdzKTsKPj4gLQlp ZiAoZF9wYWdlLT52YWRkcikKPj4gLQkJZF9wYWdlLT5wID0gdmlydF90b19wYWdlKGRfcGFnZS0+ dmFkZHIpOwo+PiAtCWVsc2Ugewo+PiArCWlmIChkX3BhZ2UtPnZhZGRyKSB7Cj4+ICsJCWlmIChp c192bWFsbG9jX2FkZHIoZF9wYWdlLT52YWRkcikpCj4+ICsJCQlkX3BhZ2UtPnAgPSB2bWFsbG9j X3RvX3BhZ2UoZF9wYWdlLT52YWRkcik7Cj4+ICsJCWVsc2UKPj4gKwkJCWRfcGFnZS0+cCA9IHZp cnRfdG9fcGFnZShkX3BhZ2UtPnZhZGRyKTsKPj4gKwl9IGVsc2Ugewo+Cj4KPiBMb29rcyBPSyB0 byBtZS4KClRoYW5rcyBndXlzLiBDb3VsZCB3ZSB0cmFuc2xhdGUgdGhlc2UgYXBwcm92YWxzIGlu dG8gCkFja2VkLWJ5cy9SZXZpZXdlZC1ieXMgc28gRGF2ZSAoPykgY2FuIG1lcmdlIHRoaXMgcGF0 Y2g/Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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 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?