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

Merge tag 'nvme-6.4-2023-04-14' of git://git.infradead.org/nvme into for-6.4/block 

Pull NVMe updates from Christoph:

"nvme updates for Linux 6.4

 - drop redundant pci_enable_pcie_error_reporting (Bjorn Helgaas)
 - validate nvmet module parameters (Chaitanya Kulkarni)
 - fence TCP socket on receive error (Chris Leech)
 - fix async event trace event (Keith Busch)
 - minor cleanups (Chaitanya Kulkarni, zhenwei pi)
 - fix and cleanup nvmet Identify handling (Damien Le Moal,
   Christoph Hellwig)
 - fix double blk_mq_complete_request race in the timeout handler
   (Lei Yin)
 - fix irq locking in nvme-fcloop (Ming Lei)
 - remove queue mapping helper for rdma devices (Sagi Grimberg)"

* tag 'nvme-6.4-2023-04-14' of git://git.infradead.org/nvme:
  nvme-fcloop: fix "inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage"
  blk-mq-rdma: remove queue mapping helper for rdma devices
  nvme-rdma: minor cleanup in nvme_rdma_create_cq()
  nvme: fix double blk_mq_complete_request for timeout request with low probability
  nvme: fix async event trace event
  nvme-apple: return directly instead of else
  nvme-apple: return directly instead of else
  nvmet-tcp: validate idle poll modparam value
  nvmet-tcp: validate so_priority modparam value
  nvme-tcp: fence TCP socket on receive error
  nvmet: remove nvmet_req_cns_error_complete
  nvmet: rename nvmet_execute_identify_cns_cs_ns
  nvmet: fix Identify Identification Descriptor List handling
  nvmet: cleanup nvmet_execute_identify()
  nvmet: fix I/O Command Set specific Identify Controller
  nvmet: fix Identify Active Namespace ID list handling
  nvmet: fix Identify Controller handling
  nvmet: fix Identify Namespace handling
  nvmet: fix error handling in nvmet_execute_identify_cns_cs_ns()
  nvme-pci: drop redundant pci_enable_pcie_error_reporting()
parents bb4c19e0 4f86a6ff

block/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -215,11 +215,6 @@ config BLK_MQ_VIRTIO 
	depends on VIRTIO

	default y



config BLK_MQ_RDMA

	bool

	depends on INFINIBAND

	default y



config BLK_PM

	def_bool PM

block/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o 
obj-$(CONFIG_BLK_DEV_INTEGRITY_T10)	+= t10-pi.o

obj-$(CONFIG_BLK_MQ_PCI)	+= blk-mq-pci.o

obj-$(CONFIG_BLK_MQ_VIRTIO)	+= blk-mq-virtio.o

obj-$(CONFIG_BLK_MQ_RDMA)	+= blk-mq-rdma.o

obj-$(CONFIG_BLK_DEV_ZONED)	+= blk-zoned.o

obj-$(CONFIG_BLK_WBT)		+= blk-wbt.o

obj-$(CONFIG_BLK_DEBUG_FS)	+= blk-mq-debugfs.o

block/blk-mq-rdma.c

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2017 Sagi Grimberg.

 */

#include <linux/blk-mq.h>

#include <linux/blk-mq-rdma.h>

#include <rdma/ib_verbs.h>



/**

 * blk_mq_rdma_map_queues - provide a default queue mapping for rdma device

 * @map:	CPU to hardware queue map.

 * @dev:	rdma device to provide a mapping for.

 * @first_vec:	first interrupt vectors to use for queues (usually 0)

 *

 * This function assumes the rdma device @dev has at least as many available

 * interrupt vetors as @set has queues.  It will then query it's affinity mask

 * and built queue mapping that maps a queue to the CPUs that have irq affinity

 * for the corresponding vector.

 *

 * In case either the driver passed a @dev with less vectors than

 * @set->nr_hw_queues, or @dev does not provide an affinity mask for a

 * vector, we fallback to the naive mapping.

 */

void blk_mq_rdma_map_queues(struct blk_mq_queue_map *map,

		struct ib_device *dev, int first_vec)

{

	const struct cpumask *mask;

	unsigned int queue, cpu;



	for (queue = 0; queue < map->nr_queues; queue++) {

		mask = ib_get_vector_affinity(dev, first_vec + queue);

		if (!mask)

			goto fallback;



		for_each_cpu(cpu, mask)

			map->mq_map[cpu] = map->queue_offset + queue;

	}



	return;



fallback:

	blk_mq_map_queues(map);

}

EXPORT_SYMBOL_GPL(blk_mq_rdma_map_queues);

drivers/nvme/host/apple.c

+4 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static inline struct apple_nvme *queue_to_apple_nvme(struct apple_nvme_queue *q) 
{

	if (q->is_adminq)

		return container_of(q, struct apple_nvme, adminq);

	else



	return container_of(q, struct apple_nvme, ioq);

}
@@ -217,7 +217,7 @@ static unsigned int apple_nvme_queue_depth(struct apple_nvme_queue *q) 
{

	if (q->is_adminq)

		return APPLE_NVME_AQ_DEPTH;

	else



	return APPLE_ANS_MAX_QUEUE_DEPTH;

}

drivers/nvme/host/core.c

+3 −6
Original line number Diff line number Diff line
@@ -450,8 +450,8 @@ bool nvme_cancel_request(struct request *req, void *data) 
	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,

				"Cancelling I/O %d", req->tag);



	/* don't abort one completed request */

	if (blk_mq_request_completed(req))

	/* don't abort one completed or idle request */

	if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)

		return true;



	nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
@@ -4808,8 +4808,6 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) 
	u32 aer_notice_type = nvme_aer_subtype(result);

	bool requeue = true;



	trace_nvme_async_event(ctrl, aer_notice_type);



	switch (aer_notice_type) {

	case NVME_AER_NOTICE_NS_CHANGED:

		set_bit(NVME_AER_NOTICE_NS_CHANGED, &ctrl->events);
@@ -4845,7 +4843,6 @@ static bool nvme_handle_aen_notice(struct nvme_ctrl *ctrl, u32 result) 


static void nvme_handle_aer_persistent_error(struct nvme_ctrl *ctrl)

{

	trace_nvme_async_event(ctrl, NVME_AER_ERROR);

	dev_warn(ctrl->device, "resetting controller due to AER\n");

	nvme_reset_ctrl(ctrl);

}
@@ -4861,6 +4858,7 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, 
	if (le16_to_cpu(status) >> 1 != NVME_SC_SUCCESS)

		return;



	trace_nvme_async_event(ctrl, result);

	switch (aer_type) {

	case NVME_AER_NOTICE:

		requeue = nvme_handle_aen_notice(ctrl, result);
@@ -4878,7 +4876,6 @@ void nvme_complete_async_event(struct nvme_ctrl *ctrl, __le16 status, 
	case NVME_AER_SMART:

	case NVME_AER_CSS:

	case NVME_AER_VS:

		trace_nvme_async_event(ctrl, aer_type);

		ctrl->aen_result = result;

		break;

	default: