Commit 50321672 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvmet: Add 'sq' argument to alloc_ctrl_args 



For secure concatenation the result of the TLS handshake will be
stored in the 'sq' struct, so add it to the alloc_ctrl_args struct.

Cc: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarHannes Reinecke <hare@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 104d0e2f

drivers/nvme/target/auth.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int nvmet_setup_dhgroup(struct nvmet_ctrl *ctrl, u8 dhgroup_id) 
	return ret;

}



u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl)

u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq)

{

	int ret = 0;

	struct nvmet_host_link *p;

drivers/nvme/target/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ struct nvmet_ctrl *nvmet_alloc_ctrl(struct nvmet_alloc_ctrl_args *args) 
	if (args->hostid)

		uuid_copy(&ctrl->hostid, args->hostid);



	dhchap_status = nvmet_setup_auth(ctrl);

	dhchap_status = nvmet_setup_auth(ctrl, args->sq);

	if (dhchap_status) {

		pr_err("Failed to setup authentication, dhchap status %u\n",

		       dhchap_status);

drivers/nvme/target/fabrics-cmd-auth.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ void nvmet_execute_auth_send(struct nvmet_req *req) 
			pr_debug("%s: ctrl %d qid %d reset negotiation\n",

				 __func__, ctrl->cntlid, req->sq->qid);

			if (!req->sq->qid) {

				dhchap_status = nvmet_setup_auth(ctrl);

				dhchap_status = nvmet_setup_auth(ctrl, req->sq);

				if (dhchap_status) {

					pr_err("ctrl %d qid 0 failed to setup re-authentication\n",

					       ctrl->cntlid);

drivers/nvme/target/fabrics-cmd.c

+7 −4
Original line number Diff line number Diff line
@@ -234,10 +234,12 @@ static u16 nvmet_install_queue(struct nvmet_ctrl *ctrl, struct nvmet_req *req) 
	return ret;

}



static u32 nvmet_connect_result(struct nvmet_ctrl *ctrl)

static u32 nvmet_connect_result(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq)

{

	bool needs_auth = nvmet_has_auth(ctrl);



	return (u32)ctrl->cntlid |

		(nvmet_has_auth(ctrl) ? NVME_CONNECT_AUTHREQ_ATR : 0);

		(needs_auth ? NVME_CONNECT_AUTHREQ_ATR : 0);

}



static void nvmet_execute_admin_connect(struct nvmet_req *req)
@@ -247,6 +249,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) 
	struct nvmet_ctrl *ctrl = NULL;

	struct nvmet_alloc_ctrl_args args = {

		.port = req->port,

		.sq = req->sq,

		.ops = req->ops,

		.p2p_client = req->p2p_client,

		.kato = le32_to_cpu(c->kato),
@@ -299,7 +302,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req) 
		goto out;

	}



	args.result = cpu_to_le32(nvmet_connect_result(ctrl));

	args.result = cpu_to_le32(nvmet_connect_result(ctrl, req->sq));

out:

	kfree(d);

complete:
@@ -357,7 +360,7 @@ static void nvmet_execute_io_connect(struct nvmet_req *req) 
		goto out_ctrl_put;



	pr_debug("adding queue %d to ctrl %d.\n", qid, ctrl->cntlid);

	req->cqe->result.u32 = cpu_to_le32(nvmet_connect_result(ctrl));

	req->cqe->result.u32 = cpu_to_le32(nvmet_connect_result(ctrl, req->sq));

out:

	kfree(d);

complete:

drivers/nvme/target/nvmet.h

+4 −2
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ void nvmet_update_cc(struct nvmet_ctrl *ctrl, u32 new); 


struct nvmet_alloc_ctrl_args {

	struct nvmet_port	*port;

	struct nvmet_sq		*sq;

	char			*subsysnqn;

	char			*hostnqn;

	uuid_t			*hostid;
@@ -860,7 +861,7 @@ void nvmet_execute_auth_receive(struct nvmet_req *req); 
int nvmet_auth_set_key(struct nvmet_host *host, const char *secret,

		       bool set_ctrl);

int nvmet_auth_set_host_hash(struct nvmet_host *host, const char *hash);

u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl);

u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl, struct nvmet_sq *sq);

void nvmet_auth_sq_init(struct nvmet_sq *sq);

void nvmet_destroy_auth(struct nvmet_ctrl *ctrl);

void nvmet_auth_sq_free(struct nvmet_sq *sq);
@@ -879,7 +880,8 @@ int nvmet_auth_ctrl_exponential(struct nvmet_req *req, 
int nvmet_auth_ctrl_sesskey(struct nvmet_req *req,

			    u8 *buf, int buf_size);

#else

static inline u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl)

static inline u8 nvmet_setup_auth(struct nvmet_ctrl *ctrl,

				  struct nvmet_sq *sq)

{

	return 0;

}