cgroup, blkcg: prevent dirty inodes to pin dying memory cgroups
Subsystems (5)
v6 cover cgroup, blkcg: prevent dirty inodes to pin dying memory cgroups
When an inode is getting dirty for the first time it's associated with a wb structure (see __inode_attach_wb()). It can later be switched to another wb (if e.g. some other cgroup is writing a lot of data to the same inode), but otherwise stays attached to the original wb until being reclaimed.
The problem is that the wb structure holds a reference to the original memory and blkcg cgroups. So if an inode has been dirty once and later is actively used in read-only mode, it has a good chance to pin down the original memory and blkcg cgroups forewer. This is often the case with services bringing data for other services, e.g. updating some rpm packages.
In the real life it becomes a problem due to a large size of the memcg structure, which can easily be 1000x larger than an inode. Also a really large number of dying cgroups can raise different scalability issues, e.g. making the memory reclaim costly and less effective.
To solve the problem inodes should be eventually detached from the corresponding writeback structure. It's inefficient to do it after every writeback completion. Instead it can be done whenever the original memory cgroup is offlined and writeback structure is getting killed. Scanning over a (potentially long) list of inodes and detach them from the writeback structure can take quite some time. To avoid scanning all inodes, attached inodes are kept on a new list (b_attached). To make it less noticeable to a user, the scanning and switching is performed from a work context.
Big thanks to Jan Kara, Dennis Zhou and Hillf Danton for their ideas and contribution to this patchset.
v6:
- extended and reused wbs switching functionality to switch inodes on cgwb cleanup
- fixed offline_list handling
- switched to the unbound_wq
- other minor fixes
v5:
- switch inodes to bdi->wb instead of zeroing inode->i_wb
- split the single patch into two
- only cgwbs maintain lists of attached inodes
- added cond_resched()
- fixed !CONFIG_CGROUP_WRITEBACK handling
- extended list of prohibited inodes flag
- other small fixes
Roman Gushchin (5):
writeback, cgroup: switch to rcu_work API in inode_switch_wbs() writeback, cgroup: keep list of inodes attached to bdi_writeback writeback, cgroup: split out the functional part of
inode_switch_wbs_work_fn()
writeback, cgroup: support switching multiple inodes at once writeback, cgroup: release dying cgwbs by switching attached inodes
fs/fs-writeback.c | 201 ++++++++++++++++++++++--------- include/linux/backing-dev-defs.h | 2 + include/linux/writeback.h | 1 + mm/backing-dev.c | 60 ++++++++- 4 files changed, 204 insertions(+), 60 deletions(-)
Signature · 1 line
2.31.1
PATCH v6 1/5 writeback, cgroup: switch to rcu_work API in inode_switch_wbs()
Inode's wb switching requires two steps divided by an RCU grace period. It's currently implemented as an RCU callback inode_switch_wbs_rcu_fn(), which schedules inode_switch_wbs_work_fn() as a work.
Switching to the rcu_work API allows to do the same in a cleaner and slightly shorter form.
--- fs/fs-writeback.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
fs/fs-writeback.c +4 -14
@@ -335,8 +335,7 @@ struct inode_switch_wbs_context {struct inode *inode;struct bdi_writeback *new_wb; -struct rcu_head rcu_head; -struct work_struct work; +struct rcu_work work; };static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi)
@@ -352,7 +351,7 @@ static void bdi_up_write_wb_switch_rwsem(struct backing_dev_info *bdi)static void inode_switch_wbs_work_fn (struct work_struct *work) {struct inode_switch_wbs_context *isw = - container_of(work, struct inode_switch_wbs_context, work); + container_of(to_rcu_work(work), struct inode_switch_wbs_context, work);struct inode *inode = isw->inode;struct backing_dev_info *bdi =inode_to_bdi (inode);struct address_space *mapping = inode->i_mapping;
@@ -469,16 +468,6 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)atomic_dec (&isw_nr_in_flight); } -static void inode_switch_wbs_rcu_fn (struct rcu_head *rcu_head) -{ -struct inode_switch_wbs_context *isw =container_of (rcu_head, - struct inode_switch_wbs_context, rcu_head); - -/* needs to grab bh-unsafe locks, bounce to work item */ -INIT_WORK (&isw->work, inode_switch_wbs_work_fn); -queue_work (isw_wq, &isw->work); -} -/** * inode_switch_wbs - change the wb association of an inode * @inode: target inode
@@ -534,7 +523,8 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)* lock so that stat transfer can synchronize against them. * Let's continue after I_WB_SWITCH is guaranteed to be visible. */ -call_rcu (&isw->rcu_head, inode_switch_wbs_rcu_fn); +INIT_RCU_WORK (&isw->work, inode_switch_wbs_work_fn); +queue_rcu_work (isw_wq, &isw->work);atomic_inc (&isw_nr_in_flight);return ;
Signature · 1 line
2.31.1
Re: [PATCH v6 1/5] writeback, cgroup: switch to rcu_work API in inode_switch_wbs()
Quoted 9 lines · Roman Gushchin
Inode's wb switching requires two steps divided by an RCU grace period. It's currently implemented as an RCU callback
inode_switch_wbs_rcu_fn(), which schedulesinode_switch_wbs_work_fn()as a work.Switching to the
rcu_workAPI allows to do the same in a cleaner and slightly shorter form.Signed-off-by Roman Gushchin <[email protected]>
Looks good to me. You can add:
Honza
Quoted 57 lines
--- fs/fs-writeback.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)fs/fs-writeback.c +4
-14@@ -335,8 +335,7 @@ struct inode_switch_wbs_context {struct inode *inode;struct bdi_writeback *new_wb; -struct rcu_head rcu_head; -struct work_struct work; +struct rcu_work work; };static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi)@@ -352,7 +351,7 @@ static void bdi_up_write_wb_switch_rwsem(struct backing_dev_info *bdi)static void inode_switch_wbs_work_fn (struct work_struct *work) {struct inode_switch_wbs_context *isw = - container_of(work, struct inode_switch_wbs_context, work); + container_of(to_rcu_work(work), struct inode_switch_wbs_context, work);struct inode *inode = isw->inode;struct backing_dev_info *bdi =inode_to_bdi (inode);struct address_space *mapping = inode->i_mapping;@@ -469,16 +468,6 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)atomic_dec (&isw_nr_in_flight); } -static void inode_switch_wbs_rcu_fn (struct rcu_head *rcu_head) -{ -struct inode_switch_wbs_context *isw =container_of (rcu_head, - struct inode_switch_wbs_context, rcu_head); - -/* needs to grab bh-unsafe locks, bounce to work item */ -INIT_WORK (&isw->work, inode_switch_wbs_work_fn); -queue_work (isw_wq, &isw->work); -} -/** * inode_switch_wbs - change the wb association of an inode * @inode: target inode @@ -534,7 +523,8 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)* lock so that stat transfer can synchronize against them. * Let's continue after I_WB_SWITCH is guaranteed to be visible. */ -call_rcu (&isw->rcu_head, inode_switch_wbs_rcu_fn); +INIT_RCU_WORK (&isw->work, inode_switch_wbs_work_fn); +queue_rcu_work (isw_wq, &isw->work);atomic_inc (&isw_nr_in_flight);return ;Signature · 1 line
2.31.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v6 2/5 writeback, cgroup: keep list of inodes attached to bdi_writeback
In reply to Roman GushchinCurrently there is no way to iterate over inodes attached to a specific cgwb structure. It limits the ability to efficiently reclaim the writeback structure itself and associated memory and block cgroup structures without scanning all inodes belonging to a sb, which can be prohibitively expensive.
While dirty/in-active-writeback an inode belongs to one of the bdi_writeback's io lists: b_dirty, b_io, b_more_io and b_dirty_time. Once cleaned up, it's removed from all io lists. So the inode->i_io_list can be reused to maintain the list of inodes, attached to a bdi_writeback structure.
This patch introduces a new wb->b_attached list, which contains all inodes which were dirty at least once and are attached to the given cgwb. Inodes attached to the root bdi_writeback structures are never placed on such list. The following patch will use this list to try to release cgwbs structures more efficiently.
--- fs/fs-writeback.c | 88 ++++++++++++++++++++------------ include/linux/backing-dev-defs.h | 1 + mm/backing-dev.c | 2 + 3 files changed, 57 insertions(+), 34 deletions(-)
fs/fs-writeback.c +54 -34
@@ -131,25 +131,6 @@ static bool inode_io_list_move_locked(struct inode *inode,return false; } -/** -* inode_io_list_del_locked - remove an inode from its bdi_writeback IO list -* @inode: inode to be removed -* @wb: bdi_writeback @inode is being removed from -* -* Remove @inode which may be on one of @wb->b_{dirty|io|more_io} lists and -* clear %WB_has_dirty_io if all are empty afterwards. -*/ -static void inode_io_list_del_locked (struct inode *inode, -struct bdi_writeback *wb) -{ -assert_spin_locked (&wb->list_lock); -assert_spin_locked (&inode->i_lock); - - inode->i_state &= ~I_SYNC_QUEUED ; -list_del_init (&inode->i_io_list); -wb_io_lists_depopulated (wb); -} -static void wb_wakeup (struct bdi_writeback *wb) {spin_lock_bh (&wb->work_lock);
@@ -278,6 +259,28 @@ void __inode_attach_wb(struct inode *inode, struct page *page) }EXPORT_SYMBOL_GPL (__inode_attach_wb); +/** +* inode_cgwb_move_to_attached - put the inode onto wb->b_attached list +* @inode: inode of interest with i_lock held +* @wb: target bdi_writeback +* +* Remove the inode from wb's io lists and if necessarily put onto b_attached +* list. Only inodes attached to cgwb's are kept on this list. +*/ +static void inode_cgwb_move_to_attached (struct inode *inode, +struct bdi_writeback *wb) +{ +assert_spin_locked (&wb->list_lock); +assert_spin_locked (&inode->i_lock); + + inode->i_state &= ~I_SYNC_QUEUED ; +if (wb != &wb->bdi->wb) +list_move (&inode->i_io_list, &wb->b_attached); +else +list_del_init (&inode->i_io_list); +wb_io_lists_depopulated (wb); +} +/** * locked_inode_to_wb_and_lock_list - determine a locked inode's wb and lock it * @inode: inode of interest with i_lock held
@@ -418,21 +421,28 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)wb_get (new_wb);/* -* Transfer to @new_wb's IO list if necessary. The specific list -* @inode was on is ignored and the inode is put on ->b_dirty which -* is always correct including from ->b_dirty_time. The transfer -* preserves @inode->dirtied_when ordering. +* Transfer to @new_wb's IO list if necessary. If the @inode is dirty, +* the specific list @inode was on is ignored and the @inode is put on +* ->b_dirty which is always correct including from ->b_dirty_time. +* The transfer preserves @inode->dirtied_when ordering. If the @inode +* was clean, it means it was on the b_attached list, so move it onto +* the b_attached list of @new_wb. */ if (!list_empty (&inode->i_io_list)) { -struct inode *pos; - -inode_io_list_del_locked (inode, old_wb); inode->i_wb = new_wb; -list_for_each_entry (pos, &new_wb->b_dirty, i_io_list) -if (time_after_eq (inode->dirtied_when, - pos->dirtied_when)) -break ; -inode_io_list_move_locked (inode, new_wb, pos->i_io_list.prev); + +if (inode->i_state &I_DIRTY_ALL ) { +struct inode *pos; + +list_for_each_entry (pos, &new_wb->b_dirty, i_io_list) +if (time_after_eq (inode->dirtied_when, + pos->dirtied_when)) +break ; +inode_io_list_move_locked (inode, new_wb, + pos->i_io_list.prev); + }else { +inode_cgwb_move_to_attached (inode, new_wb); + } }else { inode->i_wb = new_wb; }
@@ -1014,6 +1024,12 @@ fs_initcall(cgroup_writeback_init);static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi) { }static void bdi_up_write_wb_switch_rwsem (struct backing_dev_info *bdi) { } +static void inode_cgwb_move_to_attached (struct inode *inode, +struct bdi_writeback *wb) +{ +list_del_init (&inode->i_io_list); +} +static struct bdi_writeback *locked_inode_to_wb_and_lock_list (struct inode *inode) __releases(&inode->i_lock)
@@ -1114,7 +1130,11 @@ void inode_io_list_del(struct inode *inode) wb =inode_to_wb_and_lock_list (inode);spin_lock (&inode->i_lock); -inode_io_list_del_locked (inode, wb); + + inode->i_state &= ~I_SYNC_QUEUED ; +list_del_init (&inode->i_io_list); +wb_io_lists_depopulated (wb); +spin_unlock (&inode->i_lock);spin_unlock (&wb->list_lock); }
@@ -1427,7 +1447,7 @@ static void requeue_inode(struct inode *inode, struct bdi_writeback *wb, inode->i_state &= ~I_SYNC_QUEUED ; }else {/* The inode is clean. Remove from writeback lists. */ -inode_io_list_del_locked (inode, wb); +inode_cgwb_move_to_attached (inode, wb); } }
@@ -1579,7 +1599,7 @@ static int writeback_single_inode(struct inode *inode,* responsible for the writeback lists. */ if (!(inode->i_state &I_DIRTY_ALL )) -inode_io_list_del_locked (inode, wb); +inode_cgwb_move_to_attached (inode, wb);spin_unlock (&wb->list_lock);inode_sync_complete (inode); out:
include/linux/backing-dev-defs.h +1 -0
@@ -154,6 +154,7 @@ struct bdi_writeback {struct cgroup_subsys_state *blkcg_css;/* and blkcg */ struct list_head memcg_node;/* anchored at memcg->cgwb_list */ struct list_head blkcg_node;/* anchored at blkcg->cgwb_list */ +struct list_head b_attached;/* attached inodes, protected by list_lock */ union {struct work_struct release_work;
mm/backing-dev.c +2 -0
@@ -396,6 +396,7 @@ static void cgwb_release_workfn(struct work_struct *work)fprop_local_destroy_percpu (&wb->memcg_completions);percpu_ref_exit (&wb->refcnt);wb_exit (wb); +WARN_ON_ONCE (!list_empty (&wb->b_attached));kfree_rcu (wb, rcu); }
@@ -472,6 +473,7 @@ static int cgwb_create(struct backing_dev_info *bdi, wb->memcg_css = memcg_css; wb->blkcg_css = blkcg_css; +INIT_LIST_HEAD (&wb->b_attached);INIT_WORK (&wb->release_work, cgwb_release_workfn);set_bit (WB_registered, &wb->state);
Signature · 1 line
2.31.1
Re: [PATCH v6 2/5] writeback, cgroup: keep list of inodes attached to bdi_writeback
Quoted 12 lines · Roman Gushchin
Currently there is no way to iterate over inodes attached to a specific cgwb structure. It limits the ability to efficiently reclaim the writeback structure itself and associated memory and block cgroup structures without scanning all inodes belonging to a sb, which can be prohibitively expensive.
While dirty/in-active-writeback an inode belongs to one of the bdi_writeback's io lists:
b_dirty,b_io,b_more_ioandb_dirty_time. Once cleaned up, it's removed from all io lists. So theinode->i_io_listcan be reused to maintain the list of inodes, attached to abdi_writebackstructure.
Quoted 8 lines
This patch introduces a new
wb->b_attachedlist, which contains all inodes which were dirty at least once and are attached to the given cgwb. Inodes attached to the rootbdi_writebackstructures are never placed on such list. The following patch will use this list to try to release cgwbs structures more efficiently.Suggested-by Jan Kara <[email protected]>Signed-off-by Roman Gushchin <[email protected]>
Looks good, just one small comment below, with that fixed feel free to add:
...
fs/fs-writeback.c fs_initcall(cgroup_writeback_init); · line 1032
Quoted 10 lines
fs/fs-writeback.c +6
-0@@ -1014,6 +1024,12 @@ fs_initcall(cgroup_writeback_init);static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi) { }static void bdi_up_write_wb_switch_rwsem (struct backing_dev_info *bdi) { } +static void inode_cgwb_move_to_attached (struct inode *inode, +struct bdi_writeback *wb) +{ +list_del_init (&inode->i_io_list); +} +
I think you miss clearing of I_SYNC_QUEUED here. Also you could add here the lock assertions that are in the other version of inode_cgwb_move_to_attached().
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v6 3/5 writeback, cgroup: split out the functional part of inode_switch_wbs_work_fn()
In reply to Roman GushchinSplit out the functional part of the inode_switch_wbs_work_fn() function as inode_do switch_wbs() to reuse it later for switching inodes attached to dying cgwbs.
This commit doesn't bring any functional changes.
--- fs/fs-writeback.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/fs-writeback.c +11 -8
@@ -351,15 +351,12 @@ static void bdi_up_write_wb_switch_rwsem(struct backing_dev_info *bdi)up_write (&bdi->wb_switch_rwsem); } -static void inode_switch_wbs_work_fn (struct work_struct *work) +static void inode_do_switch_wbs (struct inode *inode, +struct bdi_writeback *new_wb) { -struct inode_switch_wbs_context *isw = - container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); -struct inode *inode = isw->inode;struct backing_dev_info *bdi =inode_to_bdi (inode);struct address_space *mapping = inode->i_mapping;struct bdi_writeback *old_wb = inode->i_wb; -struct bdi_writeback *new_wb = isw->new_wb;XA_STATE (xas, &mapping->i_pages,0 );struct page *page;bool switched = false;
@@ -470,11 +467,17 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)wb_wakeup (new_wb);wb_put (old_wb); } -wb_put (new_wb); +} -iput (inode); -kfree (isw); +static void inode_switch_wbs_work_fn (struct work_struct *work) +{ +struct inode_switch_wbs_context *isw = + container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); +inode_do_switch_wbs (isw->inode, isw->new_wb); +wb_put (isw->new_wb); +iput (isw->inode); +kfree (isw);atomic_dec (&isw_nr_in_flight); }
Signature · 1 line
2.31.1
Re: [PATCH v6 3/5] writeback, cgroup: split out the functional part of inode_switch_wbs_work_fn()
Quoted 2 lines · Roman Gushchin
Split out the functional part of the
inode_switch_wbs_work_fn()function asinode_doswitch_wbs()to reuse it later for switching
^ underscore here
Quoted 5 lines
inodes attached to dying cgwbs.
This commit doesn't bring any functional changes.
Signed-off-by Roman Gushchin <[email protected]>
The patch looks good. Feel free to add:
Honza
Quoted 50 lines
--- fs/fs-writeback.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)fs/fs-writeback.c +11
-8@@ -351,15 +351,12 @@ static void bdi_up_write_wb_switch_rwsem(struct backing_dev_info *bdi)up_write (&bdi->wb_switch_rwsem); } -static void inode_switch_wbs_work_fn (struct work_struct *work) +static void inode_do_switch_wbs (struct inode *inode, +struct bdi_writeback *new_wb) { -struct inode_switch_wbs_context *isw = - container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); -struct inode *inode = isw->inode;struct backing_dev_info *bdi =inode_to_bdi (inode);struct address_space *mapping = inode->i_mapping;struct bdi_writeback *old_wb = inode->i_wb; -struct bdi_writeback *new_wb = isw->new_wb;XA_STATE (xas, &mapping->i_pages,0 );struct page *page;bool switched = false;@@ -470,11 +467,17 @@ static void inode_switch_wbs_work_fn(struct work_struct *work)wb_wakeup (new_wb);wb_put (old_wb); } -wb_put (new_wb); +} -iput (inode); -kfree (isw); +static void inode_switch_wbs_work_fn (struct work_struct *work) +{ +struct inode_switch_wbs_context *isw = + container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); +inode_do_switch_wbs (isw->inode, isw->new_wb); +wb_put (isw->new_wb); +iput (isw->inode); +kfree (isw);atomic_dec (&isw_nr_in_flight); }Signature · 1 line
2.31.1
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
PATCH v6 4/5 writeback, cgroup: support switching multiple inodes at once
In reply to Roman GushchinCurrently only a single inode can be switched to another writeback structure at once. That means to switch an inode a separate inode_switch_wbs_context structure must be allocated, and a separate rcu callback and work must be scheduled.
It's fine for the existing ad-hoc switching, which is not happening that often, but sub-optimal for massive switching required in order to release a writeback structure. To prepare for it, let's add a support for switching multiple inodes at once.
Instead of containing a single inode pointer, inode_switch_wbs_context will contain a NULL-terminated array of inode
pointers. inode_do_switch_wbs() will be called for each inode.
--- fs/fs-writeback.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
fs/fs-writeback.c +11 -7
@@ -335,10 +335,10 @@ static struct bdi_writeback *inode_to_wb_and_lock_list(struct inode *inode) }struct inode_switch_wbs_context { -struct inode *inode; -struct bdi_writeback *new_wb; -struct rcu_work work; + +struct bdi_writeback *new_wb; +struct inode *inodes[]; };static void bdi_down_write_wb_switch_rwsem (struct backing_dev_info *bdi)
@@ -473,10 +473,14 @@ static void inode_switch_wbs_work_fn(struct work_struct *work) {struct inode_switch_wbs_context *isw = container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); +struct inode **inodep; + +for (inodep = &isw->inodes[0 ]; *inodep; inodep++) { +inode_do_switch_wbs (*inodep, isw->new_wb); +iput (*inodep); + } -inode_do_switch_wbs (isw->inode, isw->new_wb);wb_put (isw->new_wb); -iput (isw->inode);kfree (isw);atomic_dec (&isw_nr_in_flight); }
@@ -503,7 +507,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (atomic_read (&isw_nr_in_flight) >WB_FRN_MAX_IN_FLIGHT )return ; - isw =kzalloc (sizeof (*isw),GFP_ATOMIC ); + isw =kzalloc (sizeof (*isw) +2 *sizeof (struct inode *),GFP_ATOMIC );if (!isw)return ;
@@ -528,7 +532,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)__iget (inode);spin_unlock (&inode->i_lock); - isw->inode = inode; + isw->inodes[0 ] = inode;/* * In addition to synchronizing among switchers, I_WB_SWITCH tells
Signature · 1 line
2.31.1
Jan Kara
maintainerRe: [PATCH v6 4/5] writeback, cgroup: support switching multiple inodes at once
Quoted 10 lines · Roman Gushchin
Currently only a single inode can be switched to another writeback structure at once. That means to switch an inode a separate
inode_switch_wbs_contextstructure must be allocated, and a separate rcu callback and work must be scheduled.It's fine for the existing ad-hoc switching, which is not happening that often, but sub-optimal for massive switching required in order to release a writeback structure. To prepare for it, let's add a support for switching multiple inodes at once.
Quoted 5 lines
Instead of containing a single inode pointer,
inode_switch_wbs_contextwill contain a NULL-terminated array of inode
pointers.inode_do_switch_wbs()will be called for each inode.Signed-off-by Roman Gushchin <[email protected]>
Two small comments below:
fs/fs-writeback.c static void inode_switch_wbs_work_fn(struct work_struct *work) · line 478
Quoted 7 lines
fs/fs-writeback.c +3
-0@@ -473,10 +473,14 @@ static void inode_switch_wbs_work_fn(struct work_struct *work) {struct inode_switch_wbs_context *isw = container_of(to_rcu_work(work), struct inode_switch_wbs_context, work); +struct inode **inodep; + +for (inodep = &isw->inodes[0 ]; *inodep; inodep++) {
^^^^ why not just isw->inodes?
fs/fs-writeback.c static void inode_switch_wbs_work_fn(struct work_struct *work) · line 481
Quoted 3 lines
fs/fs-writeback.c +3
-0+inode_do_switch_wbs (*inodep, isw->new_wb); +iput (*inodep); + }
I was kind of hoping that we would save the repeated locking of bdi->wb_switch_rwsem, old_wb->list_lock, and new_wb->list_lock for multiple inodes. Maybe we can have 'old_wb' as part of isw as well and assert that all inodes are still attached to the old_wb at this point to make this a bit simpler. Or we can fetch old_wb from the first inode and then just lock & assert using that one.
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v6 5/5 writeback, cgroup: release dying cgwbs by switching attached inodes
In reply to Roman GushchinAsynchronously try to release dying cgwbs by switching attached inodes to the bdi's wb. It helps to get rid of per-cgroup writeback structures themselves and of pinned memory and block cgroups, which are significantly larger structures (mostly due to large per-cpu statistics data). This prevents memory waste and helps to avoid different scalability problems caused by large piles of dying cgroups.
Reuse the existing mechanism of inode switching used for foreign inode detection. To speed things up batch up to 115 inode switching in a single operation (the maximum number is selected so that the resulting struct inode_switch_wbs_context can fit into 1024 bytes). Because every switching consists of two steps divided by an RCU grace period, it would be too slow without batching. Please note that the whole batch counts as a single operation (when increasing/decreasing isw_nr_in_flight). This allows to keep umounting working (flush the switching queue), however prevents cleanups from consuming the whole switching quota and effectively blocking the frn switching.
A cgwb cleanup operation can fail due to different reasons (e.g. not enough memory, the cgwb has an in-flight/pending io, an attached inode in a wrong state, etc). In this case the next scheduled cleanup will make a new attempt. An attempt is made each time a new cgwb is offlined (in other words a memcg and/or a blkcg is deleted by a user). In the future an additional attempt scheduled by a timer can be implemented.
--- fs/fs-writeback.c | 68 ++++++++++++++++++++++++++++++++ include/linux/backing-dev-defs.h | 1 + include/linux/writeback.h | 1 + mm/backing-dev.c | 58 ++++++++++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)
fs/fs-writeback.c +68 -0
@@ -225,6 +225,8 @@ void wb_wait_for_completion(struct wb_completion *done)/* one round can affect upto 5 slots */ #define WB_FRN_MAX_IN_FLIGHT 1024/* don't queue too many concurrently */ +#define WB_MAX_INODES_PER_ISW 116/* maximum inodes per isw */ +static atomic_t isw_nr_in_flight =ATOMIC_INIT (0 );static struct workqueue_struct *isw_wq;
@@ -552,6 +554,72 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)kfree (isw); } +/** +* cleanup_offline_cgwb - detach associated inodes +* @wb: target wb +* +* Switch all inodes attached to @wb to the bdi's root wb in order to eventually +* release the dying @wb. Returns %true if not all inodes were switched and +* the function has to be restarted. +*/ +bool cleanup_offline_cgwb (struct bdi_writeback *wb) +{ +struct inode_switch_wbs_context *isw; +struct inode *inode; +int nr; +bool restart = false; + + isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * +sizeof (struct inode *),GFP_KERNEL ); +if (!isw) +return restart; + +/* no need to call wb_get() here: bdi's root wb is not refcounted */ + isw->new_wb = &wb->bdi->wb; + + nr =0 ; +spin_lock (&wb->list_lock); +list_for_each_entry (inode, &wb->b_attached, i_io_list) { +spin_lock (&inode->i_lock); +if (!(inode->i_sb->s_flags &SB_ACTIVE ) || + inode->i_state & (I_WB_SWITCH |I_FREEING ) || +inode_to_wb (inode) == isw->new_wb) { +spin_unlock (&inode->i_lock); +continue ; + } + inode->i_state |=I_WB_SWITCH ; +__iget (inode); +spin_unlock (&inode->i_lock); + + isw->inodes[nr++] = inode; + +if (nr >=WB_MAX_INODES_PER_ISW -1 ) { + restart = true; +break ; + } + } +spin_unlock (&wb->list_lock); + +/* no attached inodes? bail out */ +if (nr ==0 ) { +kfree (isw); +return restart; + } + +/* +* In addition to synchronizing among switchers, I_WB_SWITCH tells +* the RCU protected stat update paths to grab the i_page +* lock so that stat transfer can synchronize against them. +* Let's continue after I_WB_SWITCH is guaranteed to be visible. +*/ +INIT_RCU_WORK (&isw->work, inode_switch_wbs_work_fn); +queue_rcu_work (isw_wq, &isw->work); + +atomic_inc (&isw_nr_in_flight); + +return restart; +} +/** * wbc_attach_and_unlock_inode - associate wbc with target inode and unlock it * @wbc: writeback_control of interest
include/linux/backing-dev-defs.h +1 -0
@@ -155,6 +155,7 @@ struct bdi_writeback {struct list_head memcg_node;/* anchored at memcg->cgwb_list */ struct list_head blkcg_node;/* anchored at blkcg->cgwb_list */ struct list_head b_attached;/* attached inodes, protected by list_lock */ +struct list_head offline_node;/* anchored at offline_cgwbs */ union {struct work_struct release_work;
include/linux/writeback.h +1 -0
@@ -221,6 +221,7 @@ void wbc_account_cgroup_owner(struct writeback_control *wbc, struct page *page,int cgroup_writeback_by_id (u64 bdi_id,int memcg_id,unsigned long nr_pages,enum wb_reason reason,struct wb_completion *done);void cgroup_writeback_umount (void ); +bool cleanup_offline_cgwb (struct bdi_writeback *wb);/** * inode_attach_wb - associate an inode with its wb
mm/backing-dev.c +56 -2
92 lines not on this page · raw message
Signature · 1 line
2.31.1
Jan Kara
maintainerRe: [PATCH v6 5/5] writeback, cgroup: release dying cgwbs by switching attached inodes
Quoted 18 lines · Roman Gushchin
Asynchronously try to release dying cgwbs by switching attached inodes to the bdi's wb. It helps to get rid of per-cgroup writeback structures themselves and of pinned memory and block cgroups, which are significantly larger structures (mostly due to large per-cpu statistics data). This prevents memory waste and helps to avoid different scalability problems caused by large piles of dying cgroups.
Reuse the existing mechanism of inode switching used for foreign inode detection. To speed things up batch up to 115 inode switching in a single operation (the maximum number is selected so that the resulting struct
inode_switch_wbs_contextcan fit into 1024 bytes). Because every switching consists of two steps divided by an RCU grace period, it would be too slow without batching. Please note that the whole batch counts as a single operation (when increasing/decreasingisw_nr_in_flight). This allows to keep umounting working (flush the switching queue), however prevents cleanups from consuming the whole switching quota and effectively blocking the frn switching.
Quoted 8 lines
A cgwb cleanup operation can fail due to different reasons (e.g. not enough memory, the cgwb has an in-flight/pending io, an attached inode in a wrong state, etc). In this case the next scheduled cleanup will make a new attempt. An attempt is made each time a new cgwb is offlined (in other words a memcg and/or a blkcg is deleted by a user). In the future an additional attempt scheduled by a timer can be implemented.
Signed-off-by Roman Gushchin <[email protected]>
I think we are getting close :). Some comments are below.
Quoted 12 lines
--- fs/fs-writeback.c | 68 ++++++++++++++++++++++++++++++++ include/linux/backing-dev-defs.h | 1 + include/linux/writeback.h | 1 + mm/backing-dev.c | 58 ++++++++++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)fs/fs-writeback.c +0
-0
fs/fs-writeback.c void wb_wait_for_completion(struct wb_completion *done) · line 229
Quoted 5 lines
fs/fs-writeback.c +2
-0@@ -225,6 +225,8 @@ void wb_wait_for_completion(struct wb_completion *done)/* one round can affect upto 5 slots */ #define WB_FRN_MAX_IN_FLIGHT 1024/* don't queue too many concurrently */ +#define WB_MAX_INODES_PER_ISW 116/* maximum inodes per isw */ +
Why this number? Please add an explanation here...
Quoted 33 lines
fs/fs-writeback.c +26
-0static atomic_t isw_nr_in_flight =ATOMIC_INIT (0 );static struct workqueue_struct *isw_wq;@@ -552,6 +554,72 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)kfree (isw); } +/** +* cleanup_offline_cgwb - detach associated inodes +* @wb: target wb +* +* Switch all inodes attached to @wb to the bdi's root wb in order to eventually +* release the dying @wb. Returns %true if not all inodes were switched and +* the function has to be restarted. +*/ +bool cleanup_offline_cgwb (struct bdi_writeback *wb) +{ +struct inode_switch_wbs_context *isw; +struct inode *inode; +int nr; +bool restart = false; + + isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * +sizeof (struct inode *),GFP_KERNEL ); +if (!isw) +return restart; + +/* no need to call wb_get() here: bdi's root wb is not refcounted */ + isw->new_wb = &wb->bdi->wb; + + nr =0 ; +spin_lock (&wb->list_lock); +list_for_each_entry (inode, &wb->b_attached, i_io_list) {
fs/fs-writeback.c static void inode_switch_wbs(struct inode *inode, int new_wb_id) · line 592
Quoted 10 lines
fs/fs-writeback.c +10
-0+spin_lock (&inode->i_lock); +if (!(inode->i_sb->s_flags &SB_ACTIVE ) || + inode->i_state & (I_WB_SWITCH |I_FREEING ) || +inode_to_wb (inode) == isw->new_wb) { +spin_unlock (&inode->i_lock); +continue ; + } + inode->i_state |=I_WB_SWITCH ; +__iget (inode); +spin_unlock (&inode->i_lock);
This hunk is identical with the one in inode_switch_wbs(). Maybe create a helper for it like inode_prepare_wb_switch() or something like that. Also we need to check for I_WILL_FREE flag as well as I_FREEING (see the code in iput_final()) - that's actually a bug in inode_switch_wbs() as well so probably a separate fix for that should come earlier in the series.
fs/fs-writeback.c static void inode_switch_wbs(struct inode *inode, int new_wb_id) · line 594
Quoted 2 lines
fs/fs-writeback.c +2
-0+ + isw->inodes[nr++] = inode;
At first it seemed a bit silly to allocate an array of inode pointers when we have them in the list. But after some thought I agree that dealing with other switching being triggered from other sources in parallel would be really difficult so your decision makes sense. Just maybe add an explanation in a comment somewhere about this design decision.
Quoted 7 lines
fs/fs-writeback.c +7
-0+ +if (nr >=WB_MAX_INODES_PER_ISW -1 ) { + restart = true; +break ; + } + } +spin_unlock (&wb->list_lock);
...
Quoted 4 lines
fs/fs-writeback.c +4
-0+static void cleanup_offline_cgwbs_workfn (struct work_struct *work) +{ +struct bdi_writeback *wb; +LIST_HEAD (processed);
fs/fs-writeback.c
Quoted 10 lines
fs/fs-writeback.c +10
-0+ +spin_lock_irq (&cgwb_lock); + +while (!list_empty (&offline_cgwbs)) { + wb = list_first_entry(&offline_cgwbs, struct bdi_writeback, + offline_node); +list_move (&wb->offline_node, &processed); + +if (wb_has_dirty_io (wb)) +continue ;
Maybe explain in a comment why skipping wbs with dirty inodes is fine? Because honestly, I'm not sure... I guess the rationale is that inodes should get cleaned eventually and if they are getting redirtied, they will be switched to another wb anyway?
Quoted 8 lines
fs/fs-writeback.c +8
-0+ +if (!wb_tryget (wb)) +continue ; + +spin_unlock_irq (&cgwb_lock); +while ((cleanup_offline_cgwb (wb))) +cond_resched (); +spin_lock_irq (&cgwb_lock);
fs/fs-writeback.c
Quoted 10 lines
fs/fs-writeback.c +10
-0+ +wb_put (wb); + } + +if (!list_empty (&processed)) +list_splice_tail (&processed, &offline_cgwbs); + +spin_unlock_irq (&cgwb_lock); +} +
Honza
Signature · 2 lines
Jan Kara <jack-IBi9RG/[email protected]> SUSE Labs, CR
Re: [PATCH v6 5/5] writeback, cgroup: release dying cgwbs by switching attached inodes
Quoted 26 lines · Jan Kara
Quoted 25 lines · Roman Gushchin
Asynchronously try to release dying cgwbs by switching attached inodes to the bdi's wb. It helps to get rid of per-cgroup writeback structures themselves and of pinned memory and block cgroups, which are significantly larger structures (mostly due to large per-cpu statistics data). This prevents memory waste and helps to avoid different scalability problems caused by large piles of dying cgroups.
Reuse the existing mechanism of inode switching used for foreign inode detection. To speed things up batch up to 115 inode switching in a single operation (the maximum number is selected so that the resulting struct
inode_switch_wbs_contextcan fit into 1024 bytes). Because every switching consists of two steps divided by an RCU grace period, it would be too slow without batching. Please note that the whole batch counts as a single operation (when increasing/decreasingisw_nr_in_flight). This allows to keep umounting working (flush the switching queue), however prevents cleanups from consuming the whole switching quota and effectively blocking the frn switching.A cgwb cleanup operation can fail due to different reasons (e.g. not enough memory, the cgwb has an in-flight/pending io, an attached inode in a wrong state, etc). In this case the next scheduled cleanup will make a new attempt. An attempt is made each time a new cgwb is offlined (in other words a memcg and/or a blkcg is deleted by a user). In the future an additional attempt scheduled by a timer can be implemented.
Quoted 3 lines
Quoted 1 line
Signed-off-by Roman Gushchin <[email protected]>I think we are getting close :). Some comments are below.
Great! Thank for reviewing the code!
Quoted 16 lines
Quoted 16 lines
--- fs/fs-writeback.c | 68 ++++++++++++++++++++++++++++++++ include/linux/backing-dev-defs.h | 1 + include/linux/writeback.h | 1 + mm/backing-dev.c | 58 ++++++++++++++++++++++++++- 4 files changed, 126 insertions(+), 2 deletions(-)fs/fs-writeback.c +0
-0@@ -225,6 +225,8 @@ void wb_wait_for_completion(struct wb_completion *done)/* one round can affect upto 5 slots */ #define WB_FRN_MAX_IN_FLIGHT 1024/* don't queue too many concurrently */
Quoted 4 lines
fs/fs-writeback.c void wb_wait_for_completion(struct wb_completion *done) · line 229
Quoted 2 lines
fs/fs-writeback.c +2
-0+#define WB_MAX_INODES_PER_ISW 116/* maximum inodes per isw */ +Why this number? Please add an explanation here...
Added.
Quoted 42 lines
Quoted 42 lines
fs/fs-writeback.c +34
-0static atomic_t isw_nr_in_flight =ATOMIC_INIT (0 );static struct workqueue_struct *isw_wq;@@ -552,6 +554,72 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)kfree (isw); } +/** +* cleanup_offline_cgwb - detach associated inodes +* @wb: target wb +* +* Switch all inodes attached to @wb to the bdi's root wb in order to eventually +* release the dying @wb. Returns %true if not all inodes were switched and +* the function has to be restarted. +*/ +bool cleanup_offline_cgwb (struct bdi_writeback *wb) +{ +struct inode_switch_wbs_context *isw; +struct inode *inode; +int nr; +bool restart = false; + + isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * +sizeof (struct inode *),GFP_KERNEL ); +if (!isw) +return restart; + +/* no need to call wb_get() here: bdi's root wb is not refcounted */ + isw->new_wb = &wb->bdi->wb; + + nr =0 ; +spin_lock (&wb->list_lock); +list_for_each_entry (inode, &wb->b_attached, i_io_list) { +spin_lock (&inode->i_lock); +if (!(inode->i_sb->s_flags &SB_ACTIVE ) || + inode->i_state & (I_WB_SWITCH |I_FREEING ) || +inode_to_wb (inode) == isw->new_wb) { +spin_unlock (&inode->i_lock); +continue ; + } + inode->i_state |=I_WB_SWITCH ;
Quoted 8 lines
fs/fs-writeback.c static void inode_switch_wbs(struct inode *inode, int new_wb_id) · line 592
Quoted 2 lines
fs/fs-writeback.c +2
-0+__iget (inode); +spin_unlock (&inode->i_lock);This hunk is identical with the one in
inode_switch_wbs(). Maybe create a helper for it likeinode_prepare_wb_switch()or something like that. Also we need to check forI_WILL_FREEflag as well asI_FREEING(see the code iniput_final()) - that's actually a bug ininode_switch_wbs()as well so probably a separate fix for that should come earlier in the series.
Good point, added in v7.
Quoted 9 lines
fs/fs-writeback.c static void inode_switch_wbs(struct inode *inode, int new_wb_id) · line 594
Quoted 3 lines
fs/fs-writeback.c +2
-0+ + isw->inodes[nr++] = inode;At first it seemed a bit silly to allocate an array of inode pointers when we have them in the list. But after some thought I agree that dealing with other switching being triggered from other sources in parallel would be really difficult so your decision makes sense. Just maybe add an explanation in a comment somewhere about this design decision.
Added in v7.
Quoted 22 lines
Quoted 8 lines
fs/fs-writeback.c +7
-0+ +if (nr >=WB_MAX_INODES_PER_ISW -1 ) { + restart = true; +break ; + } + } +spin_unlock (&wb->list_lock);...
Quoted 11 lines
fs/fs-writeback.c +11
-0+static void cleanup_offline_cgwbs_workfn (struct work_struct *work) +{ +struct bdi_writeback *wb; +LIST_HEAD (processed); + +spin_lock_irq (&cgwb_lock); + +while (!list_empty (&offline_cgwbs)) { + wb = list_first_entry(&offline_cgwbs, struct bdi_writeback, + offline_node); +list_move (&wb->offline_node, &processed);
Quoted 8 lines
fs/fs-writeback.c
Quoted 3 lines
fs/fs-writeback.c +3
-0+ +if (wb_has_dirty_io (wb)) +continue ;Maybe explain in a comment why skipping wbs with dirty inodes is fine? Because honestly, I'm not sure... I guess the rationale is that inodes should get cleaned eventually and if they are getting redirtied, they will be switched to another wb anyway?
The main rationale here is that the deletion of a memory/blkcg cgroup by a user shouldn't affect the io distribution. In other words, the remaining io shouldn't be performed faster than it could be finished had the cgroup remain existing.