writeback: remove struct bdi_writeback_congested (8c911f3d) · Commits · 戴 / test

block/blk-cgroup.c

+2 −17

Original line number	Diff line number	Diff line
		@@ -95,9 +95,6 @@ static void __blkg_release(struct rcu_head *rcu)
		css_put(&blkg->blkcg->css);
		if (blkg->parent)
		blkg_put(blkg->parent);

		wb_congested_put(blkg->wb_congested);

		blkg_free(blkg);
		}

		@@ -227,7 +224,6 @@ static struct blkcg_gq blkg_create(struct blkcg blkcg,
		struct blkcg_gq *new_blkg)
		{
		struct blkcg_gq *blkg;
		struct bdi_writeback_congested *wb_congested;
		int i, ret;

		WARN_ON_ONCE(!rcu_read_lock_held());
		@@ -245,31 +241,22 @@ static struct blkcg_gq blkg_create(struct blkcg blkcg,
		goto err_free_blkg;
		}

		wb_congested = wb_congested_get_create(q->backing_dev_info,
		blkcg->css.id,
		GFP_NOWAIT \| __GFP_NOWARN);
		if (!wb_congested) {
		ret = -ENOMEM;
		goto err_put_css;
		}

		/* allocate */
		if (!new_blkg) {
		new_blkg = blkg_alloc(blkcg, q, GFP_NOWAIT \| __GFP_NOWARN);
		if (unlikely(!new_blkg)) {
		ret = -ENOMEM;
		goto err_put_congested;
		goto err_put_css;
		}
		}
		blkg = new_blkg;
		blkg->wb_congested = wb_congested;

		/* link parent */
		if (blkcg_parent(blkcg)) {
		blkg->parent = __blkg_lookup(blkcg_parent(blkcg), q, false);
		if (WARN_ON_ONCE(!blkg->parent)) {
		ret = -ENODEV;
		goto err_put_congested;
		goto err_put_css;
		}
		blkg_get(blkg->parent);
		}
		@@ -306,8 +293,6 @@ static struct blkcg_gq blkg_create(struct blkcg blkcg,
		blkg_put(blkg);
		return ERR_PTR(ret);

		err_put_congested:
		wb_congested_put(wb_congested);
		err_put_css:
		css_put(&blkcg->css);
		err_free_blkg:

drivers/md/dm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1834,7 +1834,7 @@ static int dm_any_congested(void *congested_data, int bdi_bits)
		* top-level queue for congestion.
		*/
		struct backing_dev_info *bdi = md->queue->backing_dev_info;
		r = bdi->wb.congested->state & bdi_bits;
		r = bdi->wb.congested & bdi_bits;
		} else {
		map = dm_get_live_table_fast(md);
		if (map)

include/linux/backing-dev-defs.h

+1 −24

Original line number	Diff line number	Diff line
		@@ -87,26 +87,6 @@ struct wb_completion {
		#define DEFINE_WB_COMPLETION(cmpl, bdi) \
		struct wb_completion cmpl = WB_COMPLETION_INIT(bdi)

		/*
		* For cgroup writeback, multiple wb's may map to the same blkcg. Those
		* wb's can operate mostly independently but should share the congested
		* state. To facilitate such sharing, the congested state is tracked using
		* the following struct which is created on demand, indexed by blkcg ID on
		* its bdi, and refcounted.
		*/
		struct bdi_writeback_congested {
		unsigned long state; /* WB_[a]sync_congested flags */
		refcount_t refcnt; /* nr of attached wb's and blkg */

		#ifdef CONFIG_CGROUP_WRITEBACK
		struct backing_dev_info __bdi; / the associated bdi, set to NULL
		* on bdi unregistration. For memcg-wb
		* internal use only! */
		int blkcg_id; /* ID of the associated blkcg */
		struct rb_node rb_node; /* on bdi->cgwb_congestion_tree */
		#endif
		};

		/*
		* Each wb (bdi_writeback) can perform writeback operations, is measured
		* and throttled, independently. Without cgroup writeback, each bdi
		@@ -140,7 +120,7 @@ struct bdi_writeback {

		struct percpu_counter stat[NR_WB_STAT_ITEMS];

		struct bdi_writeback_congested *congested;
		unsigned long congested; /* WB_[a]sync_congested flags */

		unsigned long bw_time_stamp; /* last time write bw is updated */
		unsigned long dirtied_stamp;
		@@ -208,11 +188,8 @@ struct backing_dev_info {
		struct list_head wb_list; /* list of all wbs */
		#ifdef CONFIG_CGROUP_WRITEBACK
		struct radix_tree_root cgwb_tree; /* radix tree of active cgroup wbs */
		struct rb_root cgwb_congested_tree; /* their congested states */
		struct mutex cgwb_release_mutex; /* protect shutdown of wb structs */
		struct rw_semaphore wb_switch_rwsem; /* no cgwb switch while syncing */
		#else
		struct bdi_writeback_congested *wb_congested;
		#endif
		wait_queue_head_t wb_waitq;

include/linux/backing-dev.h

+1 −17

Original line number	Diff line number	Diff line
		@@ -173,7 +173,7 @@ static inline int wb_congested(struct bdi_writeback *wb, int cong_bits)

		if (bdi->congested_fn)
		return bdi->congested_fn(bdi->congested_data, cong_bits);
		return wb->congested->state & cong_bits;
		return wb->congested & cong_bits;
		}

		long congestion_wait(int sync, long timeout);
		@@ -224,9 +224,6 @@ static inline int bdi_sched_wait(void *word)

		#ifdef CONFIG_CGROUP_WRITEBACK

		struct bdi_writeback_congested *
		wb_congested_get_create(struct backing_dev_info *bdi, int blkcg_id, gfp_t gfp);
		void wb_congested_put(struct bdi_writeback_congested *congested);
		struct bdi_writeback wb_get_lookup(struct backing_dev_info bdi,
		struct cgroup_subsys_state *memcg_css);
		struct bdi_writeback wb_get_create(struct backing_dev_info bdi,
		@@ -404,19 +401,6 @@ static inline bool inode_cgwb_enabled(struct inode *inode)
		return false;
		}

		static inline struct bdi_writeback_congested *
		wb_congested_get_create(struct backing_dev_info *bdi, int blkcg_id, gfp_t gfp)
		{
		refcount_inc(&bdi->wb_congested->refcnt);
		return bdi->wb_congested;
		}

		static inline void wb_congested_put(struct bdi_writeback_congested *congested)
		{
		if (refcount_dec_and_test(&congested->refcnt))
		kfree(congested);
		}

		static inline struct bdi_writeback wb_find_current(struct backing_dev_info bdi)
		{
		return &bdi->wb;

include/linux/blk-cgroup.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -109,12 +109,6 @@ struct blkcg_gq {
		struct hlist_node blkcg_node;
		struct blkcg *blkcg;

		/*
		* Each blkg gets congested separately and the congestion state is
		* propagated to the matching bdi_writeback_congested.
		*/
		struct bdi_writeback_congested *wb_congested;

		/* all non-root blkcg_gq's are guaranteed to have access to parent */
		struct blkcg_gq *parent;

Admin message