Commit 98be58a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.4-2023-05-20' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - NVMe pull request via Keith:
     - More device quirks (Sagi, Hristo, Adrian, Daniel)
     - Controller delete race (Maurizo)
     - Multipath cleanup fix (Christoph)

 - Deny writeable mmap mapping on a readonly block device (Loic)

 - Kill unused define that got introduced by accident (Christoph)

 - Error handling fix for s390 dasd (Stefan)

 - ublk locking fix (Ming)

* tag 'block-6.4-2023-05-20' of git://git.kernel.dk/linux:
  block: remove NFL4_UFLG_MASK
  block: Deny writable memory mapping if block is read-only
  s390/dasd: fix command reject error on ESE devices
  nvme-pci: Add quirk for Teamgroup MP33 SSD
  ublk: fix AB-BA lockdep warning
  nvme: do not let the user delete a ctrl before a complete initialization
  nvme-multipath: don't call blk_mark_disk_dead in nvme_mpath_remove_disk
  nvme-pci: clamp max_hw_sectors based on DMA optimized limitation
  nvme-pci: add quirk for missing secondary temperature thresholds
  nvme-pci: add NVME_QUIRK_BOGUS_NID for HS-SSD-FUTURE 2048G
parents d635f6cc e3afec91

block/fops.c

+11 −1
Original line number Diff line number Diff line
@@ -678,6 +678,16 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, 
	return error;

}



static int blkdev_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct inode *bd_inode = bdev_file_inode(file);



	if (bdev_read_only(I_BDEV(bd_inode)))

		return generic_file_readonly_mmap(file, vma);



	return generic_file_mmap(file, vma);

}



const struct file_operations def_blk_fops = {

	.open		= blkdev_open,

	.release	= blkdev_close,
@@ -685,7 +695,7 @@ const struct file_operations def_blk_fops = { 
	.read_iter	= blkdev_read_iter,

	.write_iter	= blkdev_write_iter,

	.iopoll		= iocb_bio_iopoll,

	.mmap		= generic_file_mmap,

	.mmap		= blkdev_mmap,

	.fsync		= blkdev_fsync,

	.unlocked_ioctl	= blkdev_ioctl,

#ifdef CONFIG_COMPAT

drivers/block/ublk_drv.c

+7 −2
Original line number Diff line number Diff line
@@ -1120,6 +1120,11 @@ static inline bool ublk_queue_ready(struct ublk_queue *ubq) 
	return ubq->nr_io_ready == ubq->q_depth;

}



static void ublk_cmd_cancel_cb(struct io_uring_cmd *cmd, unsigned issue_flags)

{

	io_uring_cmd_done(cmd, UBLK_IO_RES_ABORT, 0, issue_flags);

}



static void ublk_cancel_queue(struct ublk_queue *ubq)

{

	int i;
@@ -1131,8 +1136,8 @@ static void ublk_cancel_queue(struct ublk_queue *ubq) 
		struct ublk_io *io = &ubq->ios[i];



		if (io->flags & UBLK_IO_FLAG_ACTIVE)

			io_uring_cmd_done(io->cmd, UBLK_IO_RES_ABORT, 0,

						IO_URING_F_UNLOCKED);

			io_uring_cmd_complete_in_task(io->cmd,

						      ublk_cmd_cancel_cb);

	}



	/* all io commands are canceled */

drivers/nvme/host/core.c

+5 −1
Original line number Diff line number Diff line
@@ -3585,6 +3585,9 @@ static ssize_t nvme_sysfs_delete(struct device *dev, 
{

	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);



	if (!test_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags))

		return -EBUSY;



	if (device_remove_file_self(dev, attr))

		nvme_delete_ctrl_sync(ctrl);

	return count;
@@ -5045,7 +5048,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) 
	 * that were missed. We identify persistent discovery controllers by

	 * checking that they started once before, hence are reconnecting back.

	 */

	if (test_and_set_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags) &&

	if (test_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags) &&

	    nvme_discovery_ctrl(ctrl))

		nvme_change_uevent(ctrl, "NVME_EVENT=rediscover");
@@ -5056,6 +5059,7 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) 
	}



	nvme_change_uevent(ctrl, "NVME_EVENT=connected");

	set_bit(NVME_CTRL_STARTED_ONCE, &ctrl->flags);

}

EXPORT_SYMBOL_GPL(nvme_start_ctrl);

drivers/nvme/host/hwmon.c

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ static umode_t nvme_hwmon_is_visible(const void *_data, 
	case hwmon_temp_max:

	case hwmon_temp_min:

		if ((!channel && data->ctrl->wctemp) ||

		    (channel && data->log->temp_sensor[channel - 1])) {

		    (channel && data->log->temp_sensor[channel - 1] &&

		     !(data->ctrl->quirks &

		       NVME_QUIRK_NO_SECONDARY_TEMP_THRESH))) {

			if (data->ctrl->quirks &

			    NVME_QUIRK_NO_TEMP_THRESH_CHANGE)

				return 0444;

drivers/nvme/host/multipath.c

+0 −1
Original line number Diff line number Diff line
@@ -884,7 +884,6 @@ void nvme_mpath_remove_disk(struct nvme_ns_head *head) 
{

	if (!head->disk)

		return;

	blk_mark_disk_dead(head->disk);

	/* make sure all pending bios are cleaned up */

	kblockd_schedule_work(&head->requeue_work);

	flush_work(&head->requeue_work);