Commit b3bd86a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.5-2023-07-14' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
      - Don't require quirk to use duplicate namespace identifiers
        (Christoph, Sagi)
      - One more BOGUS_NID quirk (Pankaj)
      - IO timeout and error hanlding fixes for PCI (Keith)
      - Enhanced metadata format mask fix (Ankit)
      - Association race condition fix for fibre channel (Michael)
      - Correct debugfs error checks (Minjie)
      - Use PAGE_SECTORS_SHIFT where needed (Damien)
      - Reduce kernel logs for legacy nguid attribute (Keith)
      - Use correct dma direction when unmapping metadata (Ming)

 - Fix for a flush handling regression in this release (Christoph)

 - Fix for batched request time stamping (Chengming)

 - Fix for a regression in the mq-deadline position calculation (Bart)

 - Lockdep fix for blk-crypto (Eric)

 - Fix for a regression in the Amiga partition handling changes
   (Michael)

* tag 'block-6.5-2023-07-14' of git://git.kernel.dk/linux:
  block: queue data commands from the flush state machine at the head
  blk-mq: fix start_time_ns and alloc_time_ns for pre-allocated rq
  nvme-pci: fix DMA direction of unmapping integrity data
  nvme: don't reject probe due to duplicate IDs for single-ported PCIe devices
  block/mq-deadline: Fix a bug in deadline_from_pos()
  nvme: ensure disabling pairs with unquiesce
  nvme-fc: fix race between error recovery and creating association
  nvme-fc: return non-zero status code when fails to create association
  nvme: fix parameter check in nvme_fault_inject_init()
  nvme: warn only once for legacy uuid attribute
  block: remove dead struc request->completion_data field
  nvme: fix the NVME_ID_NS_NVM_STS_MASK definition
  nvmet: use PAGE_SECTORS_SHIFT
  nvme: add BOGUS_NID quirk for Samsung SM953
  blk-crypto: use dynamic lock class for blk_crypto_profile::lock
  block/partition: fix signedness issue for Amiga partitions
parents ec17f164 9f87fc4d

block/blk-crypto-profile.c

+10 −2
Original line number Diff line number Diff line
@@ -79,7 +79,14 @@ int blk_crypto_profile_init(struct blk_crypto_profile *profile, 
	unsigned int slot_hashtable_size;



	memset(profile, 0, sizeof(*profile));

	init_rwsem(&profile->lock);



	/*

	 * profile->lock of an underlying device can nest inside profile->lock

	 * of a device-mapper device, so use a dynamic lock class to avoid

	 * false-positive lockdep reports.

	 */

	lockdep_register_key(&profile->lockdep_key);

	__init_rwsem(&profile->lock, "&profile->lock", &profile->lockdep_key);



	if (num_slots == 0)

		return 0;
@@ -89,7 +96,7 @@ int blk_crypto_profile_init(struct blk_crypto_profile *profile, 
	profile->slots = kvcalloc(num_slots, sizeof(profile->slots[0]),

				  GFP_KERNEL);

	if (!profile->slots)

		return -ENOMEM;

		goto err_destroy;



	profile->num_slots = num_slots;
@@ -435,6 +442,7 @@ void blk_crypto_profile_destroy(struct blk_crypto_profile *profile) 
{

	if (!profile)

		return;

	lockdep_unregister_key(&profile->lockdep_key);

	kvfree(profile->slot_hashtable);

	kvfree_sensitive(profile->slots,

			 sizeof(profile->slots[0]) * profile->num_slots);

block/blk-flush.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static void blk_flush_complete_seq(struct request *rq, 
	case REQ_FSEQ_DATA:

		list_move_tail(&rq->flush.list, &fq->flush_data_in_flight);

		spin_lock(&q->requeue_lock);

		list_add_tail(&rq->queuelist, &q->flush_list);

		list_add(&rq->queuelist, &q->requeue_list);

		spin_unlock(&q->requeue_lock);

		blk_mq_kick_requeue_list(q);

		break;

block/blk-mq.c

+30 −17
Original line number Diff line number Diff line
@@ -328,8 +328,24 @@ void blk_rq_init(struct request_queue *q, struct request *rq) 
}

EXPORT_SYMBOL(blk_rq_init);



/* Set start and alloc time when the allocated request is actually used */

static inline void blk_mq_rq_time_init(struct request *rq, u64 alloc_time_ns)

{

	if (blk_mq_need_time_stamp(rq))

		rq->start_time_ns = ktime_get_ns();

	else

		rq->start_time_ns = 0;



#ifdef CONFIG_BLK_RQ_ALLOC_TIME

	if (blk_queue_rq_alloc_time(rq->q))

		rq->alloc_time_ns = alloc_time_ns ?: rq->start_time_ns;

	else

		rq->alloc_time_ns = 0;

#endif

}



static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data,

		struct blk_mq_tags *tags, unsigned int tag, u64 alloc_time_ns)

		struct blk_mq_tags *tags, unsigned int tag)

{

	struct blk_mq_ctx *ctx = data->ctx;

	struct blk_mq_hw_ctx *hctx = data->hctx;
@@ -356,14 +372,7 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
	}

	rq->timeout = 0;



	if (blk_mq_need_time_stamp(rq))

		rq->start_time_ns = ktime_get_ns();

	else

		rq->start_time_ns = 0;

	rq->part = NULL;

#ifdef CONFIG_BLK_RQ_ALLOC_TIME

	rq->alloc_time_ns = alloc_time_ns;

#endif

	rq->io_start_time_ns = 0;

	rq->stats_sectors = 0;

	rq->nr_phys_segments = 0;
@@ -393,8 +402,7 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
}



static inline struct request *

__blk_mq_alloc_requests_batch(struct blk_mq_alloc_data *data,

		u64 alloc_time_ns)

__blk_mq_alloc_requests_batch(struct blk_mq_alloc_data *data)

{

	unsigned int tag, tag_offset;

	struct blk_mq_tags *tags;
@@ -413,7 +421,7 @@ __blk_mq_alloc_requests_batch(struct blk_mq_alloc_data *data, 
		tag = tag_offset + i;

		prefetch(tags->static_rqs[tag]);

		tag_mask &= ~(1UL << i);

		rq = blk_mq_rq_ctx_init(data, tags, tag, alloc_time_ns);

		rq = blk_mq_rq_ctx_init(data, tags, tag);

		rq_list_add(data->cached_rq, rq);

		nr++;

	}
@@ -474,9 +482,11 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data) 
	 * Try batched alloc if we want more than 1 tag.

	 */

	if (data->nr_tags > 1) {

		rq = __blk_mq_alloc_requests_batch(data, alloc_time_ns);

		if (rq)

		rq = __blk_mq_alloc_requests_batch(data);

		if (rq) {

			blk_mq_rq_time_init(rq, alloc_time_ns);

			return rq;

		}

		data->nr_tags = 1;

	}
@@ -499,8 +509,9 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data) 
		goto retry;

	}



	return blk_mq_rq_ctx_init(data, blk_mq_tags_from_data(data), tag,

					alloc_time_ns);

	rq = blk_mq_rq_ctx_init(data, blk_mq_tags_from_data(data), tag);

	blk_mq_rq_time_init(rq, alloc_time_ns);

	return rq;

}



static struct request *blk_mq_rq_cache_fill(struct request_queue *q,
@@ -555,6 +566,7 @@ static struct request *blk_mq_alloc_cached_request(struct request_queue *q, 
			return NULL;



		plug->cached_rq = rq_list_next(rq);

		blk_mq_rq_time_init(rq, 0);

	}



	rq->cmd_flags = opf;
@@ -656,8 +668,8 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, 
	tag = blk_mq_get_tag(&data);

	if (tag == BLK_MQ_NO_TAG)

		goto out_queue_exit;

	rq = blk_mq_rq_ctx_init(&data, blk_mq_tags_from_data(&data), tag,

					alloc_time_ns);

	rq = blk_mq_rq_ctx_init(&data, blk_mq_tags_from_data(&data), tag);

	blk_mq_rq_time_init(rq, alloc_time_ns);

	rq->__data_len = 0;

	rq->__sector = (sector_t) -1;

	rq->bio = rq->biotail = NULL;
@@ -2896,6 +2908,7 @@ static inline struct request *blk_mq_get_cached_request(struct request_queue *q, 
	plug->cached_rq = rq_list_next(rq);

	rq_qos_throttle(q, *bio);



	blk_mq_rq_time_init(rq, 0);

	rq->cmd_flags = (*bio)->bi_opf;

	INIT_LIST_HEAD(&rq->queuelist);

	return rq;

block/mq-deadline.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static inline struct request *deadline_from_pos(struct dd_per_prio *per_prio, 
	 * zoned writes, start searching from the start of a zone.

	 */

	if (blk_rq_is_seq_zoned_write(rq))

		pos -= round_down(pos, rq->q->limits.chunk_sectors);

		pos = round_down(pos, rq->q->limits.chunk_sectors);



	while (node) {

		rq = rb_entry_rq(node);

block/partitions/amiga.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ int amiga_partition(struct parsed_partitions *state) 
	}

	blk = be32_to_cpu(rdb->rdb_PartitionList);

	put_dev_sector(sect);

	for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {

	for (part = 1; (s32) blk>0 && part<=16; part++, put_dev_sector(sect)) {

		/* Read in terms partition table understands */

		if (check_mul_overflow(blk, (sector_t) blksize, &blk)) {

			pr_err("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n",