From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range Date: Mon, 1 Jun 2015 13:28:15 -0400 Message-ID: <20150601172815.GC13347@x230> References: <1431673794-16169-1-git-send-email-acourbot@nvidia.com> <20150515195551.GE23819@l.oracle.com> <555B1FA7.1080306@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTP id BCF296E6C9 for ; Mon, 1 Jun 2015 10:28:31 -0700 (PDT) Content-Disposition: inline In-Reply-To: <555B1FA7.1080306@nvidia.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Alexandre Courbot Cc: gnurou@gmail.com, Thomas Hellstrom , Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBNYXkgMTksIDIwMTUgYXQgMDg6MzM6NTlQTSArMDkwMCwgQWxleGFuZHJlIENvdXJi b3Qgd3JvdGU6Cj4gT24gMDUvMTYvMjAxNSAwNDo1NSBBTSwgS29ucmFkIFJ6ZXN6dXRlayBXaWxr IHdyb3RlOgo+ID5PbiBGcmksIE1heSAxNSwgMjAxNSBhdCAwNDowOTo1NFBNICswOTAwLCBBbGV4 YW5kcmUgQ291cmJvdCB3cm90ZToKPiA+PmRtYV9hbGxvY19jb2hlcmVudCgpIGNhbiByZXR1cm4g bWVtb3J5IGluIHRoZSB2bWFsbG9jIHJhbmdlLgo+ID4+dmlydF90b19wYWdlKCkgY2Fubm90IGhh bmRsZSBzdWNoIGFkZHJlc3NlcyBhbmQgY3Jhc2hlcy4gVGhpcwo+ID4+cGF0Y2ggZGV0ZWN0cyBz dWNoIGNhc2VzIGFuZCBvYnRhaW5zIHRoZSBzdHJ1Y3QgcGFnZSAqIHVzaW5nCj4gPj52bWFsbG9j X3RvX3BhZ2UoKSBpbnN0ZWFkLgo+ID4+Cj4gPj5TaWduZWQtb2ZmLWJ5OiBBbGV4YW5kcmUgQ291 cmJvdCA8YWNvdXJib3RAbnZpZGlhLmNvbT4KPiA+Pi0tLQo+ID4+VGhpcyBwYXRjaCBpcyBhIGZv bGxvdy11cCBvZiB0aGUgZm9sbG93aW5nIGRpc2N1c3Npb246Cj4gPj4KPiA+Pmh0dHBzOi8vd3d3 Lm1hcmMuaW5mby8/bD1kcmktZGV2ZWwmbT0xNDE1Nzk1OTU0MzEyNTQmdz0zCj4gPj4KPiA+Pkl0 IHdvcmtzIGZvciBtZSBvbiBib3RoIDMyLWJpdCBhbmQgNjQtYml0IFRlZ3JhLCBzbyBJIGFtIG5v dCBjb252aW5jZWQKPiA+PnRoYXQgVGhpZXJyeSdzIGluaXRpYWwgY2hhbmdlIGZyb20gdmlydF90 b19wYWdlKCkgdG8gcGh5c190b19wYWdlKCkgaXMKPiA+PnN0aWxsIHJlcXVpcmVkIC0gVGhpZXJy eSwgY2FuIHlvdSBjb25maXJtIHdoZXRoZXIgeW91ciBwYXRjaCBpcyBzdGlsbAo+ID4+cmVsZXZh bnQgYWZ0ZXIgdGhpcyBvbmU/Cj4gPj4KPiA+PiAgZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fcGFn ZV9hbGxvY19kbWEuYyB8IDkgKysrKysrLS0tCj4gPj4gIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCj4gPj4KPiA+PmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jX2RtYS5jIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1f cGFnZV9hbGxvY19kbWEuYwo+ID4+aW5kZXggMDFlMWQyN2ViMDc4Li4zMDc3ZjE1NTQwOTkgMTAw NjQ0Cj4gPj4tLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jX2RtYS5jCj4g Pj4rKysgYi9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jX2RtYS5jCj4gPj5AQCAt MzQyLDkgKzM0MiwxMiBAQCBzdGF0aWMgc3RydWN0IGRtYV9wYWdlICpfX3R0bV9kbWFfYWxsb2Nf cGFnZShzdHJ1Y3QgZG1hX3Bvb2wgKnBvb2wpCj4gPj4gIAlkX3BhZ2UtPnZhZGRyID0gZG1hX2Fs bG9jX2NvaGVyZW50KHBvb2wtPmRldiwgcG9vbC0+c2l6ZSwKPiA+PiAgCQkJCQkgICAmZF9wYWdl LT5kbWEsCj4gPj4gIAkJCQkJICAgcG9vbC0+Z2ZwX2ZsYWdzKTsKPiA+Pi0JaWYgKGRfcGFnZS0+ dmFkZHIpCj4gPj4tCQlkX3BhZ2UtPnAgPSB2aXJ0X3RvX3BhZ2UoZF9wYWdlLT52YWRkcik7Cj4g Pj4tCWVsc2Ugewo+ID4+KwlpZiAoZF9wYWdlLT52YWRkcikgewo+ID4+KwkJaWYgKGlzX3ZtYWxs b2NfYWRkcihkX3BhZ2UtPnZhZGRyKSkKPiA+PisJCQlkX3BhZ2UtPnAgPSB2bWFsbG9jX3RvX3Bh Z2UoZF9wYWdlLT52YWRkcik7Cj4gPj4rCQllbHNlCj4gPj4rCQkJZF9wYWdlLT5wID0gdmlydF90 b19wYWdlKGRfcGFnZS0+dmFkZHIpOwo+ID4+Kwl9IGVsc2Ugewo+ID4KPiA+Cj4gPkxvb2tzIE9L IHRvIG1lLgo+IAo+IFRoYW5rcyBndXlzLiBDb3VsZCB3ZSB0cmFuc2xhdGUgdGhlc2UgYXBwcm92 YWxzIGludG8gQWNrZWQtYnlzL1Jldmlld2VkLWJ5cwo+IHNvIERhdmUgKD8pIGNhbiBtZXJnZSB0 aGlzIHBhdGNoPwoKQWNrZWQtYnk6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtA b3JhY2xlLmNvbT4KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753705AbbFAR2l (ORCPT ); Mon, 1 Jun 2015 13:28:41 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:37496 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752850AbbFAR2d (ORCPT ); Mon, 1 Jun 2015 13:28:33 -0400 Date: Mon, 1 Jun 2015 13:28:15 -0400 From: Konrad Rzeszutek Wilk To: Alexandre Courbot Cc: Thierry Reding , David Airlie , Thomas Hellstrom , Arnd Bergmann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, gnurou@gmail.com Subject: Re: [PATCH] drm/ttm: dma: Don't crash on memory in the vmalloc range Message-ID: <20150601172815.GC13347@x230> References: <1431673794-16169-1-git-send-email-acourbot@nvidia.com> <20150515195551.GE23819@l.oracle.com> <555B1FA7.1080306@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <555B1FA7.1080306@nvidia.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 19, 2015 at 08:33:59PM +0900, Alexandre Courbot wrote: > 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? Acked-by: Konrad Rzeszutek Wilk