Commit b16791de 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:

"The additional week before the 4.15 release gave us time for a few more
nvme fixes, as well as the nifty trace points from Johannes"

* 'nvme-4.16' of git://git.infradead.org/nvme:
  nvme: add tracepoint for nvme_complete_rq
  nvme: add tracepoint for nvme_setup_cmd
  nvme-pci: introduce RECONNECTING state to mark initializing procedure
  nvme-rdma: remove redundant boolean for inline_data
  nvme: don't free uuid pointer before printing it
  nvme-pci: Suspend queues after deleting them
  nvme-pci: Fix queue double allocations
parents 3124b65d ca5554a6

drivers/nvme/host/Makefile

+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



ccflags-y				+= -I$(src)



obj-$(CONFIG_NVME_CORE)			+= nvme-core.o

obj-$(CONFIG_BLK_DEV_NVME)		+= nvme.o

obj-$(CONFIG_NVME_FABRICS)		+= nvme-fabrics.o
@@ -6,6 +9,7 @@ obj-$(CONFIG_NVME_RDMA) += nvme-rdma.o 
obj-$(CONFIG_NVME_FC)			+= nvme-fc.o



nvme-core-y				:= core.o

nvme-core-$(CONFIG_TRACING)		+= trace.o

nvme-core-$(CONFIG_NVME_MULTIPATH)	+= multipath.o

nvme-core-$(CONFIG_NVM)			+= lightnvm.o

drivers/nvme/host/core.c

+10 −1
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 
#include <linux/pm_qos.h>

#include <asm/unaligned.h>



#define CREATE_TRACE_POINTS

#include "trace.h"



#include "nvme.h"

#include "fabrics.h"
@@ -217,6 +220,8 @@ void nvme_complete_rq(struct request *req) 
{

	blk_status_t status = nvme_error_status(req);



	trace_nvme_complete_rq(req);



	if (unlikely(status != BLK_STS_OK && nvme_req_needs_retry(req))) {

		if (nvme_req_needs_failover(req, status)) {

			nvme_failover_req(req);
@@ -260,7 +265,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
	switch (new_state) {

	case NVME_CTRL_ADMIN_ONLY:

		switch (old_state) {

		case NVME_CTRL_RESETTING:

		case NVME_CTRL_RECONNECTING:

			changed = true;

			/* FALLTHRU */

		default:
@@ -628,6 +633,10 @@ blk_status_t nvme_setup_cmd(struct nvme_ns *ns, struct request *req, 
	}



	cmd->common.command_id = req->tag;

	if (ns)

		trace_nvme_setup_nvm_cmd(req->q->id, cmd);

	else

		trace_nvme_setup_admin_cmd(cmd);

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_setup_cmd);

drivers/nvme/host/fabrics.c

+2 −1
Original line number Diff line number Diff line
@@ -739,12 +739,13 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, 
				goto out;

			}

			ret = uuid_parse(p, &hostid);

			kfree(p);

			if (ret) {

				pr_err("Invalid hostid %s\n", p);

				ret = -EINVAL;

				kfree(p);

				goto out;

			}

			kfree(p);

			break;

		case NVMF_OPT_DUP_CONNECT:

			opts->duplicate_connect = true;

drivers/nvme/host/pci.c

+28 −21
Original line number Diff line number Diff line
@@ -1140,9 +1140,14 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts) 
	 */

	bool nssro = dev->subsystem && (csts & NVME_CSTS_NSSRO);



	/* If there is a reset ongoing, we shouldn't reset again. */

	if (dev->ctrl.state == NVME_CTRL_RESETTING)

	/* If there is a reset/reinit ongoing, we shouldn't reset again. */

	switch (dev->ctrl.state) {

	case NVME_CTRL_RESETTING:

	case NVME_CTRL_RECONNECTING:

		return false;

	default:

		break;

	}



	/* We shouldn't reset unless the controller is on fatal error state

	 * _or_ if we lost the communication with it.
@@ -1324,9 +1329,6 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown) 
{

	struct nvme_queue *nvmeq = &dev->queues[0];



	if (nvme_suspend_queue(nvmeq))

		return;



	if (shutdown)

		nvme_shutdown_ctrl(&dev->ctrl);

	else
@@ -1384,6 +1386,9 @@ static int nvme_alloc_queue(struct nvme_dev *dev, int qid, 
{

	struct nvme_queue *nvmeq = &dev->queues[qid];



	if (dev->ctrl.queue_count > qid)

		return 0;



	nvmeq->cqes = dma_zalloc_coherent(dev->dev, CQ_SIZE(depth),

					  &nvmeq->cq_dma_addr, GFP_KERNEL);

	if (!nvmeq->cqes)
@@ -2008,9 +2013,9 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) 
	return 0;

}



static void nvme_disable_io_queues(struct nvme_dev *dev, int queues)

static void nvme_disable_io_queues(struct nvme_dev *dev)

{

	int pass;

	int pass, queues = dev->online_queues - 1;

	unsigned long timeout;

	u8 opcode = nvme_admin_delete_sq;
@@ -2161,7 +2166,7 @@ static void nvme_pci_disable(struct nvme_dev *dev) 


static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)

{

	int i, queues;

	int i;

	bool dead = true;

	struct pci_dev *pdev = to_pci_dev(dev->dev);
@@ -2196,21 +2201,13 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	}

	nvme_stop_queues(&dev->ctrl);



	queues = dev->online_queues - 1;

	for (i = dev->ctrl.queue_count - 1; i > 0; i--)

		nvme_suspend_queue(&dev->queues[i]);



	if (dead) {

		/* A device might become IO incapable very soon during

		 * probe, before the admin queue is configured. Thus,

		 * queue_count can be 0 here.

		 */

		if (dev->ctrl.queue_count)

			nvme_suspend_queue(&dev->queues[0]);

	} else {

		nvme_disable_io_queues(dev, queues);

	if (!dead) {

		nvme_disable_io_queues(dev);

		nvme_disable_admin_queue(dev, shutdown);

	}

	for (i = dev->ctrl.queue_count - 1; i >= 0; i--)

		nvme_suspend_queue(&dev->queues[i]);



	nvme_pci_disable(dev);



	blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_request, &dev->ctrl);
@@ -2292,6 +2289,16 @@ static void nvme_reset_work(struct work_struct *work) 
	if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)

		nvme_dev_disable(dev, false);



	/*

	 * Introduce RECONNECTING state from nvme-fc/rdma transports to mark the

	 * initializing procedure here.

	 */

	if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RECONNECTING)) {

		dev_warn(dev->ctrl.device,

			"failed to mark controller RECONNECTING\n");

		goto out;

	}



	result = nvme_pci_enable(dev);

	if (result)

		goto out;

drivers/nvme/host/rdma.c

+0 −3
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct nvme_rdma_request { 
	struct ib_sge		sge[1 + NVME_RDMA_MAX_INLINE_SEGMENTS];

	u32			num_sge;

	int			nents;

	bool			inline_data;

	struct ib_reg_wr	reg_wr;

	struct ib_cqe		reg_cqe;

	struct nvme_rdma_queue  *queue;
@@ -1086,7 +1085,6 @@ static int nvme_rdma_map_sg_inline(struct nvme_rdma_queue *queue, 
	sg->length = cpu_to_le32(sg_dma_len(req->sg_table.sgl));

	sg->type = (NVME_SGL_FMT_DATA_DESC << 4) | NVME_SGL_FMT_OFFSET;



	req->inline_data = true;

	req->num_sge++;

	return 0;

}
@@ -1158,7 +1156,6 @@ static int nvme_rdma_map_data(struct nvme_rdma_queue *queue, 
	int count, ret;



	req->num_sge = 1;

	req->inline_data = false;

	refcount_set(&req->ref, 2); /* send and recv completions */



	c->common.flags |= NVME_CMD_SGL_METABUF;

CRA Git | Maintained and supported by SUSTech CRA and CCSE