Commit 4a2dd2c7 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-5.9-2020-09-17' of git://git.infradead.org/nvme into block-5.9 

Pull NVMe fixes from Christoph:

"nvme fixes for 5.9

  - another quirk for the controller from hell (David Milburn)
  - fix a Kconfig dependency (Necip Fazil Yildiran)
  - char devices / passthrough refcount fixes (Chaitanya Kulkarni)"

* tag 'nvme-5.9-2020-09-17' of git://git.infradead.org/nvme:
  nvmet: get transport reference for passthru ctrl
  nvme-core: get/put ctrl and transport module in nvme_dev_open/release()
  nvme-tcp: fix kconfig dependency warning when !CRYPTO
  nvme-pci: disable the write zeros command for Intel 600P/P3100
parents 709192d5 3a6b0761

drivers/nvme/host/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ config NVME_TCP 
	depends on INET

	depends on BLK_DEV_NVME

	select NVME_FABRICS

	select CRYPTO

	select CRYPTO_CRC32C

	help

	  This provides support for the NVMe over Fabrics protocol using

drivers/nvme/host/core.c

+15 −0
Original line number Diff line number Diff line
@@ -3261,10 +3261,24 @@ static int nvme_dev_open(struct inode *inode, struct file *file) 
		return -EWOULDBLOCK;

	}



	nvme_get_ctrl(ctrl);

	if (!try_module_get(ctrl->ops->module))

		return -EINVAL;



	file->private_data = ctrl;

	return 0;

}



static int nvme_dev_release(struct inode *inode, struct file *file)

{

	struct nvme_ctrl *ctrl =

		container_of(inode->i_cdev, struct nvme_ctrl, cdev);



	module_put(ctrl->ops->module);

	nvme_put_ctrl(ctrl);

	return 0;

}



static int nvme_dev_user_cmd(struct nvme_ctrl *ctrl, void __user *argp)

{

	struct nvme_ns *ns;
@@ -3327,6 +3341,7 @@ static long nvme_dev_ioctl(struct file *file, unsigned int cmd, 
static const struct file_operations nvme_dev_fops = {

	.owner		= THIS_MODULE,

	.open		= nvme_dev_open,

	.release	= nvme_dev_release,

	.unlocked_ioctl	= nvme_dev_ioctl,

	.compat_ioctl	= compat_ptr_ioctl,

};

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -3153,7 +3153,8 @@ static const struct pci_device_id nvme_id_table[] = { 
	{ PCI_VDEVICE(INTEL, 0xf1a5),	/* Intel 600P/P3100 */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |

				NVME_QUIRK_MEDIUM_PRIO_SQ |

				NVME_QUIRK_NO_TEMP_THRESH_CHANGE },

				NVME_QUIRK_NO_TEMP_THRESH_CHANGE |

				NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_VDEVICE(INTEL, 0xf1a6),	/* Intel 760p/Pro 7600p */

		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_VDEVICE(INTEL, 0x5845),	/* Qemu emulated controller */

drivers/nvme/target/passthru.c

+2 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ int nvmet_passthru_ctrl_enable(struct nvmet_subsys *subsys) 
		subsys->ver = NVME_VS(1, 2, 1);

	}



	__module_get(subsys->passthru_ctrl->ops->module);

	mutex_unlock(&subsys->lock);

	return 0;
@@ -531,6 +532,7 @@ static void __nvmet_passthru_ctrl_disable(struct nvmet_subsys *subsys) 
{

	if (subsys->passthru_ctrl) {

		xa_erase(&passthru_subsystems, subsys->passthru_ctrl->cntlid);

		module_put(subsys->passthru_ctrl->ops->module);

		nvme_put_ctrl(subsys->passthru_ctrl);

	}

	subsys->passthru_ctrl = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE