[PATCH 08/16] nvme-tcp: enable TLS handshake upcall

[Sagi Grimberg]

> @@ -1802,9 +1922,17 @@ static int nvme_tcp_alloc_admin_queue(struct nvme_ctrl *ctrl)
>   static int __nvme_tcp_alloc_io_queues(struct nvme_ctrl *ctrl)
>   {
>   	int i, ret;
> +	key_serial_t pskid = 0;
>   
> +	if (ctrl->opts->tls) {
> +		if (!ctrl->tls_key) {
> +			dev_err(ctrl->device, "no PSK negotiated\n");
> +			return -ENOKEY;

This is really unexpected. its not that no PSK negotiated, something
went awfully wrong if the psk wasn't negotiated and we still end up
being here... Or there is a flow that can make this happen?

> +		}
> +		pskid = key_serial(ctrl->tls_key);
> +	}

newline missing.

key_serial can operate on null.

>   	for (i = 1; i < ctrl->queue_count; i++) {
> -		ret = nvme_tcp_alloc_queue(ctrl, i);
> +		ret = nvme_tcp_alloc_queue(ctrl, i, pskid);
>   		if (ret)
>   			goto out_free_queues;
>   	}

Perhaps do:
--
@@ -1793,7 +1793,7 @@ static int __nvme_tcp_alloc_io_queues(struct 
nvme_ctrl *ctrl)
         int i, ret;

         for (i = 1; i < ctrl->queue_count; i++) {
-               ret = nvme_tcp_alloc_queue(ctrl, i);
+               ret = nvme_tcp_alloc_queue(ctrl, i, 
key_serial(ctrl->tls_key));
                 if (ret)
                         goto out_free_queues;
         }
@@ -1812,6 +1812,9 @@ static int nvme_tcp_alloc_io_queues(struct 
nvme_ctrl *ctrl)
         unsigned int nr_io_queues;
         int ret;

+       if (ctrl->opts->tls && !ctrl->tls_key)
+               return -ENOKEY;
+
         nr_io_queues = nvmf_nr_io_queues(ctrl->opts);
         ret = nvme_set_queue_count(ctrl, &nr_io_queues);
         if (ret)
--

> @@ -2631,7 +2759,7 @@ static struct nvmf_transport_ops nvme_tcp_transport = {
>   			  NVMF_OPT_HOST_TRADDR | NVMF_OPT_CTRL_LOSS_TMO |
>   			  NVMF_OPT_HDR_DIGEST | NVMF_OPT_DATA_DIGEST |
>   			  NVMF_OPT_NR_WRITE_QUEUES | NVMF_OPT_NR_POLL_QUEUES |
> -			  NVMF_OPT_TOS | NVMF_OPT_HOST_IFACE,
> +			  NVMF_OPT_TOS | NVMF_OPT_HOST_IFACE | NVMF_OPT_TLS,
>   	.create_ctrl	= nvme_tcp_create_ctrl,
>   };
>