Commit 037b2625 authored by Jens Axboe's avatar Jens Axboe
Browse files

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

Pull NVMe changes for 5.1 from Christoph

* 'nvme-5.1' of git://git.infradead.org/nvme: (22 commits)
  nvme-rdma: use nr_phys_segments when map rq to sgl
  nvmet: convert to SPDX identifiers
  nvmet-rdma: convert to SPDX identifiers
  nvme-loop: convert to SPDX identifiers
  nvmet-fcloop: convert to SPDX identifiers
  nvmet-fc: convert to SPDX identifiers
  nvme: convert to SPDX identifiers
  nvme-pci: convert to SPDX identifiers
  nvme-lightnvm: convert to SPDX identifiers
  nvme-rdma: convert to SPDX identifiers
  nvme-fc: convert to SPDX identifiers
  nvme-fabrics: convert to SPDX identifiers
  nvme-tcp.h: fix SPDX header
  nvme_ioctl.h: remove duplicate GPL boilerplate
  nvme: return error from nvme_alloc_ns()
  nvme: avoid that deleting a controller triggers a circular locking complaint
  nvme: introduce a helper function for controller deletion
  nvme: unexport nvme_delete_ctrl_sync()
  nvme-pci: check kstrtoint() return value in queue_count_set()
  nvme-fabrics: document the poll function argument
  ...
parents 49b1f22b 34e08191

drivers/nvme/host/core.c

+41 −27
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * NVM Express device driver

 * Copyright (c) 2011-2014, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#include <linux/blkdev.h>
@@ -151,11 +143,8 @@ int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl) 
}

EXPORT_SYMBOL_GPL(nvme_reset_ctrl_sync);



static void nvme_delete_ctrl_work(struct work_struct *work)

static void nvme_do_delete_ctrl(struct nvme_ctrl *ctrl)

{

	struct nvme_ctrl *ctrl =

		container_of(work, struct nvme_ctrl, delete_work);



	dev_info(ctrl->device,

		 "Removing ctrl: NQN \"%s\"\n", ctrl->opts->subsysnqn);
@@ -167,6 +156,14 @@ static void nvme_delete_ctrl_work(struct work_struct *work) 
	nvme_put_ctrl(ctrl);

}



static void nvme_delete_ctrl_work(struct work_struct *work)

{

	struct nvme_ctrl *ctrl =

		container_of(work, struct nvme_ctrl, delete_work);



	nvme_do_delete_ctrl(ctrl);

}



int nvme_delete_ctrl(struct nvme_ctrl *ctrl)

{

	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_DELETING))
@@ -177,7 +174,7 @@ int nvme_delete_ctrl(struct nvme_ctrl *ctrl) 
}

EXPORT_SYMBOL_GPL(nvme_delete_ctrl);



int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)

static int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)

{

	int ret = 0;
@@ -186,13 +183,13 @@ int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) 
	 * can free the controller.

	 */

	nvme_get_ctrl(ctrl);

	ret = nvme_delete_ctrl(ctrl);

	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_DELETING))

		ret = -EBUSY;

	if (!ret)

		flush_work(&ctrl->delete_work);

		nvme_do_delete_ctrl(ctrl);

	nvme_put_ctrl(ctrl);

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_delete_ctrl_sync);



static inline bool nvme_ns_has_pi(struct nvme_ns *ns)

{
@@ -2328,6 +2325,9 @@ static struct attribute *nvme_subsys_attrs[] = { 
	&subsys_attr_serial.attr,

	&subsys_attr_firmware_rev.attr,

	&subsys_attr_subsysnqn.attr,

#ifdef CONFIG_NVME_MULTIPATH

	&subsys_attr_iopolicy.attr,

#endif

	NULL,

};
@@ -2380,6 +2380,9 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) 
	memcpy(subsys->firmware_rev, id->fr, sizeof(subsys->firmware_rev));

	subsys->vendor_id = le16_to_cpu(id->vid);

	subsys->cmic = id->cmic;

#ifdef CONFIG_NVME_MULTIPATH

	subsys->iopolicy = NVME_IOPOLICY_NUMA;

#endif



	subsys->dev.class = nvme_subsys_class;

	subsys->dev.release = nvme_release_subsystem;
@@ -3211,21 +3214,23 @@ static int nvme_setup_streams_ns(struct nvme_ctrl *ctrl, struct nvme_ns *ns) 
	return 0;

}



static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)

static int nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)

{

	struct nvme_ns *ns;

	struct gendisk *disk;

	struct nvme_id_ns *id;

	char disk_name[DISK_NAME_LEN];

	int node = ctrl->numa_node, flags = GENHD_FL_EXT_DEVT;

	int node = ctrl->numa_node, flags = GENHD_FL_EXT_DEVT, ret;



	ns = kzalloc_node(sizeof(*ns), GFP_KERNEL, node);

	if (!ns)

		return;

		return -ENOMEM;



	ns->queue = blk_mq_init_queue(ctrl->tagset);

	if (IS_ERR(ns->queue))

	if (IS_ERR(ns->queue)) {

		ret = PTR_ERR(ns->queue);

		goto out_free_ns;

	}



	blk_queue_flag_set(QUEUE_FLAG_NONROT, ns->queue);

	if (ctrl->ops->flags & NVME_F_PCI_P2PDMA)
@@ -3241,20 +3246,27 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	nvme_set_queue_limits(ctrl, ns->queue);



	id = nvme_identify_ns(ctrl, nsid);

	if (!id)

	if (!id) {

		ret = -EIO;

		goto out_free_queue;

	}



	if (id->ncap == 0)

	if (id->ncap == 0) {

		ret = -EINVAL;

		goto out_free_id;

	}



	if (nvme_init_ns_head(ns, nsid, id))

	ret = nvme_init_ns_head(ns, nsid, id);

	if (ret)

		goto out_free_id;

	nvme_setup_streams_ns(ctrl, ns);

	nvme_set_disk_name(disk_name, ns, ctrl, &flags);



	disk = alloc_disk_node(0, node);

	if (!disk)

	if (!disk) {

		ret = -ENOMEM;

		goto out_unlink_ns;

	}



	disk->fops = &nvme_fops;

	disk->private_data = ns;
@@ -3266,7 +3278,8 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	__nvme_revalidate_disk(disk, id);



	if ((ctrl->quirks & NVME_QUIRK_LIGHTNVM) && id->vs[0] == 0x1) {

		if (nvme_nvm_register(ns, disk_name, node)) {

		ret = nvme_nvm_register(ns, disk_name, node);

		if (ret) {

			dev_warn(ctrl->device, "LightNVM init failure\n");

			goto out_put_disk;

		}
@@ -3284,7 +3297,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	nvme_fault_inject_init(ns);

	kfree(id);



	return;

	return 0;

 out_put_disk:

	put_disk(ns->disk);

 out_unlink_ns:
@@ -3297,6 +3310,7 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
	blk_cleanup_queue(ns->queue);

 out_free_ns:

	kfree(ns);

	return ret;

}



static void nvme_ns_remove(struct nvme_ns *ns)

drivers/nvme/host/fabrics.c

+2 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * NVMe over Fabrics common host code.

 * Copyright (c) 2015-2016 HGST, a Western Digital Company.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/init.h>
@@ -430,6 +422,7 @@ EXPORT_SYMBOL_GPL(nvmf_connect_admin_queue); 
 * @qid:	NVMe I/O queue number for the new I/O connection between

 *		host and target (note qid == 0 is illegal as this is

 *		the Admin queue, per NVMe standard).

 * @poll:	Whether or not to poll for the completion of the connect cmd.

 *

 * This function issues a fabrics-protocol connection

 * of a NVMe I/O queue (via NVMe Fabrics "Connect" command)

drivers/nvme/host/fabrics.h

+1 −9
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * NVMe over Fabrics common host code.

 * Copyright (c) 2015-2016 HGST, a Western Digital Company.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#ifndef _NVME_FABRICS_H

#define _NVME_FABRICS_H 1

drivers/nvme/host/fault_inject.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * fault injection support for nvme.

 *

 * Copyright (c) 2018, Oracle and/or its affiliates

 *

 */



#include <linux/moduleparam.h>

drivers/nvme/host/fc.c

+1 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2016 Avago Technologies.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful.

 * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,

 * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A

 * PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO

 * THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.

 * See the GNU General Public License for more details, a copy of which

 * can be found in the file COPYING included with this package

 *

 */

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/module.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE