From: Keith Busch <kbusch@kernel.org>
To: Hannes Reinecke <hare@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org,
Eric Biggers <ebiggers@kernel.org>,
linux-crypto@vger.kernel.org
Subject: Re: [PATCH 09/10] nvmet-tcp: support secure channel concatenation
Date: Wed, 8 Jan 2025 09:33:48 -0700 [thread overview]
Message-ID: <Z36o7IqZnwkuckwF@kbusch-mbp> (raw)
In-Reply-To: <20241203110238.128630-11-hare@kernel.org>
On Tue, Dec 03, 2024 at 12:02:37PM +0100, Hannes Reinecke wrote:
> Evaluate the SC_C flag during DH-CHAP-HMAC negotiation and insert
> the generated PSK once negotiation has finished.
...
> @@ -251,7 +267,7 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
>
> uuid_copy(&ctrl->hostid, &d->hostid);
>
> - dhchap_status = nvmet_setup_auth(ctrl);
> + dhchap_status = nvmet_setup_auth(ctrl, req);
> if (dhchap_status) {
> pr_err("Failed to setup authentication, dhchap status %u\n",
> dhchap_status);
> @@ -269,12 +285,13 @@ static void nvmet_execute_admin_connect(struct nvmet_req *req)
> goto out;
> }
This one had some merge conflicts after applying the pci endpoint
series from Damien. I tried to resolve it, the result is here:
https://git.infradead.org/?p=nvme.git;a=commitdiff;h=11cb42c0f4f4450b325e38c8f0f7d77f5e1a0eb0
The main conflict was from moving the nvmet_setup_auth() call from
nvmet_execute_admin_connect() to nvmet_alloc_ctrl().
next prev parent reply other threads:[~2025-01-08 16:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-03 11:02 [PATCHv13 00/10] nvme: implement secure concatenation Hannes Reinecke
2024-12-03 11:02 ` [PATCH 01/10] crypto,fs: Separate out hkdf_extract() and hkdf_expand() Hannes Reinecke
2024-12-14 4:39 ` Herbert Xu
2024-12-03 11:02 ` [PATCH 1/6] nvme-keyring: add nvme_tls_psk_refresh() Hannes Reinecke
2024-12-03 11:02 ` [PATCH 02/10] nvme: add nvme_auth_generate_psk() Hannes Reinecke
2024-12-03 11:02 ` [PATCH 03/10] nvme: add nvme_auth_generate_digest() Hannes Reinecke
2024-12-03 11:02 ` [PATCH 04/10] nvme: add nvme_auth_derive_tls_psk() Hannes Reinecke
2024-12-03 11:02 ` [PATCH 05/10] nvme-keyring: add nvme_tls_psk_refresh() Hannes Reinecke
2024-12-03 11:02 ` [PATCH 06/10] nvme: always include <linux/key.h> Hannes Reinecke
2024-12-24 11:44 ` Sagi Grimberg
2024-12-03 11:02 ` [PATCH 07/10] nvme-tcp: request secure channel concatenation Hannes Reinecke
2024-12-24 11:45 ` Sagi Grimberg
2024-12-03 11:02 ` [PATCH 08/10] nvme-fabrics: reset admin connection for secure concatenation Hannes Reinecke
2024-12-03 11:02 ` [PATCH 09/10] nvmet-tcp: support secure channel concatenation Hannes Reinecke
2024-12-24 11:46 ` Sagi Grimberg
2025-01-08 16:33 ` Keith Busch [this message]
2025-01-09 7:33 ` Hannes Reinecke
2025-01-12 22:38 ` Keith Busch
2025-01-13 9:34 ` Hannes Reinecke
2025-01-13 15:51 ` Keith Busch
2025-01-13 16:00 ` Hannes Reinecke
2024-12-03 11:02 ` [PATCH 10/10] nvmet: add tls_concat and tls_key debugfs entries Hannes Reinecke
2024-12-24 11:46 ` Sagi Grimberg
-- strict thread matches above, loose matches on Subject: below --
2025-02-24 12:38 [PATCHv15 00/10] nvme: implement secure concatenation Hannes Reinecke
2025-02-24 12:38 ` [PATCH 09/10] nvmet-tcp: support secure channel concatenation Hannes Reinecke
2025-01-22 16:58 [PATCHv14 00/10] nvme: implement secure concatenation Hannes Reinecke
2025-01-22 16:58 ` [PATCH 09/10] nvmet-tcp: support secure channel concatenation Hannes Reinecke
2025-01-28 9:15 ` Christoph Hellwig
2025-02-03 14:20 ` Hannes Reinecke
2024-12-02 14:29 [PATCHv12 00/10] nvme: implement secure concatenation Hannes Reinecke
2024-12-02 14:29 ` [PATCH 09/10] nvmet-tcp: support secure channel concatenation Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z36o7IqZnwkuckwF@kbusch-mbp \
--to=kbusch@kernel.org \
--cc=ebiggers@kernel.org \
--cc=hare@kernel.org \
--cc=hch@lst.de \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox