Commit e40d4eb8 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvme-tcp: allocate socket file 



When using the TLS upcall we need to allocate a socket file such
that the userspace daemon is able to use the socket.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 037c3431

drivers/nvme/host/tcp.c

+11 −2
Original line number Diff line number Diff line
@@ -1338,7 +1338,9 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) 
	}



	noreclaim_flag = memalloc_noreclaim_save();

	sock_release(queue->sock);

	/* ->sock will be released by fput() */

	fput(queue->sock->file);

	queue->sock = NULL;

	memalloc_noreclaim_restore(noreclaim_flag);



	kfree(queue->pdu);
@@ -1512,6 +1514,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) 
	struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl);

	struct nvme_tcp_queue *queue = &ctrl->queues[qid];

	int ret, rcv_pdu_size;

	struct file *sock_file;



	mutex_init(&queue->queue_lock);

	queue->ctrl = ctrl;
@@ -1534,6 +1537,11 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) 
		goto err_destroy_mutex;

	}



	sock_file = sock_alloc_file(queue->sock, O_CLOEXEC, NULL);

	if (IS_ERR(sock_file)) {

		ret = PTR_ERR(sock_file);

		goto err_destroy_mutex;

	}

	nvme_tcp_reclassify_socket(queue->sock);



	/* Single syn retry */
@@ -1640,7 +1648,8 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) 
	if (queue->hdr_digest || queue->data_digest)

		nvme_tcp_free_crypto(queue);

err_sock:

	sock_release(queue->sock);

	/* ->sock will be released by fput() */

	fput(queue->sock->file);

	queue->sock = NULL;

err_destroy_mutex:

	mutex_destroy(&queue->send_mutex);