lkml.org 
[lkml]   [2023]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/48] drm/ttm: dynamically allocate the drm-ttm_pool shrinker
    Date
    Use new APIs to dynamically allocate the drm-ttm_pool shrinker.

    Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
    Reviewed-by: Muchun Song <songmuchun@bytedance.com>
    ---
    drivers/gpu/drm/ttm/ttm_pool.c | 23 +++++++++++++++--------
    1 file changed, 15 insertions(+), 8 deletions(-)

    diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
    index cddb9151d20f..c9c9618c0dce 100644
    --- a/drivers/gpu/drm/ttm/ttm_pool.c
    +++ b/drivers/gpu/drm/ttm/ttm_pool.c
    @@ -73,7 +73,7 @@ static struct ttm_pool_type global_dma32_uncached[MAX_ORDER + 1];

    static spinlock_t shrinker_lock;
    static struct list_head shrinker_list;
    -static struct shrinker mm_shrinker;
    +static struct shrinker *mm_shrinker;

    /* Allocate pages of size 1 << order with the given gfp_flags */
    static struct page *ttm_pool_alloc_page(struct ttm_pool *pool, gfp_t gfp_flags,
    @@ -734,8 +734,8 @@ static int ttm_pool_debugfs_shrink_show(struct seq_file *m, void *data)
    struct shrink_control sc = { .gfp_mask = GFP_NOFS };

    fs_reclaim_acquire(GFP_KERNEL);
    - seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(&mm_shrinker, &sc),
    - ttm_pool_shrinker_scan(&mm_shrinker, &sc));
    + seq_printf(m, "%lu/%lu\n", ttm_pool_shrinker_count(mm_shrinker, &sc),
    + ttm_pool_shrinker_scan(mm_shrinker, &sc));
    fs_reclaim_release(GFP_KERNEL);

    return 0;
    @@ -779,10 +779,17 @@ int ttm_pool_mgr_init(unsigned long num_pages)
    &ttm_pool_debugfs_shrink_fops);
    #endif

    - mm_shrinker.count_objects = ttm_pool_shrinker_count;
    - mm_shrinker.scan_objects = ttm_pool_shrinker_scan;
    - mm_shrinker.seeks = 1;
    - return register_shrinker(&mm_shrinker, "drm-ttm_pool");
    + mm_shrinker = shrinker_alloc(0, "drm-ttm_pool");
    + if (!mm_shrinker)
    + return -ENOMEM;
    +
    + mm_shrinker->count_objects = ttm_pool_shrinker_count;
    + mm_shrinker->scan_objects = ttm_pool_shrinker_scan;
    + mm_shrinker->seeks = 1;
    +
    + shrinker_register(mm_shrinker);
    +
    + return 0;
    }

    /**
    @@ -802,6 +809,6 @@ void ttm_pool_mgr_fini(void)
    ttm_pool_type_fini(&global_dma32_uncached[i]);
    }

    - unregister_shrinker(&mm_shrinker);
    + shrinker_free(mm_shrinker);
    WARN_ON(!list_empty(&shrinker_list));
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-08-07 13:13    [W:2.268 / U:0.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site