nvme-fabrics: clarify AUTHREQ result handling
PATCH 1/1 nvme-fabrics: clarify AUTHREQ result handling
The NVMe 2.0 spec defines the ATR and ASCR bits in the AUTHREQ connect response field to be mutually exclusive. So to clarify the handling here switch the AUTHREQ handling to use the bit definitions and check for both bits.
And while we're at it, add a message to the user that secure concatenation is not supported (yet).
Suggested-by Mark Lehrer <[email protected]>
Signed-off-by Hannes Reinecke <[email protected]>
--- drivers/nvme/host/fabrics.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/nvme/host/fabrics.c +17 -2
@@ -410,7 +410,14 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl) result =le32_to_cpu (res.u32); ctrl->cntlid = result &0xFFFF ; -if ((result >>16 ) &0x3 ) { +if (result & (NVME_CONNECT_AUTHREQ_ATR |NVME_CONNECT_AUTHREQ_ASCR )) { +/* Secure concatenation is not implemented */ +if (result &NVME_CONNECT_AUTHREQ_ASCR ) { +dev_warn (ctrl->device, +"qid 0: secure concatenation is not supported\n" ); + ret =NVME_SC_AUTH_REQUIRED ; + goto out_free_data; + }/* Authentication required */ ret =nvme_auth_negotiate (ctrl,0 );if (ret) {
@@ -485,7 +492,14 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) &cmd, data); } result =le32_to_cpu (res.u32); -if ((result >>16 ) &2 ) { +if (result & (NVME_CONNECT_AUTHREQ_ATR |NVME_CONNECT_AUTHREQ_ASCR )) { +/* Secure concatenation is not implemented */ +if (result &NVME_CONNECT_AUTHREQ_ASCR ) { +dev_warn (ctrl->device, +"qid 0: secure concatenation is not supported\n" ); + ret =NVME_SC_AUTH_REQUIRED ; + goto out_free_data; + }/* Authentication required */ ret =nvme_auth_negotiate (ctrl, qid);if (ret) {
@@ -498,6 +512,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) "qid %u: authentication failed\n", qid); } } +out_free_data:kfree (data);return ret; }
Signature · 1 line
2.35.3
Quoted 10 lines
The NVMe 2.0 spec defines the ATR and ASCR bits in the AUTHREQ connect response field to be mutually exclusive. So to clarify the handling here switch the AUTHREQ handling to use the bit definitions and check for both bits.
And while we're at it, add a message to the user that secure concatenation is not supported (yet).Suggested-by Mark Lehrer <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>
Thanks,
applied to nvme-6.3.