Commit da0c0251 authored by Kairui Song's avatar Kairui Song Committed by Andrew Morton
Browse files

mm/list_lru: simplify the list_lru walk callback function 

Now isolation no longer takes the list_lru global node lock, only use the
per-cgroup lock instead.  And this lock is inside the list_lru_one being
walked, no longer needed to pass the lock explicitly.

Link: https://lkml.kernel.org/r/20241104175257.60853-7-ryncsn@gmail.com


Signed-off-by: default avatarKairui Song <kasong@tencent.com>
Cc: Chengming Zhou <zhouchengming@bytedance.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Waiman Long <longman@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent fb56fdf8

drivers/android/binder_alloc.c

+3 −4
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ void binder_alloc_vma_close(struct binder_alloc *alloc) 
/**

 * binder_alloc_free_page() - shrinker callback to free pages

 * @item:   item to free

 * @lock:   lock protecting the item

 * @lru:    list_lru instance of the item

 * @cb_arg: callback argument

 *

 * Called from list_lru_walk() in binder_shrink_scan() to free
@@ -1055,9 +1055,8 @@ void binder_alloc_vma_close(struct binder_alloc *alloc) 
 */

enum lru_status binder_alloc_free_page(struct list_head *item,

				       struct list_lru_one *lru,

				       spinlock_t *lock,

				       void *cb_arg)

	__must_hold(lock)

	__must_hold(&lru->lock)

{

	struct binder_lru_page *page = container_of(item, typeof(*page), lru);

	struct binder_alloc *alloc = page->alloc;
@@ -1092,7 +1091,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item, 


	list_lru_isolate(lru, item);

	spin_unlock(&alloc->lock);

	spin_unlock(lock);

	spin_unlock(&lru->lock);



	if (vma) {

		trace_binder_unmap_user_start(alloc, index);

drivers/android/binder_alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static inline void binder_selftest_alloc(struct binder_alloc *alloc) {} 
#endif

enum lru_status binder_alloc_free_page(struct list_head *item,

				       struct list_lru_one *lru,

				       spinlock_t *lock, void *cb_arg);

				       void *cb_arg);

struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc,

					   size_t data_size,

					   size_t offsets_size,

fs/dcache.c

+2 −2
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ void shrink_dentry_list(struct list_head *list) 
}



static enum lru_status dentry_lru_isolate(struct list_head *item,

		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)

		struct list_lru_one *lru, void *arg)

{

	struct list_head *freeable = arg;

	struct dentry	*dentry = container_of(item, struct dentry, d_lru);
@@ -1170,7 +1170,7 @@ long prune_dcache_sb(struct super_block *sb, struct shrink_control *sc) 
}



static enum lru_status dentry_lru_isolate_shrink(struct list_head *item,

		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)

		struct list_lru_one *lru, void *arg)

{

	struct list_head *freeable = arg;

	struct dentry	*dentry = container_of(item, struct dentry, d_lru);

fs/gfs2/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static void gfs2_qd_list_dispose(struct list_head *list) 




static enum lru_status gfs2_qd_isolate(struct list_head *item,

		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)

		struct list_lru_one *lru, void *arg)

{

	struct list_head *dispose = arg;

	struct gfs2_quota_data *qd =

fs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ void invalidate_inodes(struct super_block *sb) 
 * with this flag set because they are the inodes that are out of order.

 */

static enum lru_status inode_lru_isolate(struct list_head *item,

		struct list_lru_one *lru, spinlock_t *lru_lock, void *arg)

		struct list_lru_one *lru, void *arg)

{

	struct list_head *freeable = arg;

	struct inode	*inode = container_of(item, struct inode, i_lru);
@@ -923,7 +923,7 @@ static enum lru_status inode_lru_isolate(struct list_head *item, 
	if (inode_has_buffers(inode) || !mapping_empty(&inode->i_data)) {

		inode_pin_lru_isolating(inode);

		spin_unlock(&inode->i_lock);

		spin_unlock(lru_lock);

		spin_unlock(&lru->lock);

		if (remove_inode_buffers(inode)) {

			unsigned long reap;

			reap = invalidate_mapping_pages(&inode->i_data, 0, -1);