Commit 17e7a00e authored Sep 11, 2023 by Qi Zheng Committed by Andrew Morton Oct 04, 2023

xfs: dynamically allocate the xfs-buf shrinker

In preparation for implementing lockless slab shrink, use new APIs to
dynamically allocate the xfs-buf shrinker, so that it can be freed
asynchronously via RCU. Then it doesn't need to wait for RCU read-side
critical section when releasing the struct xfs_buftarg.

Link: https://lkml.kernel.org/r/20230911094444.68966-35-zhengqi.arch@bytedance.com


Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
Reviewed-by: Muchun Song <songmuchun@bytedance.com>
Cc: Chandan Babu R <chandan.babu@oracle.com>
Cc: "Darrick J. Wong" <djwong@kernel.org>
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: Chao Yu <chao@kernel.org>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Chuck Lever <cel@kernel.org>
Cc: Coly Li <colyli@suse.de>
Cc: Dai Ngo <Dai.Ngo@oracle.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dave Chinner <david@fromorbit.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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: Joel Fernandes (Google) <joel@joelfernandes.org>
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: Kirill Tkhai <tkhai@ya.ru>
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: Paul E. McKenney <paulmck@kernel.org>
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: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Sean Paul <sean@poorly.run>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Song Liu <song@kernel.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Steven Price <steven.price@arm.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
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: Vlastimil Babka <vbabka@suse.cz>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: Yue Hu <huyue2@coolpad.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 8eea99a8

fs/xfs/xfs_buf.c

+13 −11

Original line number	Diff line number	Diff line
		@@ -1913,8 +1913,7 @@ xfs_buftarg_shrink_scan(
		struct shrinker *shrink,
		struct shrink_control *sc)
		{
		struct xfs_buftarg *btp = container_of(shrink,
		struct xfs_buftarg, bt_shrinker);
		struct xfs_buftarg *btp = shrink->private_data;
		LIST_HEAD(dispose);
		unsigned long freed;

		@@ -1936,8 +1935,7 @@ xfs_buftarg_shrink_count(
		struct shrinker *shrink,
		struct shrink_control *sc)
		{
		struct xfs_buftarg *btp = container_of(shrink,
		struct xfs_buftarg, bt_shrinker);
		struct xfs_buftarg *btp = shrink->private_data;
		return list_lru_shrink_count(&btp->bt_lru, sc);
		}

		@@ -1947,7 +1945,7 @@ xfs_free_buftarg(
		{
		struct block_device *bdev = btp->bt_bdev;

		unregister_shrinker(&btp->bt_shrinker);
		shrinker_free(btp->bt_shrinker);
		ASSERT(percpu_counter_sum(&btp->bt_io_count) == 0);
		percpu_counter_destroy(&btp->bt_io_count);
		list_lru_destroy(&btp->bt_lru);
		@@ -2031,13 +2029,17 @@ xfs_alloc_buftarg(
		if (percpu_counter_init(&btp->bt_io_count, 0, GFP_KERNEL))
		goto error_lru;

		btp->bt_shrinker.count_objects = xfs_buftarg_shrink_count;
		btp->bt_shrinker.scan_objects = xfs_buftarg_shrink_scan;
		btp->bt_shrinker.seeks = DEFAULT_SEEKS;
		btp->bt_shrinker.flags = SHRINKER_NUMA_AWARE;
		if (register_shrinker(&btp->bt_shrinker, "xfs-buf:%s",
		mp->m_super->s_id))
		btp->bt_shrinker = shrinker_alloc(SHRINKER_NUMA_AWARE, "xfs-buf:%s",
		mp->m_super->s_id);
		if (!btp->bt_shrinker)
		goto error_pcpu;

		btp->bt_shrinker->count_objects = xfs_buftarg_shrink_count;
		btp->bt_shrinker->scan_objects = xfs_buftarg_shrink_scan;
		btp->bt_shrinker->private_data = btp;

		shrinker_register(btp->bt_shrinker);

		return btp;

		error_pcpu:

fs/xfs/xfs_buf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ typedef struct xfs_buftarg {
		size_t bt_logical_sectormask;

		/* LRU control structures */
		struct shrinker bt_shrinker;
		struct shrinker *bt_shrinker;
		struct list_lru bt_lru;

		struct percpu_counter bt_io_count;