On Thu, Jan 09, 2025 at 08:33:51AM +0100, Hannes Reinecke wrote:
> On 1/8/25 17:33, Keith Busch wrote:
> > 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().
>
> I'll give it a spin and check how it holds up.
Sorry, I had to drop this from 6.14 for now. The build bot tagged us
with the following error. It looks easy enough to fix but I can't do it
over the weekened before the first merge window pull :)
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git for-next
branch HEAD: f28201922a357663d4a2a258e024481e19269c2c Merge branch 'for-6.14/block' into for-next
Error/Warning (recently discovered and may have been fixed):
https://lore.kernel.org/oe-kbuild-all/202501120730.Nix2qru3-lkp@xxxxxxxxx
auth.c:(.text+0x986): undefined reference to `nvme_tls_psk_refresh'
csky-linux-ld: auth.c:(.text+0xa00): undefined reference to `nvme_tls_psk_refresh'
Error/Warning ids grouped by kconfigs:
recent_errors
`-- csky-randconfig-001-20250112
|-- auth.c:(.text):undefined-reference-to-nvme_tls_psk_refresh
`-- csky-linux-ld:auth.c:(.text):undefined-reference-to-nvme_tls_psk_refresh
