Commit b7d680d7 authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

bdi: Mark congested->bdi as internal 



congested->bdi pointer is used only to be able to remove congested
structure from bdi->cgwb_congested_tree on structure release. Moreover
the pointer can become NULL when we unregister the bdi. Rename the field
to __bdi and add a comment to make it more explicit this is internal
stuff of memcg writeback code and people should not use the field as
such use will be likely race prone.

We do not bother with converting congested->bdi to a proper refcounted
reference. It will be slightly ugly to special-case bdi->wb.congested to
avoid effectively a cyclic reference of bdi to itself and the reference
gets cleared from bdi_unregister() making it impossible to reference
a freed bdi.

Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 03e26279

include/linux/backing-dev-defs.h

+3 −1
Original line number Diff line number Diff line
@@ -54,7 +54,9 @@ struct bdi_writeback_congested { 
	atomic_t refcnt;		/* nr of attached wb's and blkg */



#ifdef CONFIG_CGROUP_WRITEBACK

	struct backing_dev_info *bdi;	/* the associated bdi */

	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

mm/backing-dev.c

+5 −5
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ retry: 
		return NULL;



	atomic_set(&new_congested->refcnt, 0);

	new_congested->bdi = bdi;

	new_congested->__bdi = bdi;

	new_congested->blkcg_id = blkcg_id;

	goto retry;
@@ -466,10 +466,10 @@ void wb_congested_put(struct bdi_writeback_congested *congested) 
	}



	/* bdi might already have been destroyed leaving @congested unlinked */

	if (congested->bdi) {

	if (congested->__bdi) {

		rb_erase(&congested->rb_node,

			 &congested->bdi->cgwb_congested_tree);

		congested->bdi = NULL;

			 &congested->__bdi->cgwb_congested_tree);

		congested->__bdi = NULL;

	}



	spin_unlock_irqrestore(&cgwb_lock, flags);
@@ -752,7 +752,7 @@ static void cgwb_bdi_exit(struct backing_dev_info *bdi) 
			rb_entry(rbn, struct bdi_writeback_congested, rb_node);



		rb_erase(rbn, &bdi->cgwb_congested_tree);

		congested->bdi = NULL;	/* mark @congested unlinked */

		congested->__bdi = NULL;	/* mark @congested unlinked */

	}

	spin_unlock_irq(&cgwb_lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE