Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20190711031021.23512-1-huangfq.daxian@gmail.com> <6f28e750-02e4-438a-3680-a4697014689d@amd.com>
In-Reply-To: <6f28e750-02e4-438a-3680-a4697014689d@amd.com>
From:   Fuqian Huang <huangfq.daxian@gmail.com>
Date:   Thu, 18 Jul 2019 15:21:29 +0800
Message-ID: <CABXRUiTG4=isYUHkoha9dYX0P=k6AuQAnrZkcWHT=-Yf2gk6Vg@mail.gmail.com>
Subject: Re: [PATCH 1/2] drm/ttm: use the same attributes when freeing d_page->vaddr
To:     "Koenig, Christian" <Christian.Koenig@amd.com>
Cc:     "Huang, Ray" <Ray.Huang@amd.com>,
        Junwei Zhang <Jerry.Zhang@amd.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Koenig, Christian <Christian.Koenig@amd.com> =E6=96=BC 2019=E5=B9=B47=E6=9C=
=8816=E6=97=A5=E9=80=B1=E4=BA=8C =E4=B8=8B=E5=8D=889:38=E5=AF=AB=E9=81=93=
=EF=BC=9A
>
> Am 11.07.19 um 05:10 schrieb Fuqian Huang:
> > In function __ttm_dma_alloc_page(), d_page->addr is allocated
> > by dma_alloc_attrs() but freed with use dma_free_coherent() in
> > __ttm_dma_free_page().
> > Use the correct dma_free_attrs() to free d_page->vaddr.
> >
> > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
>
> Reviewed-by: Christian K=C3=B6nig <christian.koenig@amd.com>
>
> How do you want to upstream that? Should I pull it into our tree?

I just came across this misuse case accidentally.
I am not very clear about 'How to upstream that'.
Are there more than one way to upstream the code and fix the problem?

From my side, it is ok that you pull it into your tree and fix it or
fix it in other way.
:) It will be fine if the problem is fixed.

Thanks.

>
> Thanks,
> Christian.
>
> > ---
> >   drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 +++++-
> >   1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm=
/ttm/ttm_page_alloc_dma.c
> > index d594f7520b7b..7d78e6deac89 100644
> > --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> > +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> > @@ -285,9 +285,13 @@ static int ttm_set_pages_caching(struct dma_pool *=
pool,
> >
> >   static void __ttm_dma_free_page(struct dma_pool *pool, struct dma_pag=
e *d_page)
> >   {
> > +     unsigned long attrs =3D 0;
> >       dma_addr_t dma =3D d_page->dma;
> >       d_page->vaddr &=3D ~VADDR_FLAG_HUGE_POOL;
> > -     dma_free_coherent(pool->dev, pool->size, (void *)d_page->vaddr, d=
ma);
> > +     if (pool->type & IS_HUGE)
> > +             attrs =3D DMA_ATTR_NO_WARN;
> > +
> > +     dma_free_attrs(pool->dev, pool->size, (void *)d_page->vaddr, dma,=
 attrs);
> >
> >       kfree(d_page);
> >       d_page =3D NULL;
>