Commit e8a420ef authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-auth: no need to reset chap contexts on re-authentication 



Now that the chap context is reset upon completion, this is no longer
needed. Also remove nvme_auth_reset as no callers are left.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 96df3183

drivers/nvme/host/auth.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -901,19 +901,6 @@ int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid) 
}

}

EXPORT_SYMBOL_GPL(nvme_auth_wait);

EXPORT_SYMBOL_GPL(nvme_auth_wait);





void nvme_auth_reset(struct nvme_ctrl *ctrl)

{

	struct nvme_dhchap_queue_context *chap;



	mutex_lock(&ctrl->dhchap_auth_mutex);

	list_for_each_entry(chap, &ctrl->dhchap_auth_list, entry) {

		mutex_unlock(&ctrl->dhchap_auth_mutex);

		flush_work(&chap->auth_work);

		nvme_auth_reset_dhchap(chap);

	}

	mutex_unlock(&ctrl->dhchap_auth_mutex);

}



static void nvme_ctrl_auth_work(struct work_struct *work)

static void nvme_ctrl_auth_work(struct work_struct *work)

{

{

	struct nvme_ctrl *ctrl =

	struct nvme_ctrl *ctrl =

drivers/nvme/host/core.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -3787,8 +3787,6 @@ static ssize_t nvme_ctrl_dhchap_secret_store(struct device *dev, 
		host_key = ctrl->host_key;

		host_key = ctrl->host_key;

		ctrl->host_key = key;

		ctrl->host_key = key;

		nvme_auth_free_key(host_key);

		nvme_auth_free_key(host_key);

		/* Key has changed; re-authentication with new key */

		nvme_auth_reset(ctrl);

	}

	}

	/* Start re-authentication */

	/* Start re-authentication */

	dev_info(ctrl->device, "re-authenticating controller\n");

	dev_info(ctrl->device, "re-authenticating controller\n");
@@ -3841,8 +3839,6 @@ static ssize_t nvme_ctrl_dhchap_ctrl_secret_store(struct device *dev, 
		ctrl_key = ctrl->ctrl_key;

		ctrl_key = ctrl->ctrl_key;

		ctrl->ctrl_key = key;

		ctrl->ctrl_key = key;

		nvme_auth_free_key(ctrl_key);

		nvme_auth_free_key(ctrl_key);

		/* Key has changed; re-authentication with new key */

		nvme_auth_reset(ctrl);

	}

	}

	/* Start re-authentication */

	/* Start re-authentication */

	dev_info(ctrl->device, "re-authenticating controller\n");

	dev_info(ctrl->device, "re-authenticating controller\n");

drivers/nvme/host/nvme.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1024,7 +1024,6 @@ int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl); 
void nvme_auth_stop(struct nvme_ctrl *ctrl);

void nvme_auth_stop(struct nvme_ctrl *ctrl);

int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid);

int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid);

int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid);

int nvme_auth_wait(struct nvme_ctrl *ctrl, int qid);

void nvme_auth_reset(struct nvme_ctrl *ctrl);

void nvme_auth_free(struct nvme_ctrl *ctrl);

void nvme_auth_free(struct nvme_ctrl *ctrl);

#else

#else

static inline int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)

static inline int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)