* [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only
@ 2023-10-11 8:45 Mark O'Donovan
2023-10-11 8:45 ` [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs Mark O'Donovan
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Mark O'Donovan @ 2023-10-11 8:45 UTC (permalink / raw)
To: linux-kernel
Cc: linux-nvme, sagi, hch, axboe, kbusch, hare, Mark O'Donovan
Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/host/auth.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index daf5d144a8ea..e1a98647c3a2 100644
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -758,12 +758,11 @@ static void nvme_queue_auth_work(struct work_struct *work)
__func__, chap->qid);
mutex_lock(&ctrl->dhchap_auth_mutex);
ret = nvme_auth_dhchap_setup_host_response(ctrl, chap);
+ mutex_unlock(&ctrl->dhchap_auth_mutex);
if (ret) {
- mutex_unlock(&ctrl->dhchap_auth_mutex);
chap->error = ret;
goto fail2;
}
- mutex_unlock(&ctrl->dhchap_auth_mutex);
/* DH-HMAC-CHAP Step 3: send reply */
dev_dbg(ctrl->device, "%s: qid %d send reply\n",
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs
2023-10-11 8:45 [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Mark O'Donovan
@ 2023-10-11 8:45 ` Mark O'Donovan
2023-11-20 11:01 ` Sagi Grimberg
2023-11-14 14:04 ` [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Keith Busch
2023-11-20 11:00 ` Sagi Grimberg
2 siblings, 1 reply; 5+ messages in thread
From: Mark O'Donovan @ 2023-10-11 8:45 UTC (permalink / raw)
To: linux-kernel
Cc: linux-nvme, sagi, hch, axboe, kbusch, hare, Mark O'Donovan
Some error cases were not setting an auth-failure-reason-code-explanation.
This means an AUTH_Failure2 message will be sent with an explanation value
of 0 which is a reserved value.
Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
v1->v2: Set failure explanation in a single place if the error handling
code has not already done so.
---
drivers/nvme/host/auth.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index e1a98647c3a2..9556cfc4f5f3 100644
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -839,6 +839,8 @@ static void nvme_queue_auth_work(struct work_struct *work)
}
fail2:
+ if (chap->status == 0)
+ chap->status = NVME_AUTH_DHCHAP_FAILURE_FAILED;
dev_dbg(ctrl->device, "%s: qid %d send failure2, status %x\n",
__func__, chap->qid, chap->status);
tl = nvme_auth_set_dhchap_failure2_data(ctrl, chap);
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only
2023-10-11 8:45 [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Mark O'Donovan
2023-10-11 8:45 ` [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs Mark O'Donovan
@ 2023-11-14 14:04 ` Keith Busch
2023-11-20 11:00 ` Sagi Grimberg
2 siblings, 0 replies; 5+ messages in thread
From: Keith Busch @ 2023-11-14 14:04 UTC (permalink / raw)
To: Mark O'Donovan; +Cc: linux-kernel, linux-nvme, sagi, hch, axboe, hare
On Wed, Oct 11, 2023 at 08:45:11AM +0000, Mark O'Donovan wrote:
> Signed-off-by: Mark O'Donovan <shiftee@posteo.net>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
> Reviewed-by: Hannes Reinecke <hare@suse.de>
Applied to nvme-6.7, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only
2023-10-11 8:45 [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Mark O'Donovan
2023-10-11 8:45 ` [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs Mark O'Donovan
2023-11-14 14:04 ` [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Keith Busch
@ 2023-11-20 11:00 ` Sagi Grimberg
2 siblings, 0 replies; 5+ messages in thread
From: Sagi Grimberg @ 2023-11-20 11:00 UTC (permalink / raw)
To: Mark O'Donovan, linux-kernel; +Cc: linux-nvme, hch, axboe, kbusch, hare
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs
2023-10-11 8:45 ` [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs Mark O'Donovan
@ 2023-11-20 11:01 ` Sagi Grimberg
0 siblings, 0 replies; 5+ messages in thread
From: Sagi Grimberg @ 2023-11-20 11:01 UTC (permalink / raw)
To: Mark O'Donovan, linux-kernel; +Cc: linux-nvme, hch, axboe, kbusch, hare
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-20 11:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-11 8:45 [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Mark O'Donovan
2023-10-11 8:45 ` [PATCH 2/2 RESEND] nvme-auth: set explanation code for failure2 msgs Mark O'Donovan
2023-11-20 11:01 ` Sagi Grimberg
2023-11-14 14:04 ` [PATCH 1/2 RESEND] nvme-auth: unlock mutex in one place only Keith Busch
2023-11-20 11:00 ` Sagi Grimberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®