summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 10:17:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 10:17:06 -0800
commita904dcf3fdf29cdac99ea354789bc5c82df0d5ad (patch)
treebb7e05226460d2e69d174997ac8e9d6bbfa55d8b /include/linux
parent78d9aedf2342cac9968392995d8f7fd488caa337 (diff)
parent5a29cfaf51105039d156dd8a61d2783e8b653667 (diff)
Merge tag 'block-7.4-20261119' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull block fixes from Jens Axboe: - NVMe fixes via Keith: - nvme-tcp fixes for TLS record handling and waiting for an in-flight TLS handshake callback - Fix a deadlock on nvme_subsystems_lock in nvme_init_subsystem() - Fix a gendisk leak in nvme_alloc_ns() - Stop AEN work before ANA teardown - Remove namespaces in parallel - Various nvmet fixes for auth, the file backend, fc, tcp, loop, and connection failure rollback - sysfs input validation and kfree_sensitive() for DH-HMAC-CHAP secrets - Dead code removal - Fix a 32-bit overflow in the blk-iocost donation weight calculation - ublk fixes: validate all parameters for zoned devices, and dispatch the next fetch after a batch failure - Fix a pm_only underflow when a runtime resume is retried after a failed one - nbd: reclassify sockets in the reconnect path too, to avoid lockdep false positives - Take quiesce_lock when removing a queue from the tag set, fixing a use-after-free in blk_mq_unquiesce_tagset() - Allow error injection rules to delay bios, and reject unknown status tags * tag 'block-7.4-20261119' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: (49 commits) Documentation: block: document error injection delay feature block: allow error injection rules to delay bios block: Reject unknown status tags in error injection rules blk-mq: take quiesce_lock when removing a queue from the tag set nbd: Reclassify sockets in the reconnect path block: Keep RPM_ACTIVE in blk_pre_runtime_resume() when already active nvme-fabrics: use kfree_sensitive() for the old DH-HMAC-CHAP secret nvme-sysfs: use kfree_sensitive() for DH-HMAC-CHAP secrets nvmet: roll back queue bindings on connection failure nvmet-fc: reject duplicate queue IDs on Create Connection nvmet-fcloop: free the LS request when delivery fails nvme-tcp: require the R2T offset to match the data sent nvmet-tcp: only wait for in-capsule data for inline SGLs nvme-loop: release the target request when SG setup fails nvmet-auth: store the DH-CHAP key offset instead of hardcoding it nvme-tcp: consume TLS records without application data nvme-tcp: move the TLS record read loop into a helper nvme-tcp: use an aligned buffer for the TLS record type nvmet: use overflow-safe range checks in the file backend nvmet: handle short reads and writes in the file backend ...
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/blk-mq.h3
-rw-r--r--include/linux/blk_types.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 1a2f8d48adc4..3c9667854c46 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -524,7 +524,8 @@ enum hctx_type {
* @tag_list: List of the request queues that use this tag set. See also
* request_queue.tag_set_list.
* @quiesce_lock: Serializes blk_mq_[un]quiesce_tagset() against each other
- * and against a request queue being added to @tag_list.
+ * and against a request queue being added to or removed from
+ * @tag_list.
* @quiesce_depth: How often blk_mq_quiesce_tagset() has been called without
* blk_mq_unquiesce_tagset().
* @srcu: Use as lock when type of the request queue is blocking
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 0cc09b975d8f..1a5812fa4052 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -328,6 +328,7 @@ enum {
BIO_ZONE_WRITE_PLUGGING, /* bio handled through zone write plugging */
BIO_EMULATES_ZONE_APPEND, /* bio emulates a zone append operation */
BIO_COMPLETE_IN_TASK, /* complete bi_end_io() in task context */
+ BIO_ERROR_INJECTED, /* error injection rules already applied */
BIO_FLAG_LAST
};