Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbf3a959 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus 

Pull a handful of NVMe fixes from Christoph that should go into 4.15.
parents 454be724 254beb84

drivers/nvme/host/core.c

+6 −1
Original line number Diff line number Diff line
@@ -1335,6 +1335,7 @@ static void nvme_update_disk_info(struct gendisk *disk, 
		struct nvme_ns *ns, struct nvme_id_ns *id)

{

	sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9);

	unsigned short bs = 1 << ns->lba_shift;

	unsigned stream_alignment = 0;



	if (ns->ctrl->nr_streams && ns->sws && ns->sgs)
@@ -1343,7 +1344,10 @@ static void nvme_update_disk_info(struct gendisk *disk, 
	blk_mq_freeze_queue(disk->queue);

	blk_integrity_unregister(disk);



	blk_queue_logical_block_size(disk->queue, 1 << ns->lba_shift);

	blk_queue_logical_block_size(disk->queue, bs);

	blk_queue_physical_block_size(disk->queue, bs);

	blk_queue_io_min(disk->queue, bs);



	if (ns->ms && !ns->ext &&

	    (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED))

		nvme_init_integrity(disk, ns->ms, ns->pi_type);
@@ -2987,6 +2991,7 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
	mutex_unlock(&ns->ctrl->namespaces_mutex);



	synchronize_srcu(&ns->head->srcu);

	nvme_mpath_check_last_path(ns);

	nvme_put_ns(ns);

}

drivers/nvme/host/nvme.h

+12 −0
Original line number Diff line number Diff line
@@ -417,6 +417,15 @@ static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns) 
		rcu_assign_pointer(head->current_path, NULL);

}

struct nvme_ns *nvme_find_path(struct nvme_ns_head *head);



static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)

{

	struct nvme_ns_head *head = ns->head;



	if (head->disk && list_empty(&head->list))

		kblockd_schedule_work(&head->requeue_work);

}



#else

static inline void nvme_failover_req(struct request *req)

{
@@ -448,6 +457,9 @@ static inline void nvme_mpath_remove_disk_links(struct nvme_ns *ns) 
static inline void nvme_mpath_clear_current_path(struct nvme_ns *ns)

{

}

static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)

{

}

#endif /* CONFIG_NVME_MULTIPATH */



#ifdef CONFIG_NVM

drivers/nvme/host/pci.c

+20 −22
Original line number Diff line number Diff line
@@ -448,12 +448,31 @@ static void **nvme_pci_iod_list(struct request *req) 
	return (void **)(iod->sg + blk_rq_nr_phys_segments(req));

}



static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req)

{

	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);

	unsigned int avg_seg_size;



	avg_seg_size = DIV_ROUND_UP(blk_rq_payload_bytes(req),

			blk_rq_nr_phys_segments(req));



	if (!(dev->ctrl.sgls & ((1 << 0) | (1 << 1))))

		return false;

	if (!iod->nvmeq->qid)

		return false;

	if (!sgl_threshold || avg_seg_size < sgl_threshold)

		return false;

	return true;

}



static blk_status_t nvme_init_iod(struct request *rq, struct nvme_dev *dev)

{

	struct nvme_iod *iod = blk_mq_rq_to_pdu(rq);

	int nseg = blk_rq_nr_phys_segments(rq);

	unsigned int size = blk_rq_payload_bytes(rq);



	iod->use_sgl = nvme_pci_use_sgls(dev, rq);



	if (nseg > NVME_INT_PAGES || size > NVME_INT_BYTES(dev)) {

		size_t alloc_size = nvme_pci_iod_alloc_size(dev, size, nseg,

				iod->use_sgl);
@@ -604,8 +623,6 @@ static blk_status_t nvme_pci_setup_prps(struct nvme_dev *dev, 
	dma_addr_t prp_dma;

	int nprps, i;



	iod->use_sgl = false;



	length -= (page_size - offset);

	if (length <= 0) {

		iod->first_dma = 0;
@@ -715,8 +732,6 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, 
	int entries = iod->nents, i = 0;

	dma_addr_t sgl_dma;



	iod->use_sgl = true;



	/* setting the transfer type as SGL */

	cmd->flags = NVME_CMD_SGL_METABUF;
@@ -770,23 +785,6 @@ static blk_status_t nvme_pci_setup_sgls(struct nvme_dev *dev, 
	return BLK_STS_OK;

}



static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req)

{

	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);

	unsigned int avg_seg_size;



	avg_seg_size = DIV_ROUND_UP(blk_rq_payload_bytes(req),

			blk_rq_nr_phys_segments(req));



	if (!(dev->ctrl.sgls & ((1 << 0) | (1 << 1))))

		return false;

	if (!iod->nvmeq->qid)

		return false;

	if (!sgl_threshold || avg_seg_size < sgl_threshold)

		return false;

	return true;

}



static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,

		struct nvme_command *cmnd)

{
@@ -806,7 +804,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, 
				DMA_ATTR_NO_WARN))

		goto out;



	if (nvme_pci_use_sgls(dev, req))

	if (iod->use_sgl)

		ret = nvme_pci_setup_sgls(dev, req, &cmnd->rw);

	else

		ret = nvme_pci_setup_prps(dev, req, &cmnd->rw);

drivers/nvme/host/rdma.c

+13 −1
Original line number Diff line number Diff line
@@ -974,12 +974,18 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) 
	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

	nvme_start_queues(&ctrl->ctrl);



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

		/* state change failure should never happen */

		WARN_ON_ONCE(1);

		return;

	}



	nvme_rdma_reconnect_or_remove(ctrl);

}



static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)

{

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

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RESETTING))

		return;



	queue_work(nvme_wq, &ctrl->err_work);
@@ -1753,6 +1759,12 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_rdma_shutdown_ctrl(ctrl, false);



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

		/* state change failure should never happen */

		WARN_ON_ONCE(1);

		return;

	}



	ret = nvme_rdma_configure_admin_queue(ctrl, false);

	if (ret)

		goto out_fail;

drivers/nvme/target/fcloop.c

+1 −1
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ fcloop_delete_target_port(struct device *dev, struct device_attribute *attr, 
		const char *buf, size_t count)

{

	struct fcloop_nport *nport = NULL, *tmpport;

	struct fcloop_tport *tport;

	struct fcloop_tport *tport = NULL;

	u64 nodename, portname;

	unsigned long flags;

	int ret;