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().
