Skip to content

Commit 71336e0

Browse files
Tetsuo Handaairlied
authored andcommitted
drm/ttm: Fix possible stack overflow by recursive shrinker calls.
While ttm_dma_pool_shrink_scan() tries to take mutex before doing GFP_KERNEL allocation, ttm_pool_shrink_scan() does not do it. This can result in stack overflow if kmalloc() in ttm_page_pool_free() triggered recursion due to memory pressure. shrink_slab() => ttm_pool_shrink_scan() => ttm_page_pool_free() => kmalloc(GFP_KERNEL) => shrink_slab() => ttm_pool_shrink_scan() => ttm_page_pool_free() => kmalloc(GFP_KERNEL) Change ttm_pool_shrink_scan() to do like ttm_dma_pool_shrink_scan() does. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: stable <stable@kernel.org> [2.6.35+] Signed-off-by: Dave Airlie <airlied@redhat.com>
1 parent 22e7169 commit 71336e0

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

drivers/gpu/drm/ttm/ttm_page_alloc.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,17 @@ static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free)
391391
static unsigned long
392392
ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
393393
{
394-
static atomic_t start_pool = ATOMIC_INIT(0);
394+
static DEFINE_MUTEX(lock);
395+
static unsigned start_pool;
395396
unsigned i;
396-
unsigned pool_offset = atomic_add_return(1, &start_pool);
397+
unsigned pool_offset;
397398
struct ttm_page_pool *pool;
398399
int shrink_pages = sc->nr_to_scan;
399400
unsigned long freed = 0;
400401

401-
pool_offset = pool_offset % NUM_POOLS;
402+
if (!mutex_trylock(&lock))
403+
return SHRINK_STOP;
404+
pool_offset = ++start_pool % NUM_POOLS;
402405
/* select start pool in round robin fashion */
403406
for (i = 0; i < NUM_POOLS; ++i) {
404407
unsigned nr_free = shrink_pages;
@@ -408,6 +411,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
408411
shrink_pages = ttm_page_pool_free(pool, nr_free);
409412
freed += nr_free - shrink_pages;
410413
}
414+
mutex_unlock(&lock);
411415
return freed;
412416
}
413417

0 commit comments

Comments
 (0)