Commit 6f65947a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.16-2025-06-05' of git://git.infradead.org/nvme into block-6.16 

Pull NVMe updates and fixes from Christoph:

"nvme updates for Linux 6.16

 - TCP error handling fix (Shin'ichiro Kawasaki)
 - TCP I/O stall handling fixes (Hannes Reinecke)
 - fix command limits status code (Keith Busch)
 - support vectored buffers also for passthrough (Pavel Begunkov)
 - spelling fixes (Yi Zhang)"

* tag 'nvme-6.16-2025-06-05' of git://git.infradead.org/nvme:
  nvme: spelling fixes
  nvme-tcp: fix I/O stalls on congested sockets
  nvme-tcp: sanitize request list handling
  nvme-tcp: remove tag set when second admin queue config fails
  nvme: enable vectored registered bufs for passthrough cmds
  nvme: fix implicit bool to flags conversion
  nvme: fix command limits status code
parents a2f4c1ae 44e479d7

drivers/nvme/common/auth.c

+3 −3
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ EXPORT_SYMBOL_GPL(nvme_auth_generate_key); 
 * @c1: Value of challenge C1

 * @c2: Value of challenge C2

 * @hash_len: Hash length of the hash algorithm

 * @ret_psk: Pointer too the resulting generated PSK

 * @ret_psk: Pointer to the resulting generated PSK

 * @ret_len: length of @ret_psk

 *

 * Generate a PSK for TLS as specified in NVMe base specification, section
@@ -759,8 +759,8 @@ int nvme_auth_derive_tls_psk(int hmac_id, u8 *psk, size_t psk_len, 
		goto out_free_prk;



	/*

	 * 2 addtional bytes for the length field from HDKF-Expand-Label,

	 * 2 addtional bytes for the HMAC ID, and one byte for the space

	 * 2 additional bytes for the length field from HDKF-Expand-Label,

	 * 2 additional bytes for the HMAC ID, and one byte for the space

	 * separator.

	 */

	info_len = strlen(psk_digest) + strlen(psk_prefix) + 5;

drivers/nvme/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ config NVME_TCP_TLS 
	help

	  Enables TLS encryption for NVMe TCP using the netlink handshake API.



	  The TLS handshake daemon is availble at

	  The TLS handshake daemon is available at

	  https://github.com/oracle/ktls-utils.



	  If unsure, say N.

drivers/nvme/host/constants.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static const char * const nvme_statuses[] = { 
	[NVME_SC_BAD_ATTRIBUTES] = "Conflicting Attributes",

	[NVME_SC_INVALID_PI] = "Invalid Protection Information",

	[NVME_SC_READ_ONLY] = "Attempted Write to Read Only Range",

	[NVME_SC_ONCS_NOT_SUPPORTED] = "ONCS Not Supported",

	[NVME_SC_CMD_SIZE_LIM_EXCEEDED	] = "Command Size Limits Exceeded",

	[NVME_SC_ZONE_BOUNDARY_ERROR] = "Zoned Boundary Error",

	[NVME_SC_ZONE_FULL] = "Zone Is Full",

	[NVME_SC_ZONE_READ_ONLY] = "Zone Is Read Only",

drivers/nvme/host/core.c

+1 −2
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ static blk_status_t nvme_error_status(u16 status) 
	case NVME_SC_NS_NOT_READY:

		return BLK_STS_TARGET;

	case NVME_SC_BAD_ATTRIBUTES:

	case NVME_SC_ONCS_NOT_SUPPORTED:

	case NVME_SC_INVALID_OPCODE:

	case NVME_SC_INVALID_FIELD:

	case NVME_SC_INVALID_NS:
@@ -1027,7 +1026,7 @@ static inline blk_status_t nvme_setup_rw(struct nvme_ns *ns, 


	if (ns->head->ms) {

		/*

		 * If formated with metadata, the block layer always provides a

		 * If formatted with metadata, the block layer always provides a

		 * metadata buffer if CONFIG_BLK_DEV_INTEGRITY is enabled.  Else

		 * we enable the PRACT bit for protection information or set the

		 * namespace capacity to zero to prevent any I/O.

drivers/nvme/host/fabrics.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ EXPORT_SYMBOL_GPL(nvmf_connect_io_queue); 
 * Do not retry when:

 *

 * - the DNR bit is set and the specification states no further connect

 *   attempts with the same set of paramenters should be attempted.

 *   attempts with the same set of parameters should be attempted.

 *

 * - when the authentication attempt fails, because the key was invalid.

 *   This error code is set on the host side.