Commit d808b7f7 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig
Browse files

nvmet: fix discover log page when offsets are used 



The nvme target hadn't been taking the Get Log Page offset parameter
into consideration, and so has been returning corrupted log pages when
offsets are used. Since many tools, including nvme-cli, split the log
request to 4k, we've been breaking discovery log responses when more
than 3 subsystems exist.

Fix the returned data by internally generating the entire discovery
log page and copying only the requested bytes into the user buffer. The
command log page offset type has been modified to a native __le64 to
make it easier to extract the value from a command.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Tested-by: default avatarMinwoo Im <minwoo.im@samsung.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 67f471b6

drivers/nvme/target/admin-cmd.c

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ u32 nvmet_get_log_page_len(struct nvme_command *cmd) 
	return len;

}



u64 nvmet_get_log_page_offset(struct nvme_command *cmd)

{

	return le64_to_cpu(cmd->get_log_page.lpo);

}



static void nvmet_execute_get_log_page_noop(struct nvmet_req *req)

{

	nvmet_req_complete(req, nvmet_zero_sgl(req, 0, req->data_len));

drivers/nvme/target/discovery.c

+45 −23
Original line number Diff line number Diff line
@@ -131,54 +131,76 @@ static void nvmet_set_disc_traddr(struct nvmet_req *req, struct nvmet_port *port 
		memcpy(traddr, port->disc_addr.traddr, NVMF_TRADDR_SIZE);

}



static size_t discovery_log_entries(struct nvmet_req *req)

{

	struct nvmet_ctrl *ctrl = req->sq->ctrl;

	struct nvmet_subsys_link *p;

	struct nvmet_port *r;

	size_t entries = 0;



	list_for_each_entry(p, &req->port->subsystems, entry) {

		if (!nvmet_host_allowed(p->subsys, ctrl->hostnqn))

			continue;

		entries++;

	}

	list_for_each_entry(r, &req->port->referrals, entry)

		entries++;

	return entries;

}



static void nvmet_execute_get_disc_log_page(struct nvmet_req *req)

{

	const int entry_size = sizeof(struct nvmf_disc_rsp_page_entry);

	struct nvmet_ctrl *ctrl = req->sq->ctrl;

	struct nvmf_disc_rsp_page_hdr *hdr;

	u64 offset = nvmet_get_log_page_offset(req->cmd);

	size_t data_len = nvmet_get_log_page_len(req->cmd);

	size_t alloc_len = max(data_len, sizeof(*hdr));

	int residual_len = data_len - sizeof(*hdr);

	size_t alloc_len;

	struct nvmet_subsys_link *p;

	struct nvmet_port *r;

	u32 numrec = 0;

	u16 status = 0;

	void *buffer;



	/* Spec requires dword aligned offsets */

	if (offset & 0x3) {

		status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		goto out;

	}



	/*

	 * Make sure we're passing at least a buffer of response header size.

	 * If host provided data len is less than the header size, only the

	 * number of bytes requested by host will be sent to host.

	 */

	hdr = kzalloc(alloc_len, GFP_KERNEL);

	if (!hdr) {

	down_read(&nvmet_config_sem);

	alloc_len = sizeof(*hdr) + entry_size * discovery_log_entries(req);

	buffer = kzalloc(alloc_len, GFP_KERNEL);

	if (!buffer) {

		up_read(&nvmet_config_sem);

		status = NVME_SC_INTERNAL;

		goto out;

	}



	down_read(&nvmet_config_sem);

	hdr = buffer;

	list_for_each_entry(p, &req->port->subsystems, entry) {

		char traddr[NVMF_TRADDR_SIZE];



		if (!nvmet_host_allowed(p->subsys, ctrl->hostnqn))

			continue;

		if (residual_len >= entry_size) {

			char traddr[NVMF_TRADDR_SIZE];



		nvmet_set_disc_traddr(req, req->port, traddr);

		nvmet_format_discovery_entry(hdr, req->port,

				p->subsys->subsysnqn, traddr,

				NVME_NQN_NVME, numrec);

			residual_len -= entry_size;

		}

		numrec++;

	}



	list_for_each_entry(r, &req->port->referrals, entry) {

		if (residual_len >= entry_size) {

		nvmet_format_discovery_entry(hdr, r,

				NVME_DISC_SUBSYS_NAME,

				r->disc_addr.traddr,

				NVME_NQN_DISC, numrec);

			residual_len -= entry_size;

		}

		numrec++;

	}
@@ -190,8 +212,8 @@ static void nvmet_execute_get_disc_log_page(struct nvmet_req *req) 


	up_read(&nvmet_config_sem);



	status = nvmet_copy_to_sgl(req, 0, hdr, data_len);

	kfree(hdr);

	status = nvmet_copy_to_sgl(req, 0, buffer + offset, data_len);

	kfree(buffer);

out:

	nvmet_req_complete(req, status);

}

drivers/nvme/target/nvmet.h

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ u16 nvmet_copy_from_sgl(struct nvmet_req *req, off_t off, void *buf, 
u16 nvmet_zero_sgl(struct nvmet_req *req, off_t off, size_t len);



u32 nvmet_get_log_page_len(struct nvme_command *cmd);

u64 nvmet_get_log_page_offset(struct nvme_command *cmd);



extern struct list_head *nvmet_ports;

void nvmet_port_disc_changed(struct nvmet_port *port,

include/linux/nvme.h

+7 −2
Original line number Diff line number Diff line
@@ -967,8 +967,13 @@ struct nvme_get_log_page_command { 
	__le16			numdl;

	__le16			numdu;

	__u16			rsvd11;

	union {

		struct {

			__le32 lpol;

			__le32 lpou;

		};

		__le64 lpo;

	};

	__u32			rsvd14[2];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE