Commit 6342649c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.11-20240726' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
     - Fix request without payloads cleanup  (Leon)
     - Use new protection information format (Francis)
     - Improved debug message for lost pci link (Bart)
     - Another apst quirk (Wang)
     - Use appropriate sysfs api for printing chars (Markus)

 - ublk async device deletion fix (Ming)

 - drbd kerneldoc fixups (Simon)

 - Fix deadlock between sd removal and release (Yang)

* tag 'block-6.11-20240726' of git://git.kernel.dk/linux:
  nvme-pci: add missing condition check for existence of mapped data
  ublk: fix UBLK_CMD_DEL_DEV_ASYNC handling
  block: fix deadlock between sd_remove & sd_release
  drbd: Add peer_device to Kernel doc
  nvme-core: choose PIF from QPIF if QPIFS supports and PIF is QTYPE
  nvme-pci: Fix the instructions for disabling power management
  nvme: remove redundant bdev local variable
  nvme-fabrics: Use seq_putc() in __nvmf_concat_opt_tokens()
  nvme/pci: Add APST quirk for Lenovo N60z laptop
parents 8c930747 f6bb5254

block/genhd.c

+1 −1
Original line number Diff line number Diff line
@@ -663,12 +663,12 @@ void del_gendisk(struct gendisk *disk) 
	 */

	if (!test_bit(GD_DEAD, &disk->state))

		blk_report_disk_dead(disk, false);

	__blk_mark_disk_dead(disk);



	/*

	 * Drop all partitions now that the disk is marked dead.

	 */

	mutex_lock(&disk->open_mutex);

	__blk_mark_disk_dead(disk);

	xa_for_each_start(&disk->part_tbl, idx, part, 1)

		drop_partition(part);

	mutex_unlock(&disk->open_mutex);

drivers/block/drbd/drbd_main.c

+4 −0
Original line number Diff line number Diff line
@@ -3422,6 +3422,7 @@ void drbd_uuid_set_bm(struct drbd_device *device, u64 val) __must_hold(local) 
/**

 * drbd_bmio_set_n_write() - io_fn for drbd_queue_bitmap_io() or drbd_bitmap_io()

 * @device:	DRBD device.

 * @peer_device: Peer DRBD device.

 *

 * Sets all bits in the bitmap and writes the whole bitmap to stable storage.

 */
@@ -3448,6 +3449,7 @@ int drbd_bmio_set_n_write(struct drbd_device *device, 
/**

 * drbd_bmio_clear_n_write() - io_fn for drbd_queue_bitmap_io() or drbd_bitmap_io()

 * @device:	DRBD device.

 * @peer_device: Peer DRBD device.

 *

 * Clears all bits in the bitmap and writes the whole bitmap to stable storage.

 */
@@ -3501,6 +3503,7 @@ static int w_bitmap_io(struct drbd_work *w, int unused) 
 * @done:	callback to be called after the bitmap IO was performed

 * @why:	Descriptive text of the reason for doing the IO

 * @flags:	Bitmap flags

 * @peer_device: Peer DRBD device.

 *

 * While IO on the bitmap happens we freeze application IO thus we ensure

 * that drbd_set_out_of_sync() can not be called. This function MAY ONLY be
@@ -3549,6 +3552,7 @@ void drbd_queue_bitmap_io(struct drbd_device *device, 
 * @io_fn:	IO callback to be called when bitmap IO is possible

 * @why:	Descriptive text of the reason for doing the IO

 * @flags:	Bitmap flags

 * @peer_device: Peer DRBD device.

 *

 * freezes application IO while that the actual IO operations runs. This

 * functions MAY NOT be called from worker context.

drivers/block/ublk_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 


#define UBLK_MINORS		(1U << MINORBITS)



/* private ioctl command mirror */

#define UBLK_CMD_DEL_DEV_ASYNC	_IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC)



/* All UBLK_F_* have to be included into UBLK_F_ALL */

#define UBLK_F_ALL (UBLK_F_SUPPORT_ZERO_COPY \

		| UBLK_F_URING_CMD_COMP_IN_TASK \
@@ -2903,7 +2906,7 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, 
	case UBLK_CMD_DEL_DEV:

		ret = ublk_ctrl_del_dev(&ub, true);

		break;

	case UBLK_U_CMD_DEL_DEV_ASYNC:

	case UBLK_CMD_DEL_DEV_ASYNC:

		ret = ublk_ctrl_del_dev(&ub, false);

		break;

	case UBLK_CMD_GET_QUEUE_AFFINITY:

drivers/nvme/host/core.c

+7 −1
Original line number Diff line number Diff line
@@ -1876,12 +1876,18 @@ static void nvme_configure_pi_elbas(struct nvme_ns_head *head, 
		struct nvme_id_ns *id, struct nvme_id_ns_nvm *nvm)

{

	u32 elbaf = le32_to_cpu(nvm->elbaf[nvme_lbaf_index(id->flbas)]);

	u8 guard_type;



	/* no support for storage tag formats right now */

	if (nvme_elbaf_sts(elbaf))

		return;



	head->guard_type = nvme_elbaf_guard_type(elbaf);

	guard_type = nvme_elbaf_guard_type(elbaf);

	if ((nvm->pic & NVME_ID_NS_NVM_QPIFS) &&

	     guard_type == NVME_NVM_NS_QTYPE_GUARD)

		guard_type = nvme_elbaf_qualified_guard_type(elbaf);



	head->guard_type = guard_type;

	switch (head->guard_type) {

	case NVME_NVM_NS_64B_GUARD:

		head->pi_size = sizeof(struct crc64_pi_tuple);

drivers/nvme/host/fabrics.c

+2 −2
Original line number Diff line number Diff line
@@ -1403,10 +1403,10 @@ static void __nvmf_concat_opt_tokens(struct seq_file *seq_file) 
		tok = &opt_tokens[idx];

		if (tok->token == NVMF_OPT_ERR)

			continue;

		seq_puts(seq_file, ",");

		seq_putc(seq_file, ',');

		seq_puts(seq_file, tok->pattern);

	}

	seq_puts(seq_file, "\n");

	seq_putc(seq_file, '\n');

}



static int nvmf_dev_show(struct seq_file *seq_file, void *private)