@@ -19,6 +19,7 @@
#include <linux/crc32c.h>
#include <linux/sched/mm.h>
#include <asm/unaligned.h>
+#include <linux/ioprio.h>
#include "ctree.h"
#include "disk-io.h"
#include "transaction.h"
@@ -3603,6 +3604,7 @@ static void write_dev_flush(struct btrfs_device *device)
bio_reset(bio);
bio->bi_end_io = btrfs_end_empty_barrier;
bio_set_dev(bio, device->bdev);
+ bio_set_prio(bio, get_current_ioprio());
bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;
init_completion(&device->flush_wait);
bio->bi_private = &device->flush_wait;
@@ -13,6 +13,7 @@
#include <linux/pagevec.h>
#include <linux/prefetch.h>
#include <linux/cleancache.h>
+#include <linux/ioprio.h>
#include "extent_io.h"
#include "extent_map.h"
#include "ctree.h"
@@ -160,6 +161,7 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num,
start = page_offset(bv.bv_page) + bv.bv_offset;
bio->bi_private = NULL;
+ bio_set_prio(bio, get_current_ioprio());
if (tree->ops)
ret = tree->ops->submit_bio_hook(tree->private_data, bio,
@@ -2043,6 +2045,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
bio_set_dev(bio, dev->bdev);
bio->bi_opf = REQ_OP_WRITE | REQ_SYNC;
bio_add_page(bio, page, length, pg_offset);
+ bio_set_prio(bio, get_current_ioprio());
if (btrfsic_submit_bio_wait(bio)) {
/* try to remap that extent elsewhere? */
@@ -13,6 +13,7 @@
#include <linux/list_sort.h>
#include <linux/raid/xor.h>
#include <linux/mm.h>
+#include <linux/ioprio.h>
#include "ctree.h"
#include "disk-io.h"
#include "volumes.h"
@@ -1324,6 +1325,7 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio)
bio->bi_private = rbio;
bio->bi_end_io = raid_write_end_io;
bio->bi_opf = REQ_OP_WRITE;
+ bio_set_prio(bio, get_current_ioprio());
submit_bio(bio);
}
@@ -1567,6 +1569,7 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio)
bio->bi_private = rbio;
bio->bi_end_io = raid_rmw_end_io;
bio->bi_opf = REQ_OP_READ;
+ bio_set_prio(bio, get_current_ioprio());
btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
@@ -2114,6 +2117,7 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio)
bio->bi_private = rbio;
bio->bi_end_io = raid_recover_end_io;
bio->bi_opf = REQ_OP_READ;
+ bio_set_prio(bio, get_current_ioprio());
btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
@@ -2487,6 +2491,7 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio,
bio->bi_private = rbio;
bio->bi_end_io = raid_write_end_io;
bio->bi_opf = REQ_OP_WRITE;
+ bio_set_prio(bio, get_current_ioprio());
submit_bio(bio);
}
@@ -2669,6 +2674,7 @@ static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio)
bio->bi_private = rbio;
bio->bi_end_io = raid56_parity_scrub_end_io;
bio->bi_opf = REQ_OP_READ;
+ bio_set_prio(bio, get_current_ioprio());
btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
@@ -1485,6 +1485,7 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info,
WARN_ON(!page->page);
bio = btrfs_io_bio_alloc(1);
bio_set_dev(bio, page->dev->bdev);
+ bio_set_prio(bio, get_current_ioprio());
bio_add_page(bio, page->page, PAGE_SIZE, 0);
bio->bi_iter.bi_sector = page->physical >> 9;
@@ -2058,6 +2059,7 @@ static int scrub_add_page_to_rd_bio(struct scrub_ctx *sctx,
bio->bi_private = sbio;
bio->bi_end_io = scrub_bio_end_io;
bio_set_dev(bio, sbio->dev->bdev);
+ bio_set_prio(bio, get_current_ioprio());
bio->bi_iter.bi_sector = sbio->physical >> 9;
bio->bi_opf = REQ_OP_READ;
sbio->status = 0;
@@ -14,6 +14,7 @@
#include <linux/semaphore.h>
#include <linux/uuid.h>
#include <linux/list_sort.h>
+#include <linux/ioprio.h>
#include "ctree.h"
#include "extent_map.h"
#include "disk-io.h"
@@ -641,6 +642,7 @@ static noinline void run_scheduled_bios(struct btrfs_device *device)
sync_pending = 0;
}
+ bio_set_prio(cur, get_current_ioprio());
btrfsic_submit_bio(cur);
num_run++;
batch_run++;
@@ -6499,6 +6501,7 @@ static void submit_stripe_bio(struct btrfs_bio *bbio, struct bio *bio,
struct btrfs_fs_info *fs_info = bbio->fs_info;
bio->bi_private = bbio;
+ bio_set_prio(bio, get_current_ioprio());
btrfs_io_bio(bio)->stripe_index = dev_nr;
bio->bi_end_io = btrfs_end_bio;
bio->bi_iter.bi_sector = physical >> 9;
@@ -44,6 +44,7 @@
#include <linux/mpage.h>
#include <linux/bit_spinlock.h>
#include <linux/pagevec.h>
+#include <linux/ioprio.h>
#include <linux/sched/mm.h>
#include <trace/events/block.h>
@@ -3089,6 +3090,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
if (buffer_prio(bh))
op_flags |= REQ_PRIO;
bio_set_op_attrs(bio, op, op_flags);
+ bio_set_prio(bio, get_current_ioprio());
if (wbc) {
wbc_init_bio(wbc, bio);
@@ -24,6 +24,7 @@
#include <linux/module.h>
#include <linux/bio.h>
#include <linux/namei.h>
+#include <linux/ioprio.h>
#include "fscrypt_private.h"
static void __fscrypt_decrypt_bio(struct bio *bio, bool done)
@@ -139,6 +140,8 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
err = -EIO;
goto errout;
}
+
+ bio_set_prio(bio, get_current_ioprio());
err = submit_bio_wait(bio);
if (err == 0 && bio->bi_status)
err = -EIO;
@@ -37,6 +37,7 @@
#include <linux/uio.h>
#include <linux/atomic.h>
#include <linux/prefetch.h>
+#include <linux/ioprio.h>
/*
* How many user pages to map in one call to get_user_pages(). This determines
@@ -440,6 +441,7 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
bio_set_dev(bio, bdev);
bio->bi_iter.bi_sector = first_sector;
bio_set_op_attrs(bio, dio->op, dio->op_flags);
+ bio_set_prio(bio, get_current_ioprio());
if (dio->is_async)
bio->bi_end_io = dio_bio_end_aio;
else
@@ -25,6 +25,7 @@
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/backing-dev.h>
+#include <linux/ioprio.h>
#include "ext4_jbd2.h"
#include "xattr.h"
@@ -382,6 +383,7 @@ static int io_submit_init_bio(struct ext4_io_submit *io,
io->io_bio = bio;
io->io_next_block = bh->b_blocknr;
wbc_init_bio(io->io_wbc, bio);
+ bio_set_prio(bio, get_current_ioprio());
return 0;
}
@@ -261,6 +261,7 @@ int ext4_mpage_readpages(struct address_space *mapping,
bio->bi_private = ctx;
bio_set_op_attrs(bio, REQ_OP_READ,
is_readahead ? REQ_RAHEAD : 0);
+ bio_set_prio(bio, get_current_ioprio());
}
length = first_hole << blkbits;
@@ -18,6 +18,7 @@
#include <linux/uio.h>
#include <linux/cleancache.h>
#include <linux/sched/signal.h>
+#include <linux/ioprio.h>
#include "f2fs.h"
#include "node.h"
@@ -276,6 +277,7 @@ static struct bio *__bio_alloc(struct f2fs_sb_info *sbi, block_t blk_addr,
if (wbc)
wbc_init_bio(wbc, bio);
+ bio_set_prio(bio, get_current_ioprio());
return bio;
}
@@ -569,6 +571,7 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
f2fs_target_device(sbi, blkaddr, bio);
bio->bi_end_io = f2fs_read_end_io;
bio_set_op_attrs(bio, REQ_OP_READ, op_flag);
+ bio_set_prio(bio, get_current_ioprio());
if (f2fs_encrypted_file(inode))
post_read_steps |= 1 << STEP_DECRYPT;
@@ -567,6 +567,7 @@ static int __submit_flush_wait(struct f2fs_sb_info *sbi,
bio->bi_opf = REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH;
bio_set_dev(bio, bdev);
+ bio_set_prio(bio, get_current_ioprio());
ret = submit_bio_wait(bio);
bio_put(bio);
@@ -17,6 +17,7 @@
#include <linux/bio.h>
#include <linux/fs.h>
#include <linux/list_sort.h>
+#include <linux/ioprio.h>
#include "dir.h"
#include "gfs2.h"
@@ -272,6 +273,7 @@ static struct bio *gfs2_log_alloc_bio(struct gfs2_sbd *sdp, u64 blkno,
bio_set_dev(bio, sb->s_bdev);
bio->bi_end_io = end_io;
bio->bi_private = sdp;
+ bio_set_prio(bio, get_current_ioprio());
return bio;
}
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/bio.h>
#include <linux/gfs2_ondisk.h>
+#include <linux/ioprio.h>
#include "gfs2.h"
#include "incore.h"
@@ -234,6 +235,7 @@ static void gfs2_submit_bhs(int op, int op_flags, struct buffer_head *bhs[],
}
bio->bi_end_io = gfs2_meta_read_endio;
bio_set_op_attrs(bio, op, op_flags);
+ bio_set_prio(bio, get_current_ioprio());
submit_bio(bio);
}
}
@@ -24,6 +24,7 @@
#include <linux/lockdep.h>
#include <linux/module.h>
#include <linux/backing-dev.h>
+#include <linux/ioprio.h>
#include "gfs2.h"
#include "incore.h"
@@ -248,6 +249,7 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)
bio->bi_end_io = end_bio_io_page;
bio->bi_private = page;
bio_set_op_attrs(bio, REQ_OP_READ, REQ_META);
+ bio_set_prio(bio, get_current_ioprio());
submit_bio(bio);
wait_on_page_locked(page);
bio_put(bio);
@@ -14,6 +14,7 @@
#include <linux/cdrom.h>
#include <linux/genhd.h>
#include <asm/unaligned.h>
+#include <linux/ioprio.h>
#include "hfsplus_fs.h"
#include "hfsplus_raw.h"
@@ -68,6 +69,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
bio->bi_iter.bi_sector = sector;
bio_set_dev(bio, sb->s_bdev);
bio_set_op_attrs(bio, op, op_flags);
+ bio_set_prio(bio, get_current_ioprio());
if (op != WRITE && data)
*data = (u8 *)buf + offset;
@@ -30,6 +30,7 @@
#include <linux/task_io_accounting_ops.h>
#include <linux/dax.h>
#include <linux/sched/signal.h>
+#include <linux/ioprio.h>
#include "internal.h"
@@ -1618,6 +1619,7 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos,
get_page(page);
__bio_add_page(bio, page, len, 0);
bio_set_op_attrs(bio, REQ_OP_WRITE, flags);
+ bio_set_prio(bio, get_current_ioprio());
iomap_dio_submit_bio(dio, iomap, bio);
}
@@ -72,6 +72,7 @@
#include <linux/mutex.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
+#include <linux/ioprio.h>
#include "jfs_incore.h"
#include "jfs_filsys.h"
#include "jfs_metapage.h"
@@ -1996,6 +1997,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
bio_set_dev(bio, log->bdev);
+ bio_set_prio(bio, get_current_ioprio());
bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
@@ -2140,6 +2142,7 @@ static void lbmStartIO(struct lbuf * bp)
bio = bio_alloc(GFP_NOFS, 1);
bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
bio_set_dev(bio, log->bdev);
+ bio_set_prio(bio, get_current_ioprio());
bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
@@ -26,6 +26,7 @@
#include <linux/buffer_head.h>
#include <linux/mempool.h>
#include <linux/seq_file.h>
+#include <linux/ioprio.h>
#include "jfs_incore.h"
#include "jfs_superblock.h"
#include "jfs_filsys.h"
@@ -435,6 +436,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)
bio->bi_end_io = metapage_write_end_io;
bio->bi_private = page;
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
+ bio_set_prio(bio, get_current_ioprio());
/* Don't call bio_add_page yet, we may add to this vec */
bio_offset = offset;
@@ -516,6 +518,7 @@ static int metapage_readpage(struct file *fp, struct page *page)
bio->bi_end_io = metapage_read_end_io;
bio->bi_private = page;
bio_set_op_attrs(bio, REQ_OP_READ, 0);
+ bio_set_prio(bio, get_current_ioprio());
len = xlen << inode->i_blkbits;
offset = block_offset << inode->i_blkbits;
if (bio_add_page(bio, page, len, offset) < len)
@@ -87,6 +87,7 @@ mpage_alloc(struct block_device *bdev,
if (bio) {
bio_set_dev(bio, bdev);
bio->bi_iter.bi_sector = first_sector;
+ bio_set_prio(bio, get_current_ioprio());
}
return bio;
}
@@ -37,6 +37,7 @@
#include <linux/bio.h> /* struct bio */
#include <linux/prefetch.h>
#include <linux/pagevec.h>
+#include <linux/ioprio.h>
#include "../pnfs.h"
#include "../nfs4session.h"
@@ -133,6 +134,7 @@ bl_alloc_init_bio(int npg, struct block_device *bdev, sector_t disk_sector,
bio_set_dev(bio, bdev);
bio->bi_end_io = end_io;
bio->bi_private = par;
+ bio_set_prio(bio, get_current_ioprio());
}
return bio;
}
@@ -13,6 +13,7 @@
#include <linux/crc32.h>
#include <linux/backing-dev.h>
#include <linux/slab.h>
+#include <linux/ioprio.h>
#include "page.h"
#include "segbuf.h"
@@ -394,6 +395,7 @@ static struct bio *nilfs_alloc_seg_bio(struct the_nilfs *nilfs, sector_t start,
bio_set_dev(bio, nilfs->ns_bdev);
bio->bi_iter.bi_sector =
start << (nilfs->ns_blocksize_bits - 9);
+ bio_set_prio(bio, get_current_ioprio());
}
return bio;
}
@@ -37,6 +37,7 @@
#include <linux/slab.h>
#include <linux/bitmap.h>
#include <linux/ktime.h>
+#include <linux/ioprio.h>
#include "heartbeat.h"
#include "tcp.h"
#include "nodemanager.h"
@@ -557,6 +558,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
bio->bi_private = wc;
bio->bi_end_io = o2hb_bio_end_io;
bio_set_op_attrs(bio, op, op_flags);
+ bio_set_prio(bio, get_current_ioprio());
vec_start = (cs << bits) % PAGE_SIZE;
while(cs < max_slots) {
@@ -22,6 +22,7 @@
#include "xfs_bmap_btree.h"
#include "xfs_reflink.h"
#include <linux/writeback.h>
+#include <linux/ioprio.h>
/*
* structure owned by writepages passed to individual writepage calls
@@ -597,6 +598,7 @@ xfs_alloc_ioend(
INIT_WORK(&ioend->io_work, xfs_end_io);
ioend->io_append_trans = NULL;
ioend->io_bio = bio;
+ bio_set_prio(bio, get_current_ioprio());
return ioend;
}
@@ -620,6 +622,7 @@ xfs_chain_bio(
bio_set_dev(new, bdev);
new->bi_iter.bi_sector = sector;
bio_chain(ioend->io_bio, new);
+ bio_set_prio(new, get_current_ioprio());
bio_get(ioend->io_bio); /* for xfs_destroy_ioend */
ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
@@ -21,6 +21,7 @@
#include <linux/migrate.h>
#include <linux/backing-dev.h>
#include <linux/freezer.h>
+#include <linux/ioprio.h>
#include "xfs_format.h"
#include "xfs_log_format.h"
@@ -1381,6 +1382,7 @@ xfs_buf_ioapply_map(
bio->bi_end_io = xfs_buf_bio_end_io;
bio->bi_private = bp;
bio_set_op_attrs(bio, op, op_flags);
+ bio_set_prio(bio, get_current_ioprio());
for (; size && nr_pages; nr_pages--, page_index++) {
int rbytes, nbytes = PAGE_SIZE - offset;
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- fs/btrfs/disk-io.c | 2 ++ fs/btrfs/extent_io.c | 3 +++ fs/btrfs/raid56.c | 6 ++++++ fs/btrfs/scrub.c | 2 ++ fs/btrfs/volumes.c | 3 +++ fs/buffer.c | 2 ++ fs/crypto/bio.c | 3 +++ fs/direct-io.c | 2 ++ fs/ext4/page-io.c | 2 ++ fs/ext4/readpage.c | 1 + fs/f2fs/data.c | 3 +++ fs/f2fs/segment.c | 1 + fs/gfs2/lops.c | 2 ++ fs/gfs2/meta_io.c | 2 ++ fs/gfs2/ops_fstype.c | 2 ++ fs/hfsplus/wrapper.c | 2 ++ fs/iomap.c | 2 ++ fs/jfs/jfs_logmgr.c | 3 +++ fs/jfs/jfs_metapage.c | 3 +++ fs/mpage.c | 1 + fs/nfs/blocklayout/blocklayout.c | 2 ++ fs/nilfs2/segbuf.c | 2 ++ fs/ocfs2/cluster/heartbeat.c | 2 ++ fs/xfs/xfs_aops.c | 3 +++ fs/xfs/xfs_buf.c | 2 ++ 25 files changed, 58 insertions(+)