block, bdi: various cleanups
Subsystems (6)
PATCH 1/1 block, bdi: various cleanups
Hello,
This patchset contains the following six bdi related cleanup patches. Each patch should be fairly self-explanatory.
0001-block-bdi-an-active-gendisk-always-has-a-request_que.patch 0002-bdi-remove-unused-stuff.patch 0003-bdi-remove-bdi-wb_lock-locking-around-bdi-dev-cleari.patch 0004-bdi-make-backing_dev_info-wb.dwork-canceling-stricte.patch 0005-bdi-explain-the-dirty-list-transferring-in-bdi_destr.patch 0006-bdi-reimplement-bdev_inode_switch_bdi.patch
The patchset is on top of 7d1311b93e58 ("Linux 3.17-rc1") and also available in the following git branch.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git review-bdi-cleanups
diffstat follows. Thanks.
block/blk-core.c | 10 +++------- block/compat_ioctl.c | 4 ---- block/ioctl.c | 4 ---- fs/block_dev.c | 34 +++++++++++----------------------- fs/btrfs/disk-io.c | 2 +- fs/xfs/xfs_buf.c | 2 -- include/linux/backing-dev.h | 4 ---- include/linux/blkdev.h | 2 +- mm/backing-dev.c | 40 ++++++++++++++++------------------------ 9 files changed, 32 insertions(+), 70 deletions(-)
--
tejun
PATCH 1/6 block, bdi: an active gendisk always has a request_queue associated with it
bdev_get_queue() returns the request_queue associated with the specified block_device. blk_get_backing_dev_info() makes use of bdev_get_queue() to determine the associated bdi given a block_device.
All the callers of bdev_get_queue() including blk_get_backing_dev_info() assume that bdev_get_queue() may return NULL and implement NULL handling; however, bdev_get_queue() requires the passed in block_device is opened and attached to its gendisk. Because an active gendisk always has a valid request_queue associated with it, bdev_get_queue() can never return NULL and neither can blk_get_backing_dev_info().
Make it clear that neither of the two functions can return NULL and remove NULL handling from all the callers.
--- block/blk-core.c | 10 +++------- block/compat_ioctl.c | 4 ---- block/ioctl.c | 4 ---- fs/block_dev.c | 2 -- fs/btrfs/disk-io.c | 2 +- fs/xfs/xfs_buf.c | 2 -- include/linux/blkdev.h | 2 +- 7 files changed, 5 insertions(+), 21 deletions(-)
block/blk-core.c +3 -7
@@ -83,18 +83,14 @@ void blk_queue_congestion_threshold(struct request_queue *q)* @bdev: device * * Locates the passed device's request queue and returns the address of its -* backing_dev_info -* -* Will return NULL if the request queue cannot be located. +* backing_dev_info. This function can only be called if @bdev is opened +* and the return value is never NULL. */ struct backing_dev_info *blk_get_backing_dev_info (struct block_device *bdev) { -struct backing_dev_info *ret =NULL ;struct request_queue *q =bdev_get_queue (bdev); -if (q) - ret = &q->backing_dev_info; -return ret; +return &q->backing_dev_info; }EXPORT_SYMBOL (blk_get_backing_dev_info);
block/compat_ioctl.c +0 -4
@@ -709,8 +709,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)if (!arg)return -EINVAL ; bdi =blk_get_backing_dev_info (bdev); -if (bdi ==NULL ) -return -ENOTTY ;return compat_put_long (arg, (bdi->ra_pages *PAGE_CACHE_SIZE ) /512 );case BLKROGET :/* compatible */
@@ -731,8 +729,6 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)if (!capable (CAP_SYS_ADMIN ))return -EACCES ; bdi =blk_get_backing_dev_info (bdev); -if (bdi ==NULL ) -return -ENOTTY ; bdi->ra_pages = (arg *512 ) /PAGE_CACHE_SIZE ;return 0 ;case BLKGETSIZE :
block/ioctl.c +0 -4
@@ -356,8 +356,6 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,if (!arg)return -EINVAL ; bdi =blk_get_backing_dev_info (bdev); -if (bdi ==NULL ) -return -ENOTTY ;return put_long (arg, (bdi->ra_pages *PAGE_CACHE_SIZE ) /512 );case BLKROGET :return put_int (arg,bdev_read_only (bdev) !=0 );
@@ -386,8 +384,6 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd,if (!capable (CAP_SYS_ADMIN ))return -EACCES ; bdi =blk_get_backing_dev_info (bdev); -if (bdi ==NULL ) -return -ENOTTY ; bdi->ra_pages = (arg *512 ) /PAGE_CACHE_SIZE ;return 0 ;case BLKBSZSET :
fs/block_dev.c +0 -2
@@ -1173,8 +1173,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)if (!ret) {bd_set_size (bdev,(loff_t )get_capacity (disk)<<9 ); bdi =blk_get_backing_dev_info (bdev); -if (bdi ==NULL ) - bdi = &default_backing_dev_info;bdev_inode_switch_bdi (bdev->bd_inode, bdi); }
fs/btrfs/disk-io.c +1 -1
@@ -1694,7 +1694,7 @@ static int btrfs_congested_fn(void *congested_data, int bdi_bits)if (!device->bdev)continue ; bdi =blk_get_backing_dev_info (device->bdev); -if (bdi &&bdi_congested (bdi, bdi_bits)) { +if (bdi_congested (bdi, bdi_bits)) { ret =1 ;break ; }
fs/xfs/xfs_buf.c +0 -2
@@ -1678,8 +1678,6 @@ xfs_alloc_buftarg( btp->bt_dev = bdev->bd_dev; btp->bt_bdev = bdev; btp->bt_bdi =blk_get_backing_dev_info (bdev); -if (!btp->bt_bdi) - goto error;if (xfs_setsize_buftarg_early (btp, bdev)) goto error;
include/linux/blkdev.h +1 -1
@@ -865,7 +865,7 @@ extern void blk_execute_rq_nowait(struct request_queue *, struct gendisk *,static inline struct request_queue *bdev_get_queue (struct block_device *bdev) { -return bdev->bd_disk->queue; +return bdev->bd_disk->queue;/* this is never NULL */ }/*
Signature · 1 line
1.9.3
PATCH 2/6 bdi: remove unused stuff
In reply to Tejun HeoTwo flags and one bdi_writeback field are no longer used. Remove them.
--- include/linux/backing-dev.h | 3 --- 1 file changed, 3 deletions(-)
include/linux/backing-dev.h +0 -3
@@ -28,12 +28,10 @@ struct dentry;* Bits in backing_dev_info.state */ enum bdi_state { - BDI_wb_alloc,/* Default embedded wb allocated */ BDI_async_congested,/* The async (write) queue is getting full */ BDI_sync_congested,/* The sync queue is getting full */ BDI_registered,/* bdi_register() was done */ BDI_writeback_running,/* Writeback is in progress */ - BDI_unused,/* Available bits start here */ };typedef int (congested_fn )(void *,int );
@@ -50,7 +48,6 @@ enum bdi_stat_item {struct bdi_writeback {struct backing_dev_info *bdi;/* our parent bdi */ -unsigned int nr;unsigned long last_old_flush;/* last old data flush */
Signature · 1 line
1.9.3
PATCH 3/6 bdi: remove bdi->wb_lock locking around bdi->dev clearing in bdi_unregister()
In reply to Tejun HeoThe only places where NULL test on bdi->dev is used are bdi_[un]register(). The functions can't be called in parallel anyway and there's no point in protecting bdi->dev clearing with a lock. Remove bdi->wb_lock grabbing around bdi->dev clearing and move it after device_unregister() call so that bdi->dev doesn't have to be cached in a local variable.
This patch shouldn't introduce any behavior difference.
--- mm/backing-dev.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
mm/backing-dev.c +2 -8
@@ -402,21 +402,15 @@ static void bdi_prune_sb(struct backing_dev_info *bdi)void bdi_unregister (struct backing_dev_info *bdi) { -struct device *dev = bdi->dev; - -if (dev) { +if (bdi->dev) {bdi_set_min_ratio (bdi,0 );trace_writeback_bdi_unregister (bdi);bdi_prune_sb (bdi);bdi_wb_shutdown (bdi);bdi_debug_unregister (bdi); - -spin_lock_bh (&bdi->wb_lock); +device_unregister (bdi->dev); bdi->dev =NULL ; -spin_unlock_bh (&bdi->wb_lock); - -device_unregister (dev); } }EXPORT_SYMBOL (bdi_unregister);
Signature · 1 line
1.9.3
PATCH 4/6 bdi: make backing_dev_info->wb.dwork canceling stricter
In reply to Tejun HeoCanceling of bdi->wb.dwork is currently a bit mushy. bdi_wb_shutdown() performs cancel_delayed_work_sync() at the end after shutting down and flushing the delayed_work and bdi_destroy() tries yet again after bdi_unregister().
bdi->wb.dwork is queued only after checking BDI_registered while holding bdi->wb_lock and bdi_wb_shutdown() clears the flag while holding the same lock and then flushes the delayed_work. There's no way the delayed_work can be queued again after that.
Replace the two unnecessary cancel_delayed_work_sync() invocations with WARNs on pending. This simplifies and clarifies the code a bit and will help future changes in further isolating bdi_writeback handling.
--- mm/backing-dev.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
mm/backing-dev.c +2 -13
@@ -376,13 +376,7 @@ static void bdi_wb_shutdown(struct backing_dev_info *bdi)mod_delayed_work (bdi_wq, &bdi->wb.dwork,0 );flush_delayed_work (&bdi->wb.dwork);WARN_ON (!list_empty (&bdi->work_list)); - -/* -* This shouldn't be necessary unless @bdi for some reason has -* unflushed dirty IO after work_list is drained. Do it anyway -* just in case. -*/ -cancel_delayed_work_sync (&bdi->wb.dwork); +WARN_ON (delayed_work_pending (&bdi->wb.dwork)); }/*
@@ -497,12 +491,7 @@ void bdi_destroy(struct backing_dev_info *bdi)bdi_unregister (bdi); -/* -* If bdi_unregister() had already been called earlier, the dwork -* could still be pending because bdi_prune_sb() can race with the -* bdi_wakeup_thread_delayed() calls from __mark_inode_dirty(). -*/ -cancel_delayed_work_sync (&bdi->wb.dwork); +WARN_ON (delayed_work_pending (&bdi->wb.dwork));for (i =0 ; i <NR_BDI_STAT_ITEMS ; i++)percpu_counter_destroy (&bdi->bdi_stat[i]);
Signature · 1 line
1.9.3
PATCH 5/6 bdi: explain the dirty list transferring in bdi_destroy()
In reply to Tejun Heobdi_destroy() has code to transfer the remaining dirty inodes to the default_backing_dev_info; however, given the shutdown sequence, it isn't clear how such condition would happen. Also, it isn't a full solution as the transferred inodes stlil point to the bdi which is being destroyed. Operations on those inodes can end up accessing already released fields such as the percpu stat fields.
Digging through the history, it seems that the code was added as a quick workaround for a bug report without fully root-causing the issue. We probably want to remove the code in time but for now let's add a comment noting that it is a quick workaround.
--- mm/backing-dev.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
mm/backing-dev.c +11 -2
@@ -475,8 +475,17 @@ void bdi_destroy(struct backing_dev_info *bdi)int i;/* -* Splice our entries to the default_backing_dev_info, if this -* bdi disappears +* Splice our entries to the default_backing_dev_info. This +* condition shouldn't happen. @wb must be empty at this point and +* dirty inodes on it might cause other issues. This workaround is +* added by ce5f8e779519 ("writeback: splice dirty inode entries to +* default bdi on bdi_destroy()") without root-causing the issue. +* +* http://lkml.kernel.org/g/[email protected] +* http://thread.gmane.org/gmane.linux.file-systems/35341/focus=35350 +* +* We should probably add WARN_ON() to find out whether it still +* happens and track it down if so. */ if (bdi_has_dirty_io (bdi)) {struct bdi_writeback *dst = &default_backing_dev_info.wb;
Signature · 1 line
1.9.3
PATCH 6/6 bdi: reimplement bdev_inode_switch_bdi()
In reply to Tejun HeoA block_device may be attached to different gendisks and thus different bdis over time. bdev_inode_switch_bdi() is used to switch the associated bdi. The function assumes that the inode could be dirty and transfers it between bdis if so. This is a bit nasty in that it reaches into bdi internals.
This patch reimplements the function so that it writes out the inode if dirty. This is a lot simpler and can be implemented without exposing bdi internals.
--- fs/block_dev.c | 32 +++++++++++--------------------- include/linux/backing-dev.h | 1 - mm/backing-dev.c | 2 +- 3 files changed, 12 insertions(+), 23 deletions(-)
fs/block_dev.c +11 -21
@@ -50,32 +50,22 @@ inline struct block_device *I_BDEV(struct inode *inode)EXPORT_SYMBOL (I_BDEV );/* -* Move the inode from its current bdi to a new bdi. If the inode is dirty we -* need to move it onto the dirty list of @dst so that the inode is always on -* the right list. +* Move the inode from its current bdi to a new bdi. Make sure the inode +* is clean before moving so that it doesn't linger on the old bdi. */ static void bdev_inode_switch_bdi (struct inode *inode,struct backing_dev_info *dst) { -struct backing_dev_info *old = inode->i_data.backing_dev_info; -bool wakeup_bdi = false; - -if (unlikely (dst == old))/* deadlock avoidance */ -return ; -bdi_lock_two (&old->wb, &dst->wb); -spin_lock (&inode->i_lock); - inode->i_data.backing_dev_info = dst; -if (inode->i_state &I_DIRTY ) { -if (bdi_cap_writeback_dirty (dst) && !wb_has_dirty_io (&dst->wb)) - wakeup_bdi = true; -list_move (&inode->i_wb_list, &dst->wb.b_dirty); +while (true) { +spin_lock (&inode->i_lock); +if (!(inode->i_state &I_DIRTY )) { + inode->i_data.backing_dev_info = dst; +spin_unlock (&inode->i_lock); +return ; + } +spin_unlock (&inode->i_lock); +WARN_ON_ONCE (write_inode_now (inode, true)); } -spin_unlock (&inode->i_lock); -spin_unlock (&old->wb.list_lock); -spin_unlock (&dst->wb.list_lock); - -if (wakeup_bdi) -bdi_wakeup_thread_delayed (dst); }/* Kill _all_ buffers and pagecache , dirty or not.. */
include/linux/backing-dev.h +0 -1
@@ -121,7 +121,6 @@ void bdi_start_background_writeback(struct backing_dev_info *bdi);void bdi_writeback_workfn (struct work_struct *work);int bdi_has_dirty_io (struct backing_dev_info *bdi);void bdi_wakeup_thread_delayed (struct backing_dev_info *bdi); -void bdi_lock_two (struct bdi_writeback *wb1,struct bdi_writeback *wb2);extern spinlock_t bdi_lock;extern struct list_head bdi_list;
mm/backing-dev.c +1 -1
@@ -40,7 +40,7 @@ LIST_HEAD(bdi_list);/* bdi_wq serves all asynchronous writeback tasks */ struct workqueue_struct *bdi_wq; -void bdi_lock_two (struct bdi_writeback *wb1,struct bdi_writeback *wb2) +static void bdi_lock_two (struct bdi_writeback *wb1,struct bdi_writeback *wb2) {if (wb1 < wb2) {spin_lock (&wb1->list_lock);
Signature · 1 line
1.9.3