Skip to content

Commit 9b3de84

Browse files
Qi Zhengopsiff
authored andcommitted
drm/ttm: introduce pool_shrink_rwsem
mainline inclusion from mainline-v6.7-rc1 category: performance Currently, synchronize_shrinkers() is only used by TTM pool. It only requires that no shrinkers run in parallel. After we use RCU+refcount method to implement the lockless slab shrink, we can not use shrinker_rwsem or synchronize_rcu() to guarantee that all shrinker invocations have seen an update before freeing memory. So we introduce a new pool_shrink_rwsem to implement a private ttm_pool_synchronize_shrinkers(), so as to achieve the same purpose. Link: https://lkml.kernel.org/r/20230911092517.64141-5-zhengqi.arch@bytedance.com Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Christian Brauner <brauner@kernel.org> Cc: Chuck Lever <cel@kernel.org> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Darrick J. Wong <djwong@kernel.org> Cc: Dave Chinner <david@fromorbit.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Joel Fernandes <joel@joelfernandes.org> Cc: Kirill Tkhai <tkhai@ya.ru> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Cc: Steven Price <steven.price@arm.com> Cc: Theodore Ts'o <tytso@mit.edu> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Alasdair Kergon <agk@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Cc: Andreas Dilger <adilger.kernel@dilger.ca> Cc: Andreas Gruenbacher <agruenba@redhat.com> Cc: Anna Schumaker <anna@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Bob Peterson <rpeterso@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Carlos Llamas <cmllamas@google.com> Cc: Chandan Babu R <chandan.babu@oracle.com> Cc: Chao Yu <chao@kernel.org> Cc: Chris Mason <clm@fb.com> Cc: Coly Li <colyli@suse.de> Cc: Dai Ngo <Dai.Ngo@oracle.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Airlie <airlied@gmail.com> Cc: David Hildenbrand <david@redhat.com> Cc: David Sterba <dsterba@suse.com> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Gao Xiang <hsiangkao@linux.alibaba.com> Cc: Huang Rui <ray.huang@amd.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Jan Kara <jack@suse.cz> Cc: Jason Wang <jasowang@redhat.com> Cc: Jeff Layton <jlayton@kernel.org> Cc: Jeffle Xu <jefflexu@linux.alibaba.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Josef Bacik <josef@toxicpanda.com> Cc: Juergen Gross <jgross@suse.com> Cc: Kent Overstreet <kent.overstreet@gmail.com> Cc: Marijn Suijten <marijn.suijten@somainline.org> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Mike Snitzer <snitzer@kernel.org> Cc: Minchan Kim <minchan@kernel.org> Cc: Muchun Song <muchun.song@linux.dev> Cc: Nadav Amit <namit@vmware.com> Cc: Neil Brown <neilb@suse.de> Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com> Cc: Olga Kornievskaia <kolga@netapp.com> Cc: Richard Weinberger <richard@nod.at> Cc: Rob Clark <robdclark@gmail.com> Cc: Rob Herring <robh@kernel.org> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Sean Paul <sean@poorly.run> Cc: Song Liu <song@kernel.org> Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com> Cc: Tom Talpey <tom@talpey.com> Cc: Trond Myklebust <trond.myklebust@hammerspace.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com> Cc: Yue Hu <huyue2@coolpad.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> (cherry picked from commit 0b2f5ea) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 4f30d42 commit 9b3de84

3 files changed

Lines changed: 16 additions & 17 deletions

File tree

drivers/gpu/drm/ttm/ttm_pool.c

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static struct ttm_pool_type global_dma32_uncached[NR_PAGE_ORDERS];
7474
static spinlock_t shrinker_lock;
7575
static struct list_head shrinker_list;
7676
static struct shrinker mm_shrinker;
77+
static DECLARE_RWSEM(pool_shrink_rwsem);
7778

7879
/* Allocate pages of size 1 << order with the given gfp_flags */
7980
static struct page *ttm_pool_alloc_page(struct ttm_pool *pool, gfp_t gfp_flags,
@@ -323,6 +324,7 @@ static unsigned int ttm_pool_shrink(void)
323324
unsigned int num_pages;
324325
struct page *p;
325326

327+
down_read(&pool_shrink_rwsem);
326328
spin_lock(&shrinker_lock);
327329
pt = list_first_entry(&shrinker_list, typeof(*pt), shrinker_list);
328330
list_move_tail(&pt->shrinker_list, &shrinker_list);
@@ -335,6 +337,7 @@ static unsigned int ttm_pool_shrink(void)
335337
} else {
336338
num_pages = 0;
337339
}
340+
up_read(&pool_shrink_rwsem);
338341

339342
return num_pages;
340343
}
@@ -584,6 +587,18 @@ void ttm_pool_init(struct ttm_pool *pool, struct device *dev,
584587
}
585588
EXPORT_SYMBOL(ttm_pool_init);
586589

590+
/**
591+
* ttm_pool_synchronize_shrinkers - Wait for all running shrinkers to complete.
592+
*
593+
* This is useful to guarantee that all shrinker invocations have seen an
594+
* update, before freeing memory, similar to rcu.
595+
*/
596+
static void ttm_pool_synchronize_shrinkers(void)
597+
{
598+
down_write(&pool_shrink_rwsem);
599+
up_write(&pool_shrink_rwsem);
600+
}
601+
587602
/**
588603
* ttm_pool_fini - Cleanup a pool
589604
*
@@ -611,7 +626,7 @@ void ttm_pool_fini(struct ttm_pool *pool)
611626
/* We removed the pool types from the LRU, but we need to also make sure
612627
* that no shrinker is concurrently freeing pages from the pool.
613628
*/
614-
synchronize_shrinkers();
629+
ttm_pool_synchronize_shrinkers();
615630
}
616631
EXPORT_SYMBOL(ttm_pool_fini);
617632

include/linux/shrinker.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ extern int __printf(2, 3) register_shrinker(struct shrinker *shrinker,
110110
const char *fmt, ...);
111111
extern void unregister_shrinker(struct shrinker *shrinker);
112112
extern void free_prealloced_shrinker(struct shrinker *shrinker);
113-
extern void synchronize_shrinkers(void);
114113

115114
#ifdef CONFIG_SHRINKER_DEBUG
116115
extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker,

mm/shrinker.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -692,18 +692,3 @@ void unregister_shrinker(struct shrinker *shrinker)
692692
shrinker->nr_deferred = NULL;
693693
}
694694
EXPORT_SYMBOL(unregister_shrinker);
695-
696-
/**
697-
* synchronize_shrinkers - Wait for all running shrinkers to complete.
698-
*
699-
* This is equivalent to calling unregister_shrink() and register_shrinker(),
700-
* but atomically and with less overhead. This is useful to guarantee that all
701-
* shrinker invocations have seen an update, before freeing memory, similar to
702-
* rcu.
703-
*/
704-
void synchronize_shrinkers(void)
705-
{
706-
down_write(&shrinker_rwsem);
707-
up_write(&shrinker_rwsem);
708-
}
709-
EXPORT_SYMBOL(synchronize_shrinkers);

0 commit comments

Comments
 (0)