[AMD Official Use Only - Internal Distribution Only] + Leo ________________________________ From: amd-gfx <[email protected]> on behalf of Christian König <[email protected]> Sent: Friday, March 19, 2021 10:08 AM To: Liu, Leo <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]> Subject: [PATCH] drm/ttm: stop warning on TT shrinker failure
Don't print a warning when we fail to allocate a page for swapping things out. Also rely on memalloc_nofs_save/memalloc_nofs_restore instead of GFP_NOFS. Signed-off-by: Christian König <[email protected]> --- drivers/gpu/drm/ttm/ttm_tt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index 2f0833c98d2c..86fa3e82dacc 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c @@ -369,7 +369,7 @@ static unsigned long ttm_tt_shrinker_scan(struct shrinker *shrink, }; int ret; - ret = ttm_bo_swapout(&ctx, GFP_NOFS); + ret = ttm_bo_swapout(&ctx, GFP_KERNEL | __GFP_NOWARN); return ret < 0 ? SHRINK_EMPTY : ret; } @@ -389,10 +389,13 @@ static unsigned long ttm_tt_shrinker_count(struct shrinker *shrink, static int ttm_tt_debugfs_shrink_show(struct seq_file *m, void *data) { struct shrink_control sc = { .gfp_mask = GFP_KERNEL }; + unsigned int flags; fs_reclaim_acquire(GFP_KERNEL); + flags = memalloc_nofs_save(); seq_printf(m, "%lu/%lu\n", ttm_tt_shrinker_count(&mm_shrinker, &sc), ttm_tt_shrinker_scan(&mm_shrinker, &sc)); + memalloc_nofs_restore(flags); fs_reclaim_release(GFP_KERNEL); return 0; -- 2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Calexander.deucher%40amd.com%7C70aef4974dfe465a06a308d8eae08eb3%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637517597539809703%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=kvyinv9FPakf76dvXF0pzfeCpclxAo3L4Ufkf6%2B6%2FCc%3D&reserved=0
_______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
