Commit 9d1694dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.8/block-2024-01-18' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
      - tcp, fc, and rdma target fixes (Maurizio, Daniel, Hannes,
        Christoph)
      - discard fixes and improvements (Christoph)
      - timeout debug improvements (Keith, Max)
      - various cleanups (Daniel, Max, Giuxen)
      - trace event string fixes (Arnd)
      - shadow doorbell setup on reset fix (William)
      - a write zeroes quirk for SK Hynix (Jim)

 - MD pull request via Song:
      - Sparse warning since v6.0 (Bart)
      - /proc/mdstat regression since v6.7 (Yu Kuai)

 - Use symbolic error value (Christian)

 - IO Priority documentation update (Christian)

 - Fix for accessing queue limits without having entered the queue
   (Christoph, me)

 - Fix for loop dio support (Christoph)

 - Move null_blk off deprecated ida interface (Christophe)

 - Ensure nbd initializes full msghdr (Eric)

 - Fix for a regression with the folio conversion, which is now easier
   to hit because of an unrelated change (Matthew)

 - Remove redundant check in virtio-blk (Li)

 - Fix for a potential hang in sbitmap (Ming)

 - Fix for partial zone appending (Damien)

 - Misc changes and fixes (Bart, me, Kemeng, Dmitry)

* tag 'for-6.8/block-2024-01-18' of git://git.kernel.dk/linux: (45 commits)
  Documentation: block: ioprio: Update schedulers
  loop: fix the the direct I/O support check when used on top of block devices
  blk-mq: Remove the hctx 'run' debugfs attribute
  nbd: always initialize struct msghdr completely
  block: Fix iterating over an empty bio with bio_for_each_folio_all
  block: bio-integrity: fix kcalloc() arguments order
  virtio_blk: remove duplicate check if queue is broken in virtblk_done
  sbitmap: remove stale comment in sbq_calc_wake_batch
  block: Correct a documentation comment in blk-cgroup.c
  null_blk: Remove usage of the deprecated ida_simple_xx() API
  block: ensure we hold a queue reference when using queue limits
  blk-mq: rename blk_mq_can_use_cached_rq
  block: print symbolic error name instead of error code
  blk-mq: fix IO hang from sbitmap wakeup race
  nvmet-rdma: avoid circular locking dependency on install_queue()
  nvmet-tcp: avoid circular locking dependency on install_queue()
  nvme-pci: set doorbell config before unquiescing
  block: fix partial zone append completion handling in req_bio_endio()
  block/iocost: silence warning on 'last_period' potentially being unused
  md/raid1: Use blk_opf_t for read and write operations
  ...
parents e9a5a78d b2e792ae

Documentation/block/ioprio.rst

+6 −7
Original line number Diff line number Diff line
@@ -6,17 +6,16 @@ Block io priorities 
Intro

-----



With the introduction of cfq v3 (aka cfq-ts or time sliced cfq), basic io

priorities are supported for reads on files.  This enables users to io nice

processes or process groups, similar to what has been possible with cpu

scheduling for ages.  This document mainly details the current possibilities

with cfq; other io schedulers do not support io priorities thus far.

The io priority feature enables users to io nice processes or process groups,

similar to what has been possible with cpu scheduling for ages. Support for io

priorities is io scheduler dependent and currently supported by bfq and

mq-deadline.



Scheduling classes

------------------



CFQ implements three generic scheduling classes that determine how io is

served for a process.

Three generic scheduling classes are implemented for io priorities that

determine how io is served for a process.



IOPRIO_CLASS_RT: This is the realtime io class. This scheduling class is given

higher priority than any other in the system, processes from this class are

block/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes, 
	if (nr_vecs > BIO_MAX_VECS)

		return -E2BIG;

	if (nr_vecs > UIO_FASTIOV) {

		bvec = kcalloc(sizeof(*bvec), nr_vecs, GFP_KERNEL);

		bvec = kcalloc(nr_vecs, sizeof(*bvec), GFP_KERNEL);

		if (!bvec)

			return -ENOMEM;

		pages = NULL;

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static inline struct blkcg *blkcg_parent(struct blkcg *blkcg) 
 * @disk: gendisk the new blkg is associated with

 * @gfp_mask: allocation mask to use

 *

 * Allocate a new blkg assocating @blkcg and @q.

 * Allocate a new blkg associating @blkcg and @disk.

 */

static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct gendisk *disk,

				   gfp_t gfp_mask)

block/blk-iocost.c

+1 −1
Original line number Diff line number Diff line
@@ -1261,7 +1261,7 @@ static void weight_updated(struct ioc_gq *iocg, struct ioc_now *now) 
static bool iocg_activate(struct ioc_gq *iocg, struct ioc_now *now)

{

	struct ioc *ioc = iocg->ioc;

	u64 last_period, cur_period;

	u64 __maybe_unused last_period, cur_period;

	u64 vtime, vtarget;

	int i;

block/blk-mq-debugfs.c

+0 −18
Original line number Diff line number Diff line
@@ -479,23 +479,6 @@ static int hctx_sched_tags_bitmap_show(void *data, struct seq_file *m) 
	return res;

}



static int hctx_run_show(void *data, struct seq_file *m)

{

	struct blk_mq_hw_ctx *hctx = data;



	seq_printf(m, "%lu\n", hctx->run);

	return 0;

}



static ssize_t hctx_run_write(void *data, const char __user *buf, size_t count,

			      loff_t *ppos)

{

	struct blk_mq_hw_ctx *hctx = data;



	hctx->run = 0;

	return count;

}



static int hctx_active_show(void *data, struct seq_file *m)

{

	struct blk_mq_hw_ctx *hctx = data;
@@ -624,7 +607,6 @@ static const struct blk_mq_debugfs_attr blk_mq_debugfs_hctx_attrs[] = { 
	{"tags_bitmap", 0400, hctx_tags_bitmap_show},

	{"sched_tags", 0400, hctx_sched_tags_show},

	{"sched_tags_bitmap", 0400, hctx_sched_tags_bitmap_show},

	{"run", 0600, hctx_run_show, hctx_run_write},

	{"active", 0400, hctx_active_show},

	{"dispatch_busy", 0400, hctx_dispatch_busy_show},

	{"type", 0400, hctx_type_show},