bdi cleanups v3
Subsystems (34)
Christoph Hellwig
maintainerHi Jens,
this series contains a bunch of different BDI cleanups. The biggest item is to isolate block drivers from the BDI in preparation of changing the lifetime of the block device BDI in a follow up series.
Changes since v2:
- fix a rw_page return value check
- fix various changelogs
Changes since v1:
- rebased to the for-5.9/block-merge branch
- explicitly set the readahead to 0 for ubifs, vboxsf and mtd
- split the zram block_device operations
- let rw_page users fall back to bios in swap_readpage
Diffstat:
block/blk-core.c | 2 block/blk-integrity.c | 4 block/blk-mq-debugfs.c | 1 block/blk-settings.c | 5 block/blk-sysfs.c | 282 ++++++++++-------------------------------- block/genhd.c | 13 + drivers/block/aoe/aoeblk.c | 2 drivers/block/brd.c | 1 drivers/block/drbd/drbd_nl.c | 18 -- drivers/block/drbd/drbd_req.c | 4 drivers/block/rbd.c | 2 drivers/block/zram/zram_drv.c | 19 +- drivers/md/bcache/super.c | 4 drivers/md/dm-table.c | 9 - drivers/md/raid0.c | 16 -- drivers/md/raid10.c | 46 ++---- drivers/md/raid5.c | 31 +--- drivers/mmc/core/queue.c | 3 drivers/mtd/mtdcore.c | 1 drivers/nvdimm/btt.c | 2 drivers/nvdimm/pmem.c | 1 drivers/nvme/host/core.c | 3 drivers/nvme/host/multipath.c | 10 - drivers/scsi/iscsi_tcp.c | 4 fs/9p/vfs_file.c | 2 fs/9p/vfs_super.c | 4 fs/afs/super.c | 1 fs/btrfs/disk-io.c | 2 fs/fs-writeback.c | 7 - fs/fuse/inode.c | 4 fs/namei.c | 4 fs/nfs/super.c | 9 - fs/super.c | 2 fs/ubifs/super.c | 1 fs/vboxsf/super.c | 1 include/linux/backing-dev.h | 78 +---------- include/linux/blkdev.h | 3 include/linux/drbd.h | 1 include/linux/fs.h | 2 mm/backing-dev.c | 12 - mm/filemap.c | 4 mm/memcontrol.c | 2 mm/memory-failure.c | 2 mm/migrate.c | 2 mm/mmap.c | 2 mm/page-writeback.c | 18 +- mm/page_io.c | 18 +- mm/swapfile.c | 4 48 files changed, 204 insertions(+), 464 deletions(-)
Christoph Hellwig
maintainerPATCH 1/14 fs: remove the unused SB_I_MULTIROOT flag
The last user of SB_I_MULTIROOT is disappeared with commit f2aedb713c28 ("NFS: Add fs_context support.")
--- fs/namei.c | 4 ++-- include/linux/fs.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
fs/namei.c +2 -2
@@ -568,8 +568,8 @@ static bool path_connected(struct vfsmount *mnt, struct dentry *dentry) {struct super_block *sb = mnt->mnt_sb; -/* Bind mounts and multi-root filesystems can have disconnected paths */ -if (!(sb->s_iflags &SB_I_MULTIROOT ) && (mnt->mnt_root == sb->s_root)) +/* Bind mounts can have disconnected paths */ +if (mnt->mnt_root == sb->s_root)return true;return is_subdir (dentry, mnt->mnt_root);
include/linux/fs.h +0 -1
@@ -1366,7 +1366,6 @@ extern int send_sigurg(struct fown_struct *fown);#define SB_I_CGROUPWB 0x00000001/* cgroup-aware writeback enabled */ #define SB_I_NOEXEC 0x00000002/* Ignore executables on this fs */ #define SB_I_NODEV 0x00000004/* Ignore devices on this fs */ -#define SB_I_MULTIROOT 0x00000008/* Multiple roots to the dentry tree */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE 0x00000010/* fstype already mounted */
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 2/14 drbd: remove dead code in device_to_statistics
In reply to Christoph HellwigEver since the switch to blk-mq, a lower device not used for VM writeback will not be marked congested, so the check will never trigger.
--- drivers/block/drbd/drbd_nl.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/block/drbd/drbd_nl.c +0 -6
@@ -3370,7 +3370,6 @@ static void device_to_statistics(struct device_statistics *s,if (get_ldev (device)) {struct drbd_md *md = &device->ldev->md;u64 *history_uuids = (u64 *)s->history_uuids; -struct request_queue *q;int n;spin_lock_irq (&md->uuid_lock);
@@ -3384,11 +3383,6 @@ static void device_to_statistics(struct device_statistics *s,spin_unlock_irq (&md->uuid_lock); s->dev_disk_flags = md->flags; - q =bdev_get_queue (device->ldev->backing_bdev); - s->dev_lower_blocked = -bdi_congested (q->backing_dev_info, - (1 << WB_async_congested) | - (1 << WB_sync_congested));put_ldev (device); } s->dev_size =drbd_get_capacity (device->this_bdev);
Signature · 1 line
2.27.0
Re: [PATCH 02/14] drbd: remove dead code in device_to_statistics
Looks good,
Christoph Hellwig
maintainerPATCH 3/14 drbd: remove RB_CONGESTED_REMOTE
In reply to Christoph HellwigThis case isn't ever used.
--- drivers/block/drbd/drbd_req.c | 4 ---- include/linux/drbd.h | 1 - 2 files changed, 5 deletions(-)
drivers/block/drbd/drbd_req.c +0 -4
@@ -901,13 +901,9 @@ static bool drbd_may_do_local_read(struct drbd_device *device, sector_t sector,static bool remote_due_to_read_balancing (struct drbd_device *device,sector_t sector,enum drbd_read_balancing rbm) { -struct backing_dev_info *bdi;int stripe_shift;switch (rbm) { -case RB_CONGESTED_REMOTE : - bdi = device->ldev->backing_bdev->bd_disk->queue->backing_dev_info; -return bdi_read_congested (bdi);case RB_LEAST_PENDING :return atomic_read (&device->local_cnt) >atomic_read (&device->ap_pending_cnt) +atomic_read (&device->rs_pending_cnt);
include/linux/drbd.h +0 -1
@@ -94,7 +94,6 @@ enum drbd_read_balancing {RB_PREFER_REMOTE ,RB_ROUND_ROBIN ,RB_LEAST_PENDING , -RB_CONGESTED_REMOTE ,RB_32K_STRIPING ,RB_64K_STRIPING , RB_128K_STRIPING,
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 4/14 bdi: initialize ->ra_pages in bdi_init
In reply to Christoph HellwigSet up a readahead size by default, as very few users have a good reason to change it.
--- block/blk-core.c | 1 - drivers/mtd/mtdcore.c | 1 + fs/9p/vfs_super.c | 4 ++-- fs/afs/super.c | 1 - fs/btrfs/disk-io.c | 1 - fs/fuse/inode.c | 1 - fs/nfs/super.c | 9 +-------- fs/ubifs/super.c | 1 + fs/vboxsf/super.c | 1 + mm/backing-dev.c | 1 + 10 files changed, 7 insertions(+), 14 deletions(-)
block/blk-core.c +0 -1
@@ -538,7 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id)if (!q->stats) goto fail_stats; - q->backing_dev_info->ra_pages =VM_READAHEAD_PAGES ; q->backing_dev_info->capabilities =BDI_CAP_CGROUP_WRITEBACK ; q->node = node_id;
drivers/mtd/mtdcore.c +1 -0
@@ -2196,6 +2196,7 @@ static struct backing_dev_info * __init mtd_bdi_init(char *name) bdi =bdi_alloc (NUMA_NO_NODE );if (!bdi)return ERR_PTR (-ENOMEM ); + bdi->ra_pages =0 ;/* * We put '-0' suffix to the name to get the same name format as we
fs/9p/vfs_super.c +2 -2
@@ -80,8 +80,8 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses,if (ret)return ret; -if (v9ses->cache) - sb->s_bdi->ra_pages =VM_READAHEAD_PAGES ; +if (!v9ses->cache) + sb->s_bdi->ra_pages =0 ; sb->s_flags |=SB_ACTIVE |SB_DIRSYNC ;if (!v9ses->cache)
fs/afs/super.c +0 -1
@@ -456,7 +456,6 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx) ret =super_setup_bdi (sb);if (ret)return ret; - sb->s_bdi->ra_pages =VM_READAHEAD_PAGES ;/* allocate the root inode and dentry */ if (as->dyn_root) {
fs/btrfs/disk-io.c +0 -1
@@ -3033,7 +3033,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device } sb->s_bdi->capabilities |=BDI_CAP_CGROUP_WRITEBACK ; - sb->s_bdi->ra_pages =VM_READAHEAD_PAGES ; sb->s_bdi->ra_pages *=btrfs_super_num_devices (disk_super); sb->s_bdi->ra_pages =max (sb->s_bdi->ra_pages,SZ_4M /PAGE_SIZE );
fs/fuse/inode.c +0 -1
@@ -1049,7 +1049,6 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb)if (err)return err; - sb->s_bdi->ra_pages =VM_READAHEAD_PAGES ;/* fuse does it's own writeback accounting */ sb->s_bdi->capabilities =BDI_CAP_NO_ACCT_WB |BDI_CAP_STRICTLIMIT ;
fs/nfs/super.c +1 -8
@@ -1200,13 +1200,6 @@ static void nfs_get_cache_cookie(struct super_block *sb, }#endif -static void nfs_set_readahead (struct backing_dev_info *bdi, -unsigned long iomax_pages) -{ - bdi->ra_pages =VM_READAHEAD_PAGES ; - bdi->io_pages = iomax_pages; -} -int nfs_get_tree_common (struct fs_context *fc) {struct nfs_fs_context *ctx =nfs_fc2context (fc);
@@ -1251,7 +1244,7 @@ int nfs_get_tree_common(struct fs_context *fc) MINOR(server->s_dev));if (error) goto error_splat_super; -nfs_set_readahead (s->s_bdi, server->rpages); + s->s_bdi->io_pages = server->rpages; server->super = s; }
fs/ubifs/super.c +1 -0
@@ -2159,6 +2159,7 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent) c->vi.vol_id);if (err) goto out_close; + sb->s_bdi->ra_pages =0 ;/* ubifs does its own readahead */ sb->s_fs_info = c; sb->s_magic =UBIFS_SUPER_MAGIC ;
fs/vboxsf/super.c +1 -0
@@ -167,6 +167,7 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc) err =super_setup_bdi_name (sb,"vboxsf-%d" , sbi->bdi_id);if (err) goto fail_free; + sb->s_bdi->ra_pages =0 ;/* Turn source into a shfl_string and map the folder */ size =strlen (fc->source) +1 ;
mm/backing-dev.c +1 -0
@@ -746,6 +746,7 @@ struct backing_dev_info *bdi_alloc(int node_id)kfree (bdi);return NULL ; } + bdi->ra_pages =VM_READAHEAD_PAGES ;return bdi; }EXPORT_SYMBOL (bdi_alloc);
Signature · 1 line
2.27.0
Re: [PATCH 04/14] bdi: initialize ->ra_pages in bdi_init
Looks good,
Christoph Hellwig
maintainerPATCH 5/14 md: update the optimal I/O size on reshape
In reply to Christoph HellwigThe raid5 and raid10 drivers currently update the read-ahead size, but not the optimal I/O size on reshape. To prepare for deriving the read-ahead size from the optimal I/O size make sure it is updated as well.
--- drivers/md/raid10.c | 22 ++++++++++++++-------- drivers/md/raid5.c | 10 ++++++++-- 2 files changed, 22 insertions(+), 10 deletions(-)
drivers/md/raid10.c +14 -8
@@ -3695,10 +3695,20 @@ static struct r10conf *setup_conf(struct mddev *mddev)return ERR_PTR (err); } +static void raid10_set_io_opt (struct r10conf *conf) +{ +int raid_disks = conf->geo.raid_disks; + +if (!(conf->geo.raid_disks % conf->geo.near_copies)) + raid_disks /= conf->geo.near_copies; +blk_queue_io_opt (conf->mddev->queue, (conf->mddev->chunk_sectors <<9 ) * + raid_disks); +} +static int raid10_run (struct mddev *mddev) {struct r10conf *conf; -int i, disk_idx, chunk_size; +int i, disk_idx;struct raid10_info *disk;struct md_rdev *rdev;sector_t size;
@@ -3734,18 +3744,13 @@ static int raid10_run(struct mddev *mddev) mddev->thread = conf->thread; conf->thread =NULL ; - chunk_size = mddev->chunk_sectors <<9 ;if (mddev->queue) {blk_queue_max_discard_sectors (mddev->queue, mddev->chunk_sectors);blk_queue_max_write_same_sectors (mddev->queue,0 );blk_queue_max_write_zeroes_sectors (mddev->queue,0 ); -blk_queue_io_min (mddev->queue, chunk_size); -if (conf->geo.raid_disks % conf->geo.near_copies) -blk_queue_io_opt (mddev->queue, chunk_size * conf->geo.raid_disks); -else -blk_queue_io_opt (mddev->queue, chunk_size * - (conf->geo.raid_disks / conf->geo.near_copies)); +blk_queue_io_min (mddev->queue, mddev->chunk_sectors <<9 ); +raid10_set_io_opt (conf); }rdev_for_each (rdev, mddev) {
@@ -4719,6 +4724,7 @@ static void end_reshape(struct r10conf *conf) stripe /= conf->geo.near_copies;if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +raid10_set_io_opt (conf); } conf->fullsync =0 ; }
drivers/md/raid5.c +8 -2
@@ -7123,6 +7123,12 @@ static int only_parity(int raid_disk, int algo, int raid_disks, int max_degradedreturn 0 ; } +static void raid5_set_io_opt (struct r5conf *conf) +{ +blk_queue_io_opt (conf->mddev->queue, (conf->chunk_sectors <<9 ) * + (conf->raid_disks - conf->max_degraded)); +} +static int raid5_run (struct mddev *mddev) {struct r5conf *conf;
@@ -7412,8 +7418,7 @@ static int raid5_run(struct mddev *mddev) chunk_size = mddev->chunk_sectors <<9 ;blk_queue_io_min (mddev->queue, chunk_size); -blk_queue_io_opt (mddev->queue, chunk_size * - (conf->raid_disks - conf->max_degraded)); +raid5_set_io_opt (conf); mddev->queue->limits.raid_partial_stripes_expensive =1 ;/* * We can only discard a whole stripe. It doesn't make sense to
@@ -8006,6 +8011,7 @@ static void end_reshape(struct r5conf *conf) / PAGE_SIZE);if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +raid5_set_io_opt (conf); } } }
Signature · 1 line
2.27.0
Re: [PATCH 05/14] md: update the optimal I/O size on reshape
Looks good,
Christoph Hellwig
maintainerPATCH 6/14 block: lift setting the readahead size into the block layer
In reply to Christoph HellwigDrivers shouldn't really mess with the readahead size, as that is a VM concept. Instead set it based on the optimal I/O size by lifting the algorithm from the md driver when registering the disk. Also set bdi->io_pages there as well by applying the same scheme based on max_sectors.
--- block/blk-settings.c | 5 ++--- block/blk-sysfs.c | 1 - block/genhd.c | 13 +++++++++++-- drivers/block/aoe/aoeblk.c | 2 -- drivers/block/drbd/drbd_nl.c | 12 +----------- drivers/md/bcache/super.c | 4 ---- drivers/md/dm-table.c | 3 --- drivers/md/raid0.c | 16 ---------------- drivers/md/raid10.c | 24 +----------------------- drivers/md/raid5.c | 13 +------------ 10 files changed, 16 insertions(+), 77 deletions(-)
block/blk-settings.c +2 -3
@@ -452,6 +452,8 @@ EXPORT_SYMBOL(blk_limits_io_opt);void blk_queue_io_opt (struct request_queue *q,unsigned int opt) {blk_limits_io_opt (&q->limits, opt); + q->backing_dev_info->ra_pages = +max (queue_io_opt (q) *2 /PAGE_SIZE ,VM_READAHEAD_PAGES ); }EXPORT_SYMBOL (blk_queue_io_opt);
@@ -628,9 +630,6 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,printk (KERN_NOTICE "%s: Warning: Device %s is misaligned\n" , top, bottom); } - - t->backing_dev_info->io_pages = - t->limits.max_sectors >> (PAGE_SHIFT -9 ); }EXPORT_SYMBOL (disk_stack_limits);
block/blk-sysfs.c +0 -1
@@ -245,7 +245,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)spin_lock_irq (&q->queue_lock); q->limits.max_sectors = max_sectors_kb <<1 ; - q->backing_dev_info->io_pages = max_sectors_kb >> (PAGE_SHIFT -10 );spin_unlock_irq (&q->queue_lock);return ret;
block/genhd.c +11 -2
@@ -775,6 +775,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, const struct attribute_group **groups, bool register_queue) { +struct request_queue *q = disk->queue;dev_t devt;int retval;
@@ -785,7 +786,7 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,* registration. */ if (register_queue) -elevator_init_mq (disk->queue); +elevator_init_mq (q);/* minors == 0 indicates to use ext devt from part0 and should * be accompanied with EXT_DEVT flag. Make sure all
@@ -815,10 +816,18 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk, disk->flags |=GENHD_FL_SUPPRESS_PARTITION_INFO ; disk->flags |=GENHD_FL_NO_PART_SCAN ; }else { -struct backing_dev_info *bdi = disk->queue->backing_dev_info; +struct backing_dev_info *bdi = q->backing_dev_info;struct device *dev =disk_to_dev (disk);int ret; +/* +* For read-ahead of large files to be effective, we need to +* readahead at least twice the optimal I/O size. +*/ + bdi->ra_pages =max (queue_io_opt (q) *2 /PAGE_SIZE , +VM_READAHEAD_PAGES ); + bdi->io_pages =queue_max_sectors (q) >> (PAGE_SHIFT -9 ); +/* Register BDI before referencing it from bdev */ dev->devt = devt; ret =bdi_register (bdi,"%u:%u" ,MAJOR (devt),MINOR (devt));
drivers/block/aoe/aoeblk.c +0 -2
@@ -347,7 +347,6 @@ aoeblk_gdalloc(void *vp)mempool_t *mp;struct request_queue *q;struct blk_mq_tag_set *set; -enum {KB =1024 ,MB =KB *KB ,READ_AHEAD =2 *MB , };ulong flags;int late =0 ;int err;
@@ -407,7 +406,6 @@ aoeblk_gdalloc(void *vp)WARN_ON (d->gd);WARN_ON (d->flags &DEVFL_UP );blk_queue_max_hw_sectors (q,BLK_DEF_MAX_SECTORS ); - q->backing_dev_info->ra_pages =READ_AHEAD /PAGE_SIZE ; d->bufpool = mp; d->blkq = gd->queue = q; q->queuedata = d;
drivers/block/drbd/drbd_nl.c +1 -11
@@ -1360,18 +1360,8 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backidecide_on_discard_support (device, q, b, discard_zeroes_if_aligned);decide_on_write_same_support (device, q, b, o, disable_write_same); -if (b) { +if (b)blk_stack_limits (&q->limits, &b->limits,0 ); - -if (q->backing_dev_info->ra_pages != - b->backing_dev_info->ra_pages) { -drbd_info (device,"Adjusting my ra_pages to backing device's (%lu -> %lu)\n" , - q->backing_dev_info->ra_pages, - b->backing_dev_info->ra_pages); - q->backing_dev_info->ra_pages = - b->backing_dev_info->ra_pages; - } - }fixup_discard_if_not_supported (q);fixup_write_zeroes (device, q); }
drivers/md/bcache/super.c +0 -4
@@ -1367,10 +1367,6 @@ static int cached_dev_init(struct cached_dev *dc, unsigned int block_size)if (ret)return ret; - dc->disk.disk->queue->backing_dev_info->ra_pages = -max (dc->disk.disk->queue->backing_dev_info->ra_pages, - q->backing_dev_info->ra_pages); -atomic_set (&dc->io_errors,0 ); dc->io_disable = false; dc->error_limit =DEFAULT_CACHED_DEV_ERROR_LIMIT ;
drivers/md/dm-table.c +0 -3
@@ -1924,9 +1924,6 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q, q->nr_zones = blkdev_nr_zones(t->md->disk); }#endif - -/* Allow reads to exceed readahead limits */ - q->backing_dev_info->io_pages = limits->max_sectors >> (PAGE_SHIFT -9 ); }unsigned int dm_table_get_num_targets (struct dm_table *t)
drivers/md/raid0.c +0 -16
@@ -410,22 +410,6 @@ static int raid0_run(struct mddev *mddev)mdname (mddev), (unsigned long long)mddev->array_sectors); -if (mddev->queue) { -/* calculate the max read-ahead size. -* For read-ahead of large files to be effective, we need to -* readahead at least twice a whole stripe. i.e. number of devices -* multiplied by chunk size times 2. -* If an individual device has an ra_pages greater than the -* chunk size, then we will not drive that device as hard as it -* wants. We consider this a configuration error: a larger -* chunksize should be used in that case. -*/ -int stripe = mddev->raid_disks * - (mddev->chunk_sectors <<9 ) /PAGE_SIZE ; -if (mddev->queue->backing_dev_info->ra_pages <2 * stripe) - mddev->queue->backing_dev_info->ra_pages =2 * stripe; - } -dump_zones (mddev); ret =md_integrity_register (mddev);
drivers/md/raid10.c +1 -23
@@ -3865,19 +3865,6 @@ static int raid10_run(struct mddev *mddev) mddev->resync_max_sectors = size;set_bit (MD_FAILFAST_SUPPORTED , &mddev->flags); -if (mddev->queue) { -int stripe = conf->geo.raid_disks * - ((mddev->chunk_sectors <<9 ) /PAGE_SIZE ); - -/* Calculate max read-ahead size. -* We need to readahead at least twice a whole stripe.... -* maybe... -*/ - stripe /= conf->geo.near_copies; -if (mddev->queue->backing_dev_info->ra_pages <2 * stripe) - mddev->queue->backing_dev_info->ra_pages =2 * stripe; - } -if (md_integrity_register (mddev)) goto out_free_conf;
@@ -4715,17 +4702,8 @@ static void end_reshape(struct r10conf *conf) conf->reshape_safe = MaxSector;spin_unlock_irq (&conf->device_lock); -/* read-ahead size must cover two whole stripes, which is -* 2 * (datadisks) * chunksize where 'n' is the number of raid devices -*/ -if (conf->mddev->queue) { -int stripe = conf->geo.raid_disks * - ((conf->mddev->chunk_sectors <<9 ) /PAGE_SIZE ); - stripe /= conf->geo.near_copies; -if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) - conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +if (conf->mddev->queue)raid10_set_io_opt (conf); - } conf->fullsync =0 ; }
drivers/md/raid5.c +1 -12
@@ -7413,8 +7413,6 @@ static int raid5_run(struct mddev *mddev)int data_disks = conf->previous_raid_disks - conf->max_degraded;int stripe = data_disks * ((mddev->chunk_sectors <<9 ) /PAGE_SIZE ); -if (mddev->queue->backing_dev_info->ra_pages <2 * stripe) - mddev->queue->backing_dev_info->ra_pages =2 * stripe; chunk_size = mddev->chunk_sectors <<9 ;blk_queue_io_min (mddev->queue, chunk_size);
@@ -8002,17 +8000,8 @@ static void end_reshape(struct r5conf *conf)spin_unlock_irq (&conf->device_lock);wake_up (&conf->wait_for_overlap); -/* read-ahead size must cover two whole stripes, which is -* 2 * (datadisks) * chunksize where 'n' is the number of raid devices -*/ -if (conf->mddev->queue) { -int data_disks = conf->raid_disks - conf->max_degraded; -int stripe = data_disks * ((conf->chunk_sectors <<9 ) - /PAGE_SIZE ); -if (conf->mddev->queue->backing_dev_info->ra_pages <2 * stripe) - conf->mddev->queue->backing_dev_info->ra_pages =2 * stripe; +if (conf->mddev->queue)raid5_set_io_opt (conf); - } } }
Signature · 1 line
2.27.0
Re: [PATCH 06/14] block: lift setting the readahead size into the block layer
Looks good,
Christoph Hellwig
maintainerPATCH 7/14 block: make QUEUE_SYSFS_BIT_FNS a little more useful
In reply to Christoph HellwigGenerate the queue_sysfs_entry given that we have all the required information for it, and rename the generated show and store methods to match the other ones in the file.
--- block/blk-sysfs.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-)
block/blk-sysfs.c +9 -22
@@ -257,16 +257,16 @@ static ssize_t queue_max_hw_sectors_show(struct request_queue *q, char *page)return queue_var_show (max_hw_sectors_kb, (page)); } -#define QUEUE_SYSFS_BIT_FNS (name, flag, neg) \ +#define QUEUE_SYSFS_BIT_FNS (_name, flag, neg) \ static ssize_t \ -queue_show_##name(struct request_queue *q, char *page) \ +queue_##_name##_show(struct request_queue *q, char *page) \ { \ int bit; \ bit = test_bit(QUEUE_FLAG_##flag, &q->queue_flags); \ return queue_var_show(neg ? !bit : bit, page); \ } \ static ssize_t \ -queue_store_##name(struct request_queue *q, const char *page, size_t count) \ +queue_##_name##_store(struct request_queue *q, const char *page, size_t count) \ { \ unsigned long val; \ ssize_t ret; \
@@ -281,7 +281,12 @@ queue_store_##name(struct request_queue *q, const char *page, size_t count) \ else \ blk_queue_flag_clear(QUEUE_FLAG_##flag, q); \ return ret; \ -} +} \ +static struct queue_sysfs_entry queue_##_name##_entry = { \ + .attr = { .name = __stringify(_name), .mode = 0644 }, \ + .show = queue_##_name##_show, \ + .store = queue_##_name##_store, \ +};QUEUE_SYSFS_BIT_FNS (nonrot,NONROT ,1 );QUEUE_SYSFS_BIT_FNS (random,ADD_RANDOM ,0 );
@@ -661,12 +666,6 @@ static struct queue_sysfs_entry queue_zone_append_max_entry = { .show = queue_zone_append_max_show, }; -static struct queue_sysfs_entry queue_nonrot_entry = { - .attr = {.name ="rotational" , .mode =0644 }, - .show = queue_show_nonrot, - .store = queue_store_nonrot, -}; -static struct queue_sysfs_entry queue_zoned_entry = { .attr = {.name ="zoned" , .mode =0444 }, .show = queue_zoned_show,
@@ -699,18 +698,6 @@ static struct queue_sysfs_entry queue_rq_affinity_entry = { .store = queue_rq_affinity_store, }; -static struct queue_sysfs_entry queue_iostats_entry = { - .attr = {.name ="iostats" , .mode =0644 }, - .show = queue_show_iostats, - .store = queue_store_iostats, -}; - -static struct queue_sysfs_entry queue_random_entry = { - .attr = {.name ="add_random" , .mode =0644 }, - .show = queue_show_random, - .store = queue_store_random, -}; -static struct queue_sysfs_entry queue_poll_entry = { .attr = {.name ="io_poll" , .mode =0644 }, .show = queue_poll_show,
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 8/14 block: add helper macros for queue sysfs entries
In reply to Christoph HellwigAdd two helpers macros to avoid boilerplate code for the queue sysfs entries.
--- block/blk-sysfs.c | 248 +++++++++++----------------------------------- 1 file changed, 58 insertions(+), 190 deletions(-)
block/blk-sysfs.c +58 -190
@@ -551,201 +551,69 @@ static ssize_t queue_dax_show(struct request_queue *q, char *page)return queue_var_show (blk_queue_dax (q), page); } -static struct queue_sysfs_entry queue_requests_entry = { - .attr = {.name ="nr_requests" , .mode =0644 }, - .show = queue_requests_show, - .store = queue_requests_store, -}; - -static struct queue_sysfs_entry queue_ra_entry = { - .attr = {.name ="read_ahead_kb" , .mode =0644 }, - .show = queue_ra_show, - .store = queue_ra_store, -}; - -static struct queue_sysfs_entry queue_max_sectors_entry = { - .attr = {.name ="max_sectors_kb" , .mode =0644 }, - .show = queue_max_sectors_show, - .store = queue_max_sectors_store, -}; +#define QUEUE_RO_ENTRY (_prefix, _name) \ +static struct queue_sysfs_entry _prefix##_entry = { \ + .attr = { .name = _name, .mode = 0444 }, \ + .show = _prefix##_show, \ +}; + +#define QUEUE_RW_ENTRY (_prefix, _name) \ +static struct queue_sysfs_entry _prefix##_entry = { \ + .attr = { .name = _name, .mode = 0644 }, \ + .show = _prefix##_show, \ + .store = _prefix##_store, \ +}; + +QUEUE_RW_ENTRY (queue_requests,"nr_requests" ); +QUEUE_RW_ENTRY (queue_ra,"read_ahead_kb" ); +QUEUE_RW_ENTRY (queue_max_sectors,"max_sectors_kb" ); +QUEUE_RO_ENTRY (queue_max_hw_sectors,"max_hw_sectors_kb" ); +QUEUE_RO_ENTRY (queue_max_segments,"max_segments" ); +QUEUE_RO_ENTRY (queue_max_integrity_segments,"max_integrity_segments" ); +QUEUE_RO_ENTRY (queue_max_segment_size,"max_segment_size" ); +QUEUE_RW_ENTRY (elv_iosched,"scheduler" ); + +QUEUE_RO_ENTRY (queue_logical_block_size,"logical_block_size" ); +QUEUE_RO_ENTRY (queue_physical_block_size,"physical_block_size" ); +QUEUE_RO_ENTRY (queue_chunk_sectors,"chunk_sectors" ); +QUEUE_RO_ENTRY (queue_io_min,"minimum_io_size" ); +QUEUE_RO_ENTRY (queue_io_opt,"optimal_io_size" ); + +QUEUE_RO_ENTRY (queue_max_discard_segments,"max_discard_segments" ); +QUEUE_RO_ENTRY (queue_discard_granularity,"discard_granularity" ); +QUEUE_RO_ENTRY (queue_discard_max_hw,"discard_max_hw_bytes" ); +QUEUE_RW_ENTRY (queue_discard_max,"discard_max_bytes" ); +QUEUE_RO_ENTRY (queue_discard_zeroes_data,"discard_zeroes_data" ); + +QUEUE_RO_ENTRY (queue_write_same_max,"write_same_max_bytes" ); +QUEUE_RO_ENTRY (queue_write_zeroes_max,"write_zeroes_max_bytes" ); +QUEUE_RO_ENTRY (queue_zone_append_max,"zone_append_max_bytes" ); + +QUEUE_RO_ENTRY (queue_zoned,"zoned" ); +QUEUE_RO_ENTRY (queue_nr_zones,"nr_zones" ); +QUEUE_RO_ENTRY (queue_max_open_zones,"max_open_zones" ); +QUEUE_RO_ENTRY (queue_max_active_zones,"max_active_zones" ); + +QUEUE_RW_ENTRY (queue_nomerges,"nomerges" ); +QUEUE_RW_ENTRY (queue_rq_affinity,"rq_affinity" ); +QUEUE_RW_ENTRY (queue_poll,"io_poll" ); +QUEUE_RW_ENTRY (queue_poll_delay,"io_poll_delay" ); +QUEUE_RW_ENTRY (queue_wc,"write_cache" ); +QUEUE_RO_ENTRY (queue_fua,"fua" ); +QUEUE_RO_ENTRY (queue_dax,"dax" ); +QUEUE_RW_ENTRY (queue_io_timeout,"io_timeout" ); +QUEUE_RW_ENTRY (queue_wb_lat,"wbt_lat_usec" ); -static struct queue_sysfs_entry queue_max_hw_sectors_entry = { - .attr = {.name ="max_hw_sectors_kb" , .mode =0444 }, - .show = queue_max_hw_sectors_show, -}; - -static struct queue_sysfs_entry queue_max_segments_entry = { - .attr = {.name ="max_segments" , .mode =0444 }, - .show = queue_max_segments_show, -}; - -static struct queue_sysfs_entry queue_max_discard_segments_entry = { - .attr = {.name ="max_discard_segments" , .mode =0444 }, - .show = queue_max_discard_segments_show, -}; - -static struct queue_sysfs_entry queue_max_integrity_segments_entry = { - .attr = {.name ="max_integrity_segments" , .mode =0444 }, - .show = queue_max_integrity_segments_show, -}; - -static struct queue_sysfs_entry queue_max_segment_size_entry = { - .attr = {.name ="max_segment_size" , .mode =0444 }, - .show = queue_max_segment_size_show, -}; - -static struct queue_sysfs_entry queue_iosched_entry = { - .attr = {.name ="scheduler" , .mode =0644 }, - .show = elv_iosched_show, - .store = elv_iosched_store, -}; +#ifdef CONFIG_BLK_DEV_THROTTLING_LOW +QUEUE_RW_ENTRY (blk_throtl_sample,"throttle_sample_time" ); +#endif +/* legacy alias for logical_block_size: */ static struct queue_sysfs_entry queue_hw_sector_size_entry = { .attr = {.name ="hw_sector_size" , .mode =0444 }, .show = queue_logical_block_size_show, }; -static struct queue_sysfs_entry queue_logical_block_size_entry = { - .attr = {.name ="logical_block_size" , .mode =0444 }, - .show = queue_logical_block_size_show, -}; - -static struct queue_sysfs_entry queue_physical_block_size_entry = { - .attr = {.name ="physical_block_size" , .mode =0444 }, - .show = queue_physical_block_size_show, -}; - -static struct queue_sysfs_entry queue_chunk_sectors_entry = { - .attr = {.name ="chunk_sectors" , .mode =0444 }, - .show = queue_chunk_sectors_show, -}; - -static struct queue_sysfs_entry queue_io_min_entry = { - .attr = {.name ="minimum_io_size" , .mode =0444 }, - .show = queue_io_min_show, -}; - -static struct queue_sysfs_entry queue_io_opt_entry = { - .attr = {.name ="optimal_io_size" , .mode =0444 }, - .show = queue_io_opt_show, -}; - -static struct queue_sysfs_entry queue_discard_granularity_entry = { - .attr = {.name ="discard_granularity" , .mode =0444 }, - .show = queue_discard_granularity_show, -}; - -static struct queue_sysfs_entry queue_discard_max_hw_entry = { - .attr = {.name ="discard_max_hw_bytes" , .mode =0444 }, - .show = queue_discard_max_hw_show, -}; - -static struct queue_sysfs_entry queue_discard_max_entry = { - .attr = {.name ="discard_max_bytes" , .mode =0644 }, - .show = queue_discard_max_show, - .store = queue_discard_max_store, -}; - -static struct queue_sysfs_entry queue_discard_zeroes_data_entry = { - .attr = {.name ="discard_zeroes_data" , .mode =0444 }, - .show = queue_discard_zeroes_data_show, -}; - -static struct queue_sysfs_entry queue_write_same_max_entry = { - .attr = {.name ="write_same_max_bytes" , .mode =0444 }, - .show = queue_write_same_max_show, -}; - -static struct queue_sysfs_entry queue_write_zeroes_max_entry = { - .attr = {.name ="write_zeroes_max_bytes" , .mode =0444 }, - .show = queue_write_zeroes_max_show, -}; - -static struct queue_sysfs_entry queue_zone_append_max_entry = { - .attr = {.name ="zone_append_max_bytes" , .mode =0444 }, - .show = queue_zone_append_max_show, -}; - -static struct queue_sysfs_entry queue_zoned_entry = { - .attr = {.name ="zoned" , .mode =0444 }, - .show = queue_zoned_show, -}; - -static struct queue_sysfs_entry queue_nr_zones_entry = { - .attr = {.name ="nr_zones" , .mode =0444 }, - .show = queue_nr_zones_show, -}; - -static struct queue_sysfs_entry queue_max_open_zones_entry = { - .attr = {.name ="max_open_zones" , .mode =0444 }, - .show = queue_max_open_zones_show, -}; - -static struct queue_sysfs_entry queue_max_active_zones_entry = { - .attr = {.name ="max_active_zones" , .mode =0444 }, - .show = queue_max_active_zones_show, -}; - -static struct queue_sysfs_entry queue_nomerges_entry = { - .attr = {.name ="nomerges" , .mode =0644 }, - .show = queue_nomerges_show, - .store = queue_nomerges_store, -}; - -static struct queue_sysfs_entry queue_rq_affinity_entry = { - .attr = {.name ="rq_affinity" , .mode =0644 }, - .show = queue_rq_affinity_show, - .store = queue_rq_affinity_store, -}; - -static struct queue_sysfs_entry queue_poll_entry = { - .attr = {.name ="io_poll" , .mode =0644 }, - .show = queue_poll_show, - .store = queue_poll_store, -}; - -static struct queue_sysfs_entry queue_poll_delay_entry = { - .attr = {.name ="io_poll_delay" , .mode =0644 }, - .show = queue_poll_delay_show, - .store = queue_poll_delay_store, -}; - -static struct queue_sysfs_entry queue_wc_entry = { - .attr = {.name ="write_cache" , .mode =0644 }, - .show = queue_wc_show, - .store = queue_wc_store, -}; - -static struct queue_sysfs_entry queue_fua_entry = { - .attr = {.name ="fua" , .mode =0444 }, - .show = queue_fua_show, -}; - -static struct queue_sysfs_entry queue_dax_entry = { - .attr = {.name ="dax" , .mode =0444 }, - .show = queue_dax_show, -}; - -static struct queue_sysfs_entry queue_io_timeout_entry = { - .attr = {.name ="io_timeout" , .mode =0644 }, - .show = queue_io_timeout_show, - .store = queue_io_timeout_store, -}; - -static struct queue_sysfs_entry queue_wb_lat_entry = { - .attr = {.name ="wbt_lat_usec" , .mode =0644 }, - .show = queue_wb_lat_show, - .store = queue_wb_lat_store, -}; - -#ifdef CONFIG_BLK_DEV_THROTTLING_LOW -static struct queue_sysfs_entry throtl_sample_time_entry = { - .attr = {.name ="throttle_sample_time" , .mode =0644 }, - .show = blk_throtl_sample_time_show, - .store = blk_throtl_sample_time_store, -}; -#endif -static struct attribute *queue_attrs[] = { &queue_requests_entry.attr, &queue_ra_entry.attr,
@@ -755,7 +623,7 @@ static struct attribute *queue_attrs[] = { &queue_max_discard_segments_entry.attr, &queue_max_integrity_segments_entry.attr, &queue_max_segment_size_entry.attr, - &queue_iosched_entry.attr, + &elv_iosched_entry.attr, &queue_hw_sector_size_entry.attr, &queue_logical_block_size_entry.attr, &queue_physical_block_size_entry.attr,
@@ -786,7 +654,7 @@ static struct attribute *queue_attrs[] = { &queue_poll_delay_entry.attr, &queue_io_timeout_entry.attr, #ifdef CONFIG_BLK_DEV_THROTTLING_LOW - &throtl_sample_time_entry.attr, + &blk_throtl_sample_time_entry.attr, #endif NULL, };
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 9/14 bdi: remove BDI_CAP_CGROUP_WRITEBACK
In reply to Christoph HellwigJust checking SB_I_CGROUPWB for cgroup writeback support is enough. Either the file system allocates its own bdi (e.g. btrfs), in which case it is known to support cgroup writeback, or the bdi comes from the block layer, which always supports cgroup writeback.
--- block/blk-core.c | 1 - fs/btrfs/disk-io.c | 1 - include/linux/backing-dev.h | 8 +++----- 3 files changed, 3 insertions(+), 7 deletions(-)
block/blk-core.c +0 -1
@@ -538,7 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id)if (!q->stats) goto fail_stats; - q->backing_dev_info->capabilities =BDI_CAP_CGROUP_WRITEBACK ; q->node = node_id; timer_setup(&q->backing_dev_info->laptop_mode_wb_timer,
fs/btrfs/disk-io.c +0 -1
@@ -3032,7 +3032,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device goto fail_sb_buffer; } - sb->s_bdi->capabilities |=BDI_CAP_CGROUP_WRITEBACK ; sb->s_bdi->ra_pages *=btrfs_super_num_devices (disk_super); sb->s_bdi->ra_pages =max (sb->s_bdi->ra_pages,SZ_4M /PAGE_SIZE );
include/linux/backing-dev.h +3 -5
@@ -123,7 +123,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);* BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold. * -* BDI_CAP_CGROUP_WRITEBACK: Supports cgroup-aware writeback. * BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would be * inefficient. */
@@ -233,9 +232,9 @@ int inode_congested(struct inode *inode, int cong_bits);* inode_cgwb_enabled - test whether cgroup writeback is enabled on an inode * @inode: inode of interest * -* cgroup writeback requires support from both the bdi and filesystem. -* Also, both memcg and iocg have to be on the default hierarchy. Test -* whether all conditions are met. +* Cgroup writeback requires support from the filesystem. Also, both memcg and +* iocg have to be on the default hierarchy. Test whether all conditions are +* met. * * Note that the test result may change dynamically on the same inode * depending on how memcg and iocg are configured.
@@ -247,7 +246,6 @@ static inline bool inode_cgwb_enabled(struct inode *inode)return cgroup_subsys_on_dfl (memory_cgrp_subsys) &&cgroup_subsys_on_dfl (io_cgrp_subsys) &&bdi_cap_account_dirty (bdi) && - (bdi->capabilities &BDI_CAP_CGROUP_WRITEBACK ) && (inode->i_sb->s_iflags &SB_I_CGROUPWB ); }
Signature · 1 line
2.27.0
Christoph Hellwig
maintainerPATCH 10/14 bdi: remove BDI_CAP_SYNCHRONOUS_IO
In reply to Christoph HellwigBDI_CAP_SYNCHRONOUS_IO is only checked in the swap code, and used to decided if ->rw_page can be used on a block device. Just check up for the method instead. The only complication is that zram needs a second set of block_device_operations as it can switch between modes that actually support ->rw_page and those who don't.
--- drivers/block/brd.c | 1 - drivers/block/zram/zram_drv.c | 19 +++++++++++++------ drivers/nvdimm/btt.c | 2 -- drivers/nvdimm/pmem.c | 1 - include/linux/backing-dev.h | 9 --------- mm/swapfile.c | 2 +- 6 files changed, 14 insertions(+), 20 deletions(-)
drivers/block/brd.c +0 -1
@@ -403,7 +403,6 @@ static struct brd_device *brd_alloc(int i) disk->flags =GENHD_FL_EXT_DEVT ;sprintf (disk->disk_name,"ram%d" , i);set_capacity (disk, rd_size *2 ); - brd->brd_queue->backing_dev_info->capabilities |=BDI_CAP_SYNCHRONOUS_IO ;/* Tell the block layer that this is not a rotational device */ blk_queue_flag_set (QUEUE_FLAG_NONROT , brd->brd_queue);
drivers/block/zram/zram_drv.c +13 -6
@@ -52,6 +52,9 @@ static unsigned int num_devices = 1;*/ static size_t huge_class_size; +static const struct block_device_operations zram_devops; +static const struct block_device_operations zram_wb_devops; +static void zram_free_page (struct zram *zram,size_t index);static int zram_bvec_read (struct zram *zram,struct bio_vec *bvec,u32 index,int offset,struct bio *bio);
@@ -408,8 +411,7 @@ static void reset_bdev(struct zram *zram) zram->backing_dev =NULL ; zram->old_block_size =0 ; zram->bdev =NULL ; - zram->disk->queue->backing_dev_info->capabilities |= -BDI_CAP_SYNCHRONOUS_IO ; + zram->disk->fops = &zram_devops;kvfree (zram->bitmap); zram->bitmap =NULL ; }
@@ -528,8 +530,7 @@ static ssize_t backing_dev_store(struct device *dev,* freely but in fact, IO is going on so finally could cause * use-after-free when the IO is really done. */ - zram->disk->queue->backing_dev_info->capabilities &= - ~BDI_CAP_SYNCHRONOUS_IO ; + zram->disk->fops = &zram_wb_devops;up_write (&zram->init_lock);pr_info ("setup backing device %s\n" , file_name);
@@ -1819,6 +1820,13 @@ static const struct block_device_operations zram_devops = { .owner = THIS_MODULE }; +static const struct block_device_operations zram_wb_devops = { + .open = zram_open, + .submit_bio = zram_submit_bio, + .swap_slot_free_notify = zram_slot_free_notify, + .owner =THIS_MODULE +}; +static DEVICE_ATTR_WO (compact);static DEVICE_ATTR_RW (disksize);static DEVICE_ATTR_RO (initstate);
@@ -1946,8 +1954,7 @@ static int zram_add(void)if (ZRAM_LOGICAL_BLOCK_SIZE ==PAGE_SIZE )blk_queue_max_write_zeroes_sectors (zram->disk->queue,UINT_MAX ); - zram->disk->queue->backing_dev_info->capabilities |= - (BDI_CAP_STABLE_WRITES |BDI_CAP_SYNCHRONOUS_IO ); + zram->disk->queue->backing_dev_info->capabilities |=BDI_CAP_STABLE_WRITES ;device_add_disk (NULL , zram->disk, zram_disk_attr_groups);strlcpy (zram->compressor, default_compressor,sizeof (zram->compressor));
drivers/nvdimm/btt.c +0 -2
@@ -1540,8 +1540,6 @@ static int btt_blk_init(struct btt *btt) btt->btt_disk->private_data = btt; btt->btt_disk->queue = btt->btt_queue; btt->btt_disk->flags =GENHD_FL_EXT_DEVT ; - btt->btt_disk->queue->backing_dev_info->capabilities |= -BDI_CAP_SYNCHRONOUS_IO ;blk_queue_logical_block_size (btt->btt_queue, btt->sector_size);blk_queue_max_hw_sectors (btt->btt_queue,UINT_MAX );
drivers/nvdimm/pmem.c +0 -1
@@ -478,7 +478,6 @@ static int pmem_attach_disk(struct device *dev, disk->queue = q; disk->flags =GENHD_FL_EXT_DEVT ; disk->private_data = pmem; - disk->queue->backing_dev_info->capabilities |=BDI_CAP_SYNCHRONOUS_IO ;nvdimm_namespace_disk_name (ndns, disk->disk_name);set_capacity (disk, (pmem->size - pmem->pfn_pad - pmem->data_offset) /512 );
include/linux/backing-dev.h +0 -9
@@ -122,9 +122,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);* BDI_CAP_NO_WRITEBACK: Don't write pages back * BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold. -* -* BDI_CAP_SYNCHRONOUS_IO: Device is so fast that asynchronous IO would be -* inefficient. */ #define BDI_CAP_NO_ACCT_DIRTY 0x00000001#define BDI_CAP_NO_WRITEBACK 0x00000002
@@ -132,7 +129,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);#define BDI_CAP_STABLE_WRITES 0x00000008#define BDI_CAP_STRICTLIMIT 0x00000010#define BDI_CAP_CGROUP_WRITEBACK 0x00000020 -#define BDI_CAP_SYNCHRONOUS_IO 0x00000040#define BDI_CAP_NO_ACCT_AND_WRITEBACK \ (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB)
@@ -174,11 +170,6 @@ static inline int wb_congested(struct bdi_writeback *wb, int cong_bits)long congestion_wait (int sync,long timeout);long wait_iff_congested (int sync,long timeout); -static inline bool bdi_cap_synchronous_io (struct backing_dev_info *bdi) -{ -return bdi->capabilities &BDI_CAP_SYNCHRONOUS_IO ; -} -static inline bool bdi_cap_stable_pages_required (struct backing_dev_info *bdi) {return bdi->capabilities &BDI_CAP_STABLE_WRITES ;
mm/swapfile.c +1 -1
@@ -3230,7 +3230,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)if (bdi_cap_stable_pages_required (inode_to_bdi (inode))) p->flags |=SWP_STABLE_WRITES ; -if (bdi_cap_synchronous_io (inode_to_bdi (inode))) +if (p->bdev && p->bdev->bd_disk->fops->rw_page) p->flags |=SWP_SYNCHRONOUS_IO ;if (p->bdev &&blk_queue_nonrot (bdev_get_queue (p->bdev))) {
Signature · 1 line
2.27.0
Re: [PATCH 10/14] bdi: remove BDI_CAP_SYNCHRONOUS_IO
Looks good,
Christoph Hellwig
maintainerPATCH 11/14 mm: use SWP_SYNCHRONOUS_IO more intelligently
In reply to Christoph HellwigThere is no point in trying to call bdev_read_page if SWP_SYNCHRONOUS_IO is not set, as the device won't support it.
--- mm/page_io.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
mm/page_io.c +10 -8
@@ -403,15 +403,17 @@ int swap_readpage(struct page *page, bool synchronous) goto out; } - ret =bdev_read_page (sis->bdev,swap_page_sector (page), page); -if (!ret) { -if (trylock_page (page)) { -swap_slot_free_notify (page); -unlock_page (page); - } +if (sis->flags &SWP_SYNCHRONOUS_IO ) { + ret =bdev_read_page (sis->bdev,swap_page_sector (page), page); +if (!ret) { +if (trylock_page (page)) { +swap_slot_free_notify (page); +unlock_page (page); + } -count_vm_event (PSWPIN ); - goto out; +count_vm_event (PSWPIN ); + goto out; + } } ret =0 ;
Signature · 1 line
2.27.0
Re: [PATCH 11/14] mm: use SWP_SYNCHRONOUS_IO more intelligently
Looks good,
Christoph Hellwig
maintainerPATCH 12/14 bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag
In reply to Christoph HellwigThe BDI_CAP_STABLE_WRITES is one of the few bits of information in the backing_dev_info shared between the block drivers and the writeback code. To help untangling the dependency replace it with a queue flag and a superblock flag derived from it. This also helps with the case of e.g. a file system requiring stable writes due to its own checksumming, but not forcing it on other users of the block device like the swap code.
One downside is that we can't support the stable_pages_required bdi attribute in sysfs anymore. It is replaced with a queue attribute, that can also be made writable for easier testing.
--- block/blk-integrity.c | 4 ++-- block/blk-mq-debugfs.c | 1 + block/blk-sysfs.c | 2 ++ drivers/block/rbd.c | 2 +- drivers/block/zram/zram_drv.c | 2 +- drivers/md/dm-table.c | 6 +++--- drivers/md/raid5.c | 8 ++++---- drivers/mmc/core/queue.c | 3 +-- drivers/nvme/host/core.c | 3 +-- drivers/nvme/host/multipath.c | 10 +++------- drivers/scsi/iscsi_tcp.c | 4 ++-- fs/super.c | 2 ++ include/linux/backing-dev.h | 6 ------ include/linux/blkdev.h | 3 +++ include/linux/fs.h | 1 + mm/backing-dev.c | 6 ++---- mm/page-writeback.c | 2 +- mm/swapfile.c | 2 +- 18 files changed, 31 insertions(+), 36 deletions(-)
block/blk-integrity.c +2 -2
@@ -408,7 +408,7 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template bi->tuple_size = template->tuple_size; bi->tag_size = template->tag_size; - disk->queue->backing_dev_info->capabilities |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , disk->queue);#ifdef CONFIG_BLK_INLINE_ENCRYPTION if (disk->queue->ksm) {
@@ -428,7 +428,7 @@ EXPORT_SYMBOL(blk_integrity_register);*/ void blk_integrity_unregister (struct gendisk *disk) { - disk->queue->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES ; +blk_queue_flag_clear (QUEUE_FLAG_STABLE_WRITES , disk->queue);memset (&disk->queue->integrity,0 ,sizeof (struct blk_integrity )); }EXPORT_SYMBOL (blk_integrity_unregister);
block/blk-mq-debugfs.c +1 -0
@@ -116,6 +116,7 @@ static const char *const blk_queue_flag_name[] = {QUEUE_FLAG_NAME (SAME_FORCE ),QUEUE_FLAG_NAME (DEAD ),QUEUE_FLAG_NAME (INIT_DONE ), +QUEUE_FLAG_NAME (STABLE_WRITES ),QUEUE_FLAG_NAME (POLL ),QUEUE_FLAG_NAME (WC ), QUEUE_FLAG_NAME(FUA),
block/blk-sysfs.c +2 -0
@@ -291,6 +291,7 @@ static struct queue_sysfs_entry queue_##_name##_entry = { \QUEUE_SYSFS_BIT_FNS (nonrot,NONROT ,1 );QUEUE_SYSFS_BIT_FNS (random,ADD_RANDOM ,0 );QUEUE_SYSFS_BIT_FNS (iostats,IO_STAT ,0 ); +QUEUE_SYSFS_BIT_FNS (stable_writes,STABLE_WRITES ,0 );#undef QUEUE_SYSFS_BIT_FNSstatic ssize_t queue_zoned_show (struct request_queue *q,char *page)
@@ -645,6 +646,7 @@ static struct attribute *queue_attrs[] = { &queue_nomerges_entry.attr, &queue_rq_affinity_entry.attr, &queue_iostats_entry.attr, + &queue_stable_writes_entry.attr, &queue_random_entry.attr, &queue_poll_entry.attr, &queue_wc_entry.attr,
drivers/block/rbd.c +1 -1
@@ -5022,7 +5022,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) }if (!ceph_test_opt (rbd_dev->rbd_client->client,NOCRC )) - q->backing_dev_info->capabilities |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , q);/* * disk_release() expects a queue ref from add_disk() and will
drivers/block/zram/zram_drv.c +1 -1
@@ -1954,7 +1954,7 @@ static int zram_add(void)if (ZRAM_LOGICAL_BLOCK_SIZE ==PAGE_SIZE )blk_queue_max_write_zeroes_sectors (zram->disk->queue,UINT_MAX ); - zram->disk->queue->backing_dev_info->capabilities |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , zram->disk->queue);device_add_disk (NULL , zram->disk, zram_disk_attr_groups);strlcpy (zram->compressor, default_compressor,sizeof (zram->compressor));
drivers/md/dm-table.c +3 -3
@@ -1815,7 +1815,7 @@ static int device_requires_stable_pages(struct dm_target *ti, {struct request_queue *q =bdev_get_queue (dev->bdev); -return q &&bdi_cap_stable_pages_required (q->backing_dev_info); +return q &&blk_queue_stable_writes (q); }/*
@@ -1900,9 +1900,9 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,* because they do their own checksumming. */ if (dm_table_requires_stable_pages (t)) - q->backing_dev_info->capabilities |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , q);else - q->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES ; +blk_queue_flag_clear (QUEUE_FLAG_STABLE_WRITES , q);/* * Determine whether or not this queue's I/O timings contribute
drivers/md/raid5.c +4 -4
@@ -6536,14 +6536,14 @@ raid5_store_skip_copy(struct mddev *mddev, const char *page, size_t len)if (!conf) err = -ENODEV ;else if (new != conf->skip_copy) { +struct request_queue *q = mddev->queue; +mddev_suspend (mddev); conf->skip_copy = new;if (new) - mddev->queue->backing_dev_info->capabilities |= -BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , q);else - mddev->queue->backing_dev_info->capabilities &= - ~BDI_CAP_STABLE_WRITES ; +blk_queue_flag_clear (QUEUE_FLAG_STABLE_WRITES , q);mddev_resume (mddev); }mddev_unlock (mddev);
drivers/mmc/core/queue.c +1 -2
@@ -472,8 +472,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card) }if (mmc_host_is_spi (host) && host->use_spi_crc) - mq->queue->backing_dev_info->capabilities |= -BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , mq->queue); mq->queue->queuedata = mq;blk_queue_rq_timeout (mq->queue,60 *HZ );
drivers/nvme/host/core.c +1 -2
@@ -3836,8 +3836,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) goto out_free_ns;if (ctrl->opts && ctrl->opts->data_digest) - ns->queue->backing_dev_info->capabilities - |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , ns->queue);blk_queue_flag_set (QUEUE_FLAG_NONROT , ns->queue);if (ctrl->ops->flags &NVME_F_PCI_P2PDMA )
drivers/nvme/host/multipath.c +3 -7
@@ -669,13 +669,9 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)nvme_mpath_set_live (ns); } -if (bdi_cap_stable_pages_required (ns->queue->backing_dev_info)) { -struct gendisk *disk = ns->head->disk; - -if (disk) - disk->queue->backing_dev_info->capabilities |= -BDI_CAP_STABLE_WRITES ; - } +if (blk_queue_stable_writes (ns->queue) && ns->head->disk) +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , + ns->head->disk->queue); }void nvme_mpath_remove_disk (struct nvme_ns_head *head)
drivers/scsi/iscsi_tcp.c +2 -2
@@ -962,8 +962,8 @@ static int iscsi_sw_tcp_slave_configure(struct scsi_device *sdev)struct iscsi_conn *conn = session->leadconn;if (conn->datadgst_en) - sdev->request_queue->backing_dev_info->capabilities - |=BDI_CAP_STABLE_WRITES ; +blk_queue_flag_set (QUEUE_FLAG_STABLE_WRITES , + sdev->request_queue);blk_queue_dma_alignment (sdev->request_queue,0 );return 0 ; }
fs/super.c +2 -0
@@ -1256,6 +1256,8 @@ static int set_bdev_super(struct super_block *s, void *data) s->s_dev = s->s_bdev->bd_dev; s->s_bdi =bdi_get (s->s_bdev->bd_bdi); +if (blk_queue_stable_writes (s->s_bdev->bd_disk->queue)) + s->s_iflags |=SB_I_STABLE_WRITES ;return 0 ; }
include/linux/backing-dev.h +0 -6
@@ -126,7 +126,6 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);#define BDI_CAP_NO_ACCT_DIRTY 0x00000001#define BDI_CAP_NO_WRITEBACK 0x00000002#define BDI_CAP_NO_ACCT_WB 0x00000004 -#define BDI_CAP_STABLE_WRITES 0x00000008#define BDI_CAP_STRICTLIMIT 0x00000010#define BDI_CAP_CGROUP_WRITEBACK 0x00000020
@@ -170,11 +169,6 @@ static inline int wb_congested(struct bdi_writeback *wb, int cong_bits)long congestion_wait (int sync,long timeout);long wait_iff_congested (int sync,long timeout); -static inline bool bdi_cap_stable_pages_required (struct backing_dev_info *bdi) -{ -return bdi->capabilities &BDI_CAP_STABLE_WRITES ; -} -static inline bool bdi_cap_writeback_dirty (struct backing_dev_info *bdi) {return !(bdi->capabilities &BDI_CAP_NO_WRITEBACK );
include/linux/blkdev.h +3 -0
@@ -603,6 +603,7 @@ struct request_queue {#define QUEUE_FLAG_SAME_FORCE 12/* force complete on same CPU */ #define QUEUE_FLAG_DEAD 13/* queue tear-down finished */ #define QUEUE_FLAG_INIT_DONE 14/* queue is initialized */ +#define QUEUE_FLAG_STABLE_WRITES 15/* don't modify blks until WB is done */ #define QUEUE_FLAG_POLL 16/* IO polling enabled if set */ #define QUEUE_FLAG_WC 17/* Write back caching */ #define QUEUE_FLAG_FUA 18/* device supports FUA writes */
@@ -631,6 +632,8 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);#define blk_queue_noxmerges (q) \ test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags)#define blk_queue_nonrot (q) test_bit(QUEUE_FLAG_NONROT, &(q)->queue_flags) +#define blk_queue_stable_writes (q) \ + test_bit(QUEUE_FLAG_STABLE_WRITES, &(q)->queue_flags)#define blk_queue_io_stat (q) test_bit(QUEUE_FLAG_IO_STAT, &(q)->queue_flags)#define blk_queue_add_random (q) test_bit(QUEUE_FLAG_ADD_RANDOM, &(q)->queue_flags)#define blk_queue_discard (q) test_bit(QUEUE_FLAG_DISCARD, &(q)->queue_flags)
include/linux/fs.h +1 -0
@@ -1366,6 +1366,7 @@ extern int send_sigurg(struct fown_struct *fown);#define SB_I_CGROUPWB 0x00000001/* cgroup-aware writeback enabled */ #define SB_I_NOEXEC 0x00000002/* Ignore executables on this fs */ #define SB_I_NODEV 0x00000004/* Ignore devices on this fs */ +#define SB_I_STABLE_WRITES 0x00000008/* don't modify blks until WB is done */ /* sb->s_iflags to limit user namespace mounts */ #define SB_I_USERNS_VISIBLE 0x00000010/* fstype already mounted */
mm/backing-dev.c +2 -4
@@ -204,10 +204,8 @@ static ssize_t stable_pages_required_show(struct device *dev, struct device_attribute *attr, char *page) { - struct backing_dev_info *bdi = dev_get_drvdata(dev); - -return snprintf (page,PAGE_SIZE -1 ,"%d\n" , -bdi_cap_stable_pages_required (bdi) ?1 :0 ); + pr_info_once("the stable_pages_required attribute has been deprecated\n"); +return snprintf (page,PAGE_SIZE -1 ,"%d\n" ,0 ); }static DEVICE_ATTR_RO (stable_pages_required);
mm/page-writeback.c +1 -1
@@ -2851,7 +2851,7 @@ EXPORT_SYMBOL_GPL(wait_on_page_writeback);*/ void wait_for_stable_page (struct page *page) { -if (bdi_cap_stable_pages_required (inode_to_bdi (page->mapping->host))) +if (page->mapping->host->i_sb->s_iflags &SB_I_STABLE_WRITES )wait_on_page_writeback (page); }EXPORT_SYMBOL_GPL (wait_for_stable_page);
mm/swapfile.c +1 -1
@@ -3227,7 +3227,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } -if (bdi_cap_stable_pages_required (inode_to_bdi (inode))) +if (p->bdev &&blk_queue_stable_writes (p->bdev->bd_disk->queue)) p->flags |=SWP_STABLE_WRITES ;if (p->bdev && p->bdev->bd_disk->fops->rw_page)
Signature · 1 line
2.27.0
Re: [PATCH 12/14] bdi: replace BDI_CAP_STABLE_WRITES with a queue and a sb flag
Christoph Hellwig
maintainerPATCH 13/14 bdi: invert BDI_CAP_NO_ACCT_WB
In reply to Christoph HellwigReplace BDI_CAP_NO_ACCT_WB with a positive BDI_CAP_WRITEBACK_ACCT to make the checks more obvious. Also remove the pointless bdi_cap_account_writeback wrapper that just obsfucates the check.
--- fs/fuse/inode.c | 3 ++- include/linux/backing-dev.h | 13 +++---------- mm/backing-dev.c | 1 + mm/page-writeback.c | 4 ++-- 4 files changed, 8 insertions(+), 13 deletions(-)
fs/fuse/inode.c +2 -1
@@ -1050,7 +1050,8 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb)return err;/* fuse does it's own writeback accounting */ - sb->s_bdi->capabilities =BDI_CAP_NO_ACCT_WB |BDI_CAP_STRICTLIMIT ; + sb->s_bdi->capabilities &= ~BDI_CAP_WRITEBACK_ACCT ; + sb->s_bdi->capabilities |=BDI_CAP_STRICTLIMIT ;/* * For a single fuse filesystem use max 1% of dirty +
include/linux/backing-dev.h +3 -10
@@ -120,17 +120,17 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);* * BDI_CAP_NO_ACCT_DIRTY: Dirty pages shouldn't contribute to accounting * BDI_CAP_NO_WRITEBACK: Don't write pages back -* BDI_CAP_NO_ACCT_WB: Don't automatically account writeback pages +* BDI_CAP_WRITEBACK_ACCT: Automatically account writeback pages * BDI_CAP_STRICTLIMIT: Keep number of dirty pages below bdi threshold. */ #define BDI_CAP_NO_ACCT_DIRTY 0x00000001#define BDI_CAP_NO_WRITEBACK 0x00000002 -#define BDI_CAP_NO_ACCT_WB 0x00000004 +#define BDI_CAP_WRITEBACK_ACCT 0x00000004#define BDI_CAP_STRICTLIMIT 0x00000010#define BDI_CAP_CGROUP_WRITEBACK 0x00000020#define BDI_CAP_NO_ACCT_AND_WRITEBACK \ - (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY | BDI_CAP_NO_ACCT_WB) + (BDI_CAP_NO_WRITEBACK | BDI_CAP_NO_ACCT_DIRTY)extern struct backing_dev_info noop_backing_dev_info;
@@ -179,13 +179,6 @@ static inline bool bdi_cap_account_dirty(struct backing_dev_info *bdi)return !(bdi->capabilities &BDI_CAP_NO_ACCT_DIRTY ); } -static inline bool bdi_cap_account_writeback (struct backing_dev_info *bdi) -{ -/* Paranoia: BDI_CAP_NO_WRITEBACK implies BDI_CAP_NO_ACCT_WB */ -return !(bdi->capabilities & (BDI_CAP_NO_ACCT_WB | -BDI_CAP_NO_WRITEBACK )); -} -static inline bool mapping_cap_writeback_dirty (struct address_space *mapping) {return bdi_cap_writeback_dirty (inode_to_bdi (mapping->host));
mm/backing-dev.c +1 -0
@@ -744,6 +744,7 @@ struct backing_dev_info *bdi_alloc(int node_id)kfree (bdi);return NULL ; } + bdi->capabilities =BDI_CAP_WRITEBACK_ACCT ; bdi->ra_pages =VM_READAHEAD_PAGES ;return bdi; }
mm/page-writeback.c +2 -2
@@ -2740,7 +2740,7 @@ int test_clear_page_writeback(struct page *page)if (ret) {__xa_clear_mark (&mapping->i_pages,page_index (page),PAGECACHE_TAG_WRITEBACK ); -if (bdi_cap_account_writeback (bdi)) { +if (bdi->capabilities &BDI_CAP_WRITEBACK_ACCT ) {struct bdi_writeback *wb =inode_to_wb (inode);dec_wb_stat (wb,WB_WRITEBACK );
@@ -2793,7 +2793,7 @@ int __test_set_page_writeback(struct page *page, bool keep_write) PAGECACHE_TAG_WRITEBACK);xas_set_mark (&xas,PAGECACHE_TAG_WRITEBACK ); -if (bdi_cap_account_writeback (bdi)) +if (bdi->capabilities &BDI_CAP_WRITEBACK_ACCT )inc_wb_stat (inode_to_wb (inode),WB_WRITEBACK );/*
Signature · 1 line
2.27.0
Re: [PATCH 13/14] bdi: invert BDI_CAP_NO_ACCT_WB
Looks good,
Christoph Hellwig
maintainerPATCH 14/14 bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag
In reply to Christoph HellwigReplace the two negative flags that are always used together with a single positive flag that indicates the writeback capability instead of two related non-capabilities. Also remove the pointless wrappers to just check the flag.
--- fs/9p/vfs_file.c | 2 +- fs/fs-writeback.c | 7 +++--- include/linux/backing-dev.h | 48 ++++++++----------------------------- mm/backing-dev.c | 6 ++--- mm/filemap.c | 4 ++-- mm/memcontrol.c | 2 +- mm/memory-failure.c | 2 +- mm/migrate.c | 2 +- mm/mmap.c | 2 +- mm/page-writeback.c | 12 +++++----- 10 files changed, 29 insertions(+), 58 deletions(-)
fs/9p/vfs_file.c +1 -1
@@ -625,7 +625,7 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma) inode =file_inode (vma->vm_file); -if (!mapping_cap_writeback_dirty (inode->i_mapping)) +if (!mapping_can_writeback (inode->i_mapping)) wbc.nr_to_write =0 ;might_sleep ();
fs/fs-writeback.c +4 -3
@@ -2318,7 +2318,7 @@ void __mark_inode_dirty(struct inode *inode, int flags) wb =locked_inode_to_wb_and_lock_list (inode); -WARN (bdi_cap_writeback_dirty (wb->bdi) && +WARN ((wb->bdi->capabilities &BDI_CAP_WRITEBACK ) && !test_bit (WB_registered, &wb->state),"bdi-%s not registered\n" ,bdi_dev_name (wb->bdi));
@@ -2343,7 +2343,8 @@ void __mark_inode_dirty(struct inode *inode, int flags)* to make sure background write-back happens * later. */ -if (bdi_cap_writeback_dirty (wb->bdi) && wakeup_bdi) +if (wakeup_bdi && + (wb->bdi->capabilities &BDI_CAP_WRITEBACK ))wb_wakeup_delayed (wb);return ; }
@@ -2578,7 +2579,7 @@ int write_inode_now(struct inode *inode, int sync) .range_end = LLONG_MAX, }; -if (!mapping_cap_writeback_dirty (inode->i_mapping)) +if (!mapping_can_writeback (inode->i_mapping)) wbc.nr_to_write =0 ;might_sleep ();
include/linux/backing-dev.h +10 -38
68 lines not on this page · raw message
mm/backing-dev.c +2 -4
@@ -14,9 +14,7 @@#include <linux/device.h> #include <trace/events/writeback.h> -struct backing_dev_info noop_backing_dev_info = { - .capabilities =BDI_CAP_NO_ACCT_AND_WRITEBACK , -}; +struct backing_dev_info noop_backing_dev_info;EXPORT_SYMBOL_GPL (noop_backing_dev_info);static struct class *bdi_class;
@@ -744,7 +742,7 @@ struct backing_dev_info *bdi_alloc(int node_id)kfree (bdi);return NULL ; } - bdi->capabilities =BDI_CAP_WRITEBACK_ACCT ; + bdi->capabilities =BDI_CAP_WRITEBACK |BDI_CAP_WRITEBACK_ACCT ; bdi->ra_pages =VM_READAHEAD_PAGES ;return bdi; }
mm/filemap.c +2 -2
@@ -413,7 +413,7 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start, .range_end = end, }; -if (!mapping_cap_writeback_dirty (mapping) || +if (!mapping_can_writeback (mapping) || !mapping_tagged (mapping,PAGECACHE_TAG_DIRTY ))return 0 ;
@@ -1634,7 +1634,7 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index, no_page:if (!page && (fgp_flags &FGP_CREAT )) {int err; -if ((fgp_flags &FGP_WRITE ) &&mapping_cap_account_dirty (mapping)) +if ((fgp_flags &FGP_WRITE ) &&mapping_can_writeback (mapping)) gfp_mask |= __GFP_WRITE;if (fgp_flags &FGP_NOFS ) gfp_mask &= ~__GFP_FS;
mm/memcontrol.c +1 -1
@@ -5419,7 +5419,7 @@ static int mem_cgroup_move_account(struct page *page,if (PageDirty (page)) {struct address_space *mapping =page_mapping (page); -if (mapping_cap_account_dirty (mapping)) { +if (mapping_can_writeback (mapping)) {__mod_lruvec_state (from_vec,NR_FILE_DIRTY , -nr_pages); __mod_lruvec_state(to_vec, NR_FILE_DIRTY,
mm/memory-failure.c +1 -1
@@ -1006,7 +1006,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn,*/ mapping =page_mapping (hpage);if (!(flags &MF_MUST_KILL ) && !PageDirty (hpage) && mapping && -mapping_cap_writeback_dirty (mapping)) { +mapping_can_writeback (mapping)) {if (page_mkclean (hpage)) {SetPageDirty (hpage); }else {
mm/migrate.c +1 -1
@@ -503,7 +503,7 @@ int migrate_page_move_mapping(struct address_space *mapping,__dec_lruvec_state (old_lruvec,NR_SHMEM );__inc_lruvec_state (new_lruvec,NR_SHMEM ); } -if (dirty &&mapping_cap_account_dirty (mapping)) { +if (dirty &&mapping_can_writeback (mapping)) {__dec_node_state (oldzone->zone_pgdat,NR_FILE_DIRTY );__dec_zone_state (oldzone,NR_ZONE_WRITE_PENDING );__inc_node_state (newzone->zone_pgdat,NR_FILE_DIRTY );
mm/mmap.c +1 -1
@@ -1665,7 +1665,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot)/* Can the mapping track the dirty pages? */ return vma->vm_file && vma->vm_file->f_mapping && -mapping_cap_account_dirty (vma->vm_file->f_mapping); +mapping_can_writeback (vma->vm_file->f_mapping); }/*
mm/page-writeback.c +6 -6
@@ -1882,7 +1882,7 @@ void balance_dirty_pages_ratelimited(struct address_space *mapping)int ratelimit;int *p; -if (!bdi_cap_account_dirty (bdi)) +if (!(bdi->capabilities &BDI_CAP_WRITEBACK ))return ;if (inode_cgwb_enabled (inode))
@@ -2425,7 +2425,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping)trace_writeback_dirty_page (page, mapping); -if (mapping_cap_account_dirty (mapping)) { +if (mapping_can_writeback (mapping)) {struct bdi_writeback *wb;inode_attach_wb (inode, page);
@@ -2452,7 +2452,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping)void account_page_cleaned (struct page *page,struct address_space *mapping,struct bdi_writeback *wb) { -if (mapping_cap_account_dirty (mapping)) { +if (mapping_can_writeback (mapping)) {dec_lruvec_page_state (page,NR_FILE_DIRTY );dec_zone_page_state (page,NR_ZONE_WRITE_PENDING );dec_wb_stat (wb,WB_RECLAIMABLE );
@@ -2515,7 +2515,7 @@ void account_page_redirty(struct page *page) {struct address_space *mapping = page->mapping; -if (mapping &&mapping_cap_account_dirty (mapping)) { +if (mapping &&mapping_can_writeback (mapping)) {struct inode *inode = mapping->host;struct bdi_writeback *wb;struct wb_lock_cookie cookie = {};
@@ -2627,7 +2627,7 @@ void __cancel_dirty_page(struct page *page) {struct address_space *mapping =page_mapping (page); -if (mapping_cap_account_dirty (mapping)) { +if (mapping_can_writeback (mapping)) {struct inode *inode = mapping->host;struct bdi_writeback *wb;struct wb_lock_cookie cookie = {};
@@ -2667,7 +2667,7 @@ int clear_page_dirty_for_io(struct page *page)VM_BUG_ON_PAGE (!PageLocked (page), page); -if (mapping &&mapping_cap_account_dirty (mapping)) { +if (mapping &&mapping_can_writeback (mapping)) {struct inode *inode = mapping->host;struct bdi_writeback *wb;struct wb_lock_cookie cookie = {};
Signature · 1 line
2.27.0
Re: [PATCH 14/14] bdi: replace BDI_CAP_NO_{WRITEBACK,ACCT_DIRTY} with a single flag
Looks good,
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series contains a bunch of different BDI cleanups. The biggest item is to isolate block drivers from the BDI in preparation of changing the lifetime of the block device BDI in a follow up series.
Applied, thanks.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerQuoted 8 lines · Jens Axboe
Quoted 5 lines · Christoph Hellwig
Hi Jens,
this series contains a bunch of different BDI cleanups. The biggest item is to isolate block drivers from the BDI in preparation of changing the lifetime of the block device BDI in a follow up series.
Applied, thanks.
Dropped:
CC block/blk-sysfs.oblock/blk-sysfs.c:608:16: error: ‘blk_throtl_sample_show’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_entry’?
608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time");
| ^~~~~~~~~~~~~~~~~
block/blk-sysfs.c:563:10: note: in definition of macro ‘QUEUE_RW_ENTRY’
563 | .show = _prefix##_show, \
| ^~~~~~~
block/blk-sysfs.c:608:16: error: ‘blk_throtl_sample_store’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_entry’?
608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time");
| ^~~~~~~~~~~~~~~~~
block/blk-sysfs.c:564:11: note: in definition of macro ‘QUEUE_RW_ENTRY’
564 | .store = _prefix##_store, \
| ^~~~~~~
block/blk-sysfs.c:657:3: error: ‘blk_throtl_sample_time_entry’ undeclared here (not in a function); did you mean ‘blk_throtl_sample_time_store’?
657 | &blk_throtl_sample_time_entry.attr,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
| blk_throtl_sample_time_store
block/blk-sysfs.c:608:16: warning: ‘blk_throtl_sample_entry’ defined but not used [-Wunused-variable]
608 | QUEUE_RW_ENTRY(blk_throtl_sample, "throttle_sample_time");
| ^~~~~~~~~~~~~~~~~block/blk-sysfs.c:561:33: note: in definition of macro ‘QUEUE_RW_ENTRY’
561 | static struct queue_sysfs_entry _prefix##_entry = { \
| ^~~~~~~
make[1]: *** [scripts/Makefile.build:281: block/blk-sysfs.o] Error 1
make: *** [Makefile:1756: block] Error 2
from "block: add helper macros for queue sysfs entries"
This has not seen a full compile test even...
Signature · 1 line
Jens Axboe