Commit 3d25a941 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.9-20240503' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Nothing major in here - an nvme pull request with mostly auth/tcp
  fixes, and a single fix for ublk not setting segment count and size
  limits"

* tag 'block-6.9-20240503' of git://git.kernel.dk/linux:
  nvme-tcp: strict pdu pacing to avoid send stalls on TLS
  nvmet: fix nvme status code when namespace is disabled
  nvmet-tcp: fix possible memory leak when tearing down a controller
  nvme: cancel pending I/O if nvme controller is in terminal state
  nvmet-auth: replace pr_debug() with pr_err() to report an error.
  nvmet-auth: return the error code to the nvmet_auth_host_hash() callers
  nvme: find numa distance only if controller has valid numa id
  ublk: remove segment count and size limits
  nvme: fix warn output about shared namespaces without CONFIG_NVME_MULTIPATH
parents 7dc78c7b fb15ffd0

drivers/block/ublk_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -2177,7 +2177,8 @@ static int ublk_ctrl_start_dev(struct ublk_device *ub, struct io_uring_cmd *cmd) 
		.max_hw_sectors		= p->max_sectors,

		.chunk_sectors		= p->chunk_sectors,

		.virt_boundary_mask	= p->virt_boundary_mask,



		.max_segments		= USHRT_MAX,

		.max_segment_size	= UINT_MAX,

	};

	struct gendisk *disk;

	int ret = -EINVAL;

drivers/nvme/host/core.c

+1 −22
Original line number Diff line number Diff line
@@ -628,27 +628,6 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
}

EXPORT_SYMBOL_GPL(nvme_change_ctrl_state);



/*

 * Returns true for sink states that can't ever transition back to live.

 */

static bool nvme_state_terminal(struct nvme_ctrl *ctrl)

{

	switch (nvme_ctrl_state(ctrl)) {

	case NVME_CTRL_NEW:

	case NVME_CTRL_LIVE:

	case NVME_CTRL_RESETTING:

	case NVME_CTRL_CONNECTING:

		return false;

	case NVME_CTRL_DELETING:

	case NVME_CTRL_DELETING_NOIO:

	case NVME_CTRL_DEAD:

		return true;

	default:

		WARN_ONCE(1, "Unhandled ctrl state:%d", ctrl->state);

		return true;

	}

}



/*

 * Waits for the controller state to be resetting, or returns false if it is

 * not possible to ever transition to that state.
@@ -3681,7 +3660,7 @@ static int nvme_init_ns_head(struct nvme_ns *ns, struct nvme_ns_info *info) 
				"Found shared namespace %d, but multipathing not supported.\n",

				info->nsid);

			dev_warn_once(ctrl->device,

				"Support for shared namespaces without CONFIG_NVME_MULTIPATH is deprecated and will be removed in Linux 6.0\n.");

				"Support for shared namespaces without CONFIG_NVME_MULTIPATH is deprecated and will be removed in Linux 6.0.\n");

		}

	}

drivers/nvme/host/multipath.c

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node) 
		if (nvme_path_is_disabled(ns))

			continue;



		if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_NUMA)

		if (ns->ctrl->numa_node != NUMA_NO_NODE &&

		    READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_NUMA)

			distance = node_distance(node, ns->ctrl->numa_node);

		else

			distance = LOCAL_DISTANCE;

drivers/nvme/host/nvme.h

+21 −0
Original line number Diff line number Diff line
@@ -741,6 +741,27 @@ static inline bool nvme_is_aen_req(u16 qid, __u16 command_id) 
		nvme_tag_from_cid(command_id) >= NVME_AQ_BLK_MQ_DEPTH;

}



/*

 * Returns true for sink states that can't ever transition back to live.

 */

static inline bool nvme_state_terminal(struct nvme_ctrl *ctrl)

{

	switch (nvme_ctrl_state(ctrl)) {

	case NVME_CTRL_NEW:

	case NVME_CTRL_LIVE:

	case NVME_CTRL_RESETTING:

	case NVME_CTRL_CONNECTING:

		return false;

	case NVME_CTRL_DELETING:

	case NVME_CTRL_DELETING_NOIO:

	case NVME_CTRL_DEAD:

		return true;

	default:

		WARN_ONCE(1, "Unhandled ctrl state:%d", ctrl->state);

		return true;

	}

}



void nvme_complete_rq(struct request *req);

void nvme_complete_batch_req(struct request *req);

drivers/nvme/host/pci.c

+7 −1
Original line number Diff line number Diff line
@@ -1286,6 +1286,9 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req) 
	u32 csts = readl(dev->bar + NVME_REG_CSTS);

	u8 opcode;



	if (nvme_state_terminal(&dev->ctrl))

		goto disable;



	/* If PCI error recovery process is happening, we cannot reset or

	 * the recovery mechanism will surely fail.

	 */
@@ -1390,8 +1393,11 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req) 
	return BLK_EH_RESET_TIMER;



disable:

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

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

		if (nvme_state_terminal(&dev->ctrl))

			nvme_dev_disable(dev, true);

		return BLK_EH_DONE;

	}



	nvme_dev_disable(dev, false);

	if (nvme_try_sched_reset(&dev->ctrl))