Commit 236f2552 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'nvme-6.5-2023-06-16' of git://git.infradead.org/nvme into for-6.5/block 

Pull NVMe updates from Keith:

"nvme updates for Linux 6.5

 - Various cleanups all around (Irvin, Chaitanya, Christophe)
 - Better struct packing (Christophe JAILLET)
 - Reduce controller error logs for optional commands (Keith)
 - Support for >=64KiB block sizes (Daniel Gomez)
 - Fabrics fixes and code organization (Max, Chaitanya, Daniel Wagner)"

* tag 'nvme-6.5-2023-06-16' of git://git.infradead.org/nvme: (27 commits)
  nvme: forward port sysfs delete fix
  nvme: skip optional id ctrl csi if it failed
  nvme-core: use nvme_ns_head_multipath instead of ns->head->disk
  nvmet-fcloop: Do not wait on completion when unregister fails
  nvme-fabrics: open code __nvmf_host_find()
  nvme-fabrics: error out to unlock the mutex
  nvme: Increase block size variable size to 32-bit
  nvme-fcloop: no need to return from void function
  nvmet-auth: remove unnecessary break after goto
  nvmet-auth: remove some dead code
  nvme-core: remove redundant check from nvme_init_ns_head
  nvme: move sysfs code to a dedicated sysfs.c file
  nvme-fabrics: prevent overriding of existing host
  nvme-fabrics: check hostid using uuid_equal
  nvme-fabrics: unify common code in admin and io queue connect
  nvmet: reorder fields in 'struct nvmefc_fcp_req'
  nvmet: reorder fields in 'struct nvme_dhchap_queue_context'
  nvmet: reorder fields in 'struct nvmf_ctrl_options'
  nvme: reorder fields in 'struct nvme_ctrl'
  nvmet: reorder fields in 'struct nvmet_sq'
  ...
parents f0854489 1c606f7f

drivers/nvme/host/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-$(CONFIG_NVME_FC) += nvme-fc.o 
obj-$(CONFIG_NVME_TCP)			+= nvme-tcp.o

obj-$(CONFIG_NVME_APPLE)		+= nvme-apple.o



nvme-core-y				+= core.o ioctl.o

nvme-core-y				+= core.o ioctl.o sysfs.o

nvme-core-$(CONFIG_NVME_VERBOSE_ERRORS)	+= constants.o

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

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

drivers/nvme/host/auth.c

+3 −3
Original line number Diff line number Diff line
@@ -30,18 +30,18 @@ struct nvme_dhchap_queue_context { 
	u32 s2;

	u16 transaction;

	u8 status;

	u8 dhgroup_id;

	u8 hash_id;

	size_t hash_len;

	u8 dhgroup_id;

	u8 c1[64];

	u8 c2[64];

	u8 response[64];

	u8 *host_response;

	u8 *ctrl_key;

	int ctrl_key_len;

	u8 *host_key;

	int host_key_len;

	u8 *sess_key;

	int ctrl_key_len;

	int host_key_len;

	int sess_key_len;

};

drivers/nvme/host/core.c

+11 −652

File changed.

Preview size limit exceeded, changes collapsed.

drivers/nvme/host/fabrics.c

+177 −64

File changed.

Preview size limit exceeded, changes collapsed.

drivers/nvme/host/fabrics.h

+16 −5
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ enum { 
 *			      with the parsing opts enum.

 * @mask:	Used by the fabrics library to parse through sysfs options

 *		on adding a NVMe controller.

 * @max_reconnects: maximum number of allowed reconnect attempts before removing

 *		the controller, (-1) means reconnect forever, zero means remove

 *		immediately;

 * @transport:	Holds the fabric transport "technology name" (for a lack of

 *		better description) that will be used by an NVMe controller

 *		being added.
@@ -96,9 +99,6 @@ enum { 
 * @discovery_nqn: indicates if the subsysnqn is the well-known discovery NQN.

 * @kato:	Keep-alive timeout.

 * @host:	Virtual NVMe host, contains the NQN and Host ID.

 * @max_reconnects: maximum number of allowed reconnect attempts before removing

 *              the controller, (-1) means reconnect forever, zero means remove

 *              immediately;

 * @dhchap_secret: DH-HMAC-CHAP secret

 * @dhchap_ctrl_secret: DH-HMAC-CHAP controller secret for bi-directional

 *              authentication
@@ -112,6 +112,7 @@ enum { 
 */

struct nvmf_ctrl_options {

	unsigned		mask;

	int			max_reconnects;

	char			*transport;

	char			*subsysnqn;

	char			*traddr;
@@ -125,7 +126,6 @@ struct nvmf_ctrl_options { 
	bool			duplicate_connect;

	unsigned int		kato;

	struct nvmf_host	*host;

	int			max_reconnects;

	char			*dhchap_secret;

	char			*dhchap_ctrl_secret;

	bool			disable_sqflow;
@@ -181,7 +181,7 @@ nvmf_ctlr_matches_baseopts(struct nvme_ctrl *ctrl, 
	    ctrl->state == NVME_CTRL_DEAD ||

	    strcmp(opts->subsysnqn, ctrl->opts->subsysnqn) ||

	    strcmp(opts->host->nqn, ctrl->opts->host->nqn) ||

	    memcmp(&opts->host->id, &ctrl->opts->host->id, sizeof(uuid_t)))

	    !uuid_equal(&opts->host->id, &ctrl->opts->host->id))

		return false;



	return true;
@@ -203,6 +203,13 @@ static inline void nvmf_complete_timed_out_request(struct request *rq) 
	}

}



static inline unsigned int nvmf_nr_io_queues(struct nvmf_ctrl_options *opts)

{

	return min(opts->nr_io_queues, num_online_cpus()) +

		min(opts->nr_write_queues, num_online_cpus()) +

		min(opts->nr_poll_queues, num_online_cpus());

}



int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val);

int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val);

int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val);
@@ -215,5 +222,9 @@ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size); 
bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);

bool nvmf_ip_options_match(struct nvme_ctrl *ctrl,

		struct nvmf_ctrl_options *opts);

void nvmf_set_io_queues(struct nvmf_ctrl_options *opts, u32 nr_io_queues,

			u32 io_queues[HCTX_MAX_TYPES]);

void nvmf_map_queues(struct blk_mq_tag_set *set, struct nvme_ctrl *ctrl,

		     u32 io_queues[HCTX_MAX_TYPES]);



#endif /* _NVME_FABRICS_H */