Commit 550203e6 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.16' of git://git.infradead.org/nvme into for-4.16/block 

Pull NVMe fixes from Christoph:

"Below are the pending nvme updates for Linux 4.16. Just fixes and
 cleanups from various contributors this time around."
parents fb350e0a b837b283

drivers/nvme/host/core.c

+54 −8
Original line number Diff line number Diff line
@@ -232,6 +232,15 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 


	old_state = ctrl->state;

	switch (new_state) {

	case NVME_CTRL_ADMIN_ONLY:

		switch (old_state) {

		case NVME_CTRL_RESETTING:

			changed = true;

			/* FALLTHRU */

		default:

			break;

		}

		break;

	case NVME_CTRL_LIVE:

		switch (old_state) {

		case NVME_CTRL_NEW:
@@ -247,6 +256,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
		switch (old_state) {

		case NVME_CTRL_NEW:

		case NVME_CTRL_LIVE:

		case NVME_CTRL_ADMIN_ONLY:

			changed = true;

			/* FALLTHRU */

		default:
@@ -266,6 +276,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
	case NVME_CTRL_DELETING:

		switch (old_state) {

		case NVME_CTRL_LIVE:

		case NVME_CTRL_ADMIN_ONLY:

		case NVME_CTRL_RESETTING:

		case NVME_CTRL_RECONNECTING:

			changed = true;
@@ -1217,16 +1228,27 @@ static int nvme_open(struct block_device *bdev, fmode_t mode) 
#ifdef CONFIG_NVME_MULTIPATH

	/* should never be called due to GENHD_FL_HIDDEN */

	if (WARN_ON_ONCE(ns->head->disk))

		return -ENXIO;

		goto fail;

#endif

	if (!kref_get_unless_zero(&ns->kref))

		return -ENXIO;

		goto fail;

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

		goto fail_put_ns;



	return 0;



fail_put_ns:

	nvme_put_ns(ns);

fail:

	return -ENXIO;

}



static void nvme_release(struct gendisk *disk, fmode_t mode)

{

	nvme_put_ns(disk->private_data);

	struct nvme_ns *ns = disk->private_data;



	module_put(ns->ctrl->ops->module);

	nvme_put_ns(ns);

}



static int nvme_getgeo(struct block_device *bdev, struct hd_geometry *geo)
@@ -2047,6 +2069,22 @@ static const struct attribute_group *nvme_subsys_attrs_groups[] = { 
	NULL,

};



static int nvme_active_ctrls(struct nvme_subsystem *subsys)

{

	int count = 0;

	struct nvme_ctrl *ctrl;



	mutex_lock(&subsys->lock);

	list_for_each_entry(ctrl, &subsys->ctrls, subsys_entry) {

		if (ctrl->state != NVME_CTRL_DELETING &&

		    ctrl->state != NVME_CTRL_DEAD)

			count++;

	}

	mutex_unlock(&subsys->lock);



	return count;

}



static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)

{

	struct nvme_subsystem *subsys, *found;
@@ -2085,7 +2123,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
		 * Verify that the subsystem actually supports multiple

		 * controllers, else bail out.

		 */

		if (!(id->cmic & (1 << 1))) {

		if (nvme_active_ctrls(found) && !(id->cmic & (1 << 1))) {

			dev_err(ctrl->device,

				"ignoring ctrl due to duplicate subnqn (%s).\n",

				found->subnqn);
@@ -2252,7 +2290,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) 
						 shutdown_timeout, 60);



		if (ctrl->shutdown_timeout != shutdown_timeout)

			dev_warn(ctrl->device,

			dev_info(ctrl->device,

				 "Shutdown timeout set to %u seconds\n",

				 ctrl->shutdown_timeout);

	} else
@@ -2336,8 +2374,14 @@ static int nvme_dev_open(struct inode *inode, struct file *file) 
	struct nvme_ctrl *ctrl =

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



	if (ctrl->state != NVME_CTRL_LIVE)

	switch (ctrl->state) {

	case NVME_CTRL_LIVE:

	case NVME_CTRL_ADMIN_ONLY:

		break;

	default:

		return -EWOULDBLOCK;

	}



	file->private_data = ctrl;

	return 0;

}
@@ -2601,6 +2645,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, 
	static const char *const state_name[] = {

		[NVME_CTRL_NEW]		= "new",

		[NVME_CTRL_LIVE]	= "live",

		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",

		[NVME_CTRL_RESETTING]	= "resetting",

		[NVME_CTRL_RECONNECTING]= "reconnecting",

		[NVME_CTRL_DELETING]	= "deleting",
@@ -3073,6 +3118,8 @@ static void nvme_scan_work(struct work_struct *work) 
	if (ctrl->state != NVME_CTRL_LIVE)

		return;



	WARN_ON_ONCE(!ctrl->tagset);



	if (nvme_identify_ctrl(ctrl, &id))

		return;
@@ -3093,8 +3140,7 @@ static void nvme_scan_work(struct work_struct *work) 
void nvme_queue_scan(struct nvme_ctrl *ctrl)

{

	/*

	 * Do not queue new scan work when a controller is reset during

	 * removal.

	 * Only new queue scan work when admin and IO queues are both alive

	 */

	if (ctrl->state == NVME_CTRL_LIVE)

		queue_work(nvme_wq, &ctrl->scan_work);

drivers/nvme/host/fabrics.c

+13 −4
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ EXPORT_SYMBOL_GPL(nvmf_should_reconnect); 
 */

int nvmf_register_transport(struct nvmf_transport_ops *ops)

{

	if (!ops->create_ctrl)

	if (!ops->create_ctrl || !ops->module)

		return -EINVAL;



	down_write(&nvmf_transports_rwsem);
@@ -868,32 +868,41 @@ nvmf_create_ctrl(struct device *dev, const char *buf, size_t count) 
		goto out_unlock;

	}



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

		ret = -EBUSY;

		goto out_unlock;

	}



	ret = nvmf_check_required_opts(opts, ops->required_opts);

	if (ret)

		goto out_unlock;

		goto out_module_put;

	ret = nvmf_check_allowed_opts(opts, NVMF_ALLOWED_OPTS |

				ops->allowed_opts | ops->required_opts);

	if (ret)

		goto out_unlock;

		goto out_module_put;



	ctrl = ops->create_ctrl(dev, opts);

	if (IS_ERR(ctrl)) {

		ret = PTR_ERR(ctrl);

		goto out_unlock;

		goto out_module_put;

	}



	if (strcmp(ctrl->subsys->subnqn, opts->subsysnqn)) {

		dev_warn(ctrl->device,

			"controller returned incorrect NQN: \"%s\".\n",

			ctrl->subsys->subnqn);

		module_put(ops->module);

		up_read(&nvmf_transports_rwsem);

		nvme_delete_ctrl_sync(ctrl);

		return ERR_PTR(-EINVAL);

	}



	module_put(ops->module);

	up_read(&nvmf_transports_rwsem);

	return ctrl;



out_module_put:

	module_put(ops->module);

out_unlock:

	up_read(&nvmf_transports_rwsem);

out_free_opts:

drivers/nvme/host/fabrics.h

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct nvmf_ctrl_options { 
 *			       fabric implementation of NVMe fabrics.

 * @entry:		Used by the fabrics library to add the new

 *			registration entry to its linked-list internal tree.

 * @module:             Transport module reference

 * @name:		Name of the NVMe fabric driver implementation.

 * @required_opts:	sysfs command-line options that must be specified

 *			when adding a new NVMe controller.
@@ -126,6 +127,7 @@ struct nvmf_ctrl_options { 
 */

struct nvmf_transport_ops {

	struct list_head	entry;

	struct module		*module;

	const char		*name;

	int			required_opts;

	int			allowed_opts;

drivers/nvme/host/fc.c

+1 −0
Original line number Diff line number Diff line
@@ -3381,6 +3381,7 @@ nvme_fc_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) 


static struct nvmf_transport_ops nvme_fc_transport = {

	.name		= "fc",

	.module		= THIS_MODULE,

	.required_opts	= NVMF_OPT_TRADDR | NVMF_OPT_HOST_TRADDR,

	.allowed_opts	= NVMF_OPT_RECONNECT_DELAY | NVMF_OPT_CTRL_LOSS_TMO,

	.create_ctrl	= nvme_fc_create_ctrl,

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static inline struct nvme_request *nvme_req(struct request *req) 
enum nvme_ctrl_state {

	NVME_CTRL_NEW,

	NVME_CTRL_LIVE,

	NVME_CTRL_ADMIN_ONLY,    /* Only admin queue live */

	NVME_CTRL_RESETTING,

	NVME_CTRL_RECONNECTING,

	NVME_CTRL_DELETING,