Commit 90aaef4e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.2-2023-01-27' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Minor tweaks for this release:

   - NVMe pull request via Christoph:
        - Flush initial scan_work for async probe (Keith Busch)
        - Fix passthrough csi check (Keith Busch)
        - Fix nvme-fc initialization order (Ross Lagerwall)

   - Fix for tearing down non-started device in ublk (Ming)"

* tag 'block-6.2-2023-01-27' of git://git.kernel.dk/linux:
  block: ublk: move ublk_chr_class destroying after devices are removed
  nvme: fix passthrough csi check
  nvme-pci: flush initial scan_work for async probe
  nvme-fc: fix initialization order
parents f851453b db3ba974

drivers/block/ublk_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -2092,13 +2092,12 @@ static void __exit ublk_exit(void) 
	struct ublk_device *ub;

	int id;



	class_destroy(ublk_chr_class);



	misc_deregister(&ublk_misc);



	idr_for_each_entry(&ublk_index_idr, ub, id)

		ublk_remove(ub);



	class_destroy(ublk_chr_class);

	misc_deregister(&ublk_misc);



	idr_destroy(&ublk_index_idr);

	unregister_chrdev_region(ublk_chr_devt, UBLK_MINORS);

}

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, u8 opcode) 
	if (ns) {

		if (ns->head->effects)

			effects = le32_to_cpu(ns->head->effects->iocs[opcode]);

		if (ns->head->ids.csi == NVME_CAP_CSS_NVM)

		if (ns->head->ids.csi == NVME_CSI_NVM)

			effects |= nvme_known_nvm_effects(opcode);

		if (effects & ~(NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC))

			dev_warn_once(ctrl->device,

drivers/nvme/host/fc.c

+8 −10
Original line number Diff line number Diff line
@@ -3521,13 +3521,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 


	nvme_fc_init_queue(ctrl, 0);



	ret = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set,

			&nvme_fc_admin_mq_ops,

			struct_size((struct nvme_fcp_op_w_sgl *)NULL, priv,

				    ctrl->lport->ops->fcprqst_priv_sz));

	if (ret)

		goto out_free_queues;



	/*

	 * Would have been nice to init io queues tag set as well.

	 * However, we require interaction from the controller
@@ -3537,10 +3530,17 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 


	ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_fc_ctrl_ops, 0);

	if (ret)

		goto out_cleanup_tagset;

		goto out_free_queues;



	/* at this point, teardown path changes to ref counting on nvme ctrl */



	ret = nvme_alloc_admin_tag_set(&ctrl->ctrl, &ctrl->admin_tag_set,

			&nvme_fc_admin_mq_ops,

			struct_size((struct nvme_fcp_op_w_sgl *)NULL, priv,

				    ctrl->lport->ops->fcprqst_priv_sz));

	if (ret)

		goto fail_ctrl;



	spin_lock_irqsave(&rport->lock, flags);

	list_add_tail(&ctrl->ctrl_list, &rport->ctrl_list);

	spin_unlock_irqrestore(&rport->lock, flags);
@@ -3592,8 +3592,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 


	return ERR_PTR(-EIO);



out_cleanup_tagset:

	nvme_remove_admin_tag_set(&ctrl->ctrl);

out_free_queues:

	kfree(ctrl->queues);

out_free_ida:

drivers/nvme/host/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -3102,6 +3102,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	nvme_start_ctrl(&dev->ctrl);

	nvme_put_ctrl(&dev->ctrl);

	flush_work(&dev->ctrl.scan_work);

	return 0;



out_disable: