| Message ID | 20201106141003.2535-1-christian.koenig@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ttm: fix missing NULL check in the new page pool | expand |
On Fri, Nov 6, 2020 at 9:10 AM Christian König <ckoenig.leichtzumerken@gmail.com> wrote: > > The pool parameter can be NULL if we free through the shrinker. > > Signed-off-by: Christian König <christian.koenig@amd.com> Does this fix: https://gitlab.freedesktop.org/drm/amd/-/issues/1362 Acked-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/ttm/ttm_pool.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c > index 44ec41aa78d6..1b96780b4989 100644 > --- a/drivers/gpu/drm/ttm/ttm_pool.c > +++ b/drivers/gpu/drm/ttm/ttm_pool.c > @@ -135,7 +135,7 @@ static void ttm_pool_free_page(struct ttm_pool *pool, enum ttm_caching caching, > set_pages_wb(p, 1 << order); > #endif > > - if (!pool->use_dma_alloc) { > + if (!pool || !pool->use_dma_alloc) { > __free_pages(p, order); > return; > } > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 09/11/2020 17:54, Alex Deucher wrote: > On Fri, Nov 6, 2020 at 9:10 AM Christian König > <ckoenig.leichtzumerken@gmail.com> wrote: >> >> The pool parameter can be NULL if we free through the shrinker. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> > > Does this fix: > https://gitlab.freedesktop.org/drm/amd/-/issues/1362 It does! So you can add my: Tested-by: Martin Peres <martin.peres@mupuf.org> Acked-by: Martin Peres <martin.peres@mupuf.org> Thanks, Martin > > Acked-by: Alex Deucher <alexander.deucher@amd.com> > > > >> --- >> drivers/gpu/drm/ttm/ttm_pool.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c >> index 44ec41aa78d6..1b96780b4989 100644 >> --- a/drivers/gpu/drm/ttm/ttm_pool.c >> +++ b/drivers/gpu/drm/ttm/ttm_pool.c >> @@ -135,7 +135,7 @@ static void ttm_pool_free_page(struct ttm_pool *pool, enum ttm_caching caching, >> set_pages_wb(p, 1 << order); >> #endif >> >> - if (!pool->use_dma_alloc) { >> + if (!pool || !pool->use_dma_alloc) { >> __free_pages(p, order); >> return; >> } >> -- >> 2.25.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c index 44ec41aa78d6..1b96780b4989 100644 --- a/drivers/gpu/drm/ttm/ttm_pool.c +++ b/drivers/gpu/drm/ttm/ttm_pool.c @@ -135,7 +135,7 @@ static void ttm_pool_free_page(struct ttm_pool *pool, enum ttm_caching caching, set_pages_wb(p, 1 << order); #endif - if (!pool->use_dma_alloc) { + if (!pool || !pool->use_dma_alloc) { __free_pages(p, order); return; }
The pool parameter can be NULL if we free through the shrinker. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/ttm/ttm_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)