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

nvmet-tcp: allocate socket file 



For 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 4f8cce2d

drivers/nvme/target/tcp.c

+14 −4
Original line number Diff line number Diff line
@@ -1493,12 +1493,12 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w) 
	nvmet_sq_destroy(&queue->nvme_sq);

	cancel_work_sync(&queue->io_work);

	nvmet_tcp_free_cmd_data_in_buffers(queue);

	sock_release(queue->sock);

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

	fput(queue->sock->file);

	nvmet_tcp_free_cmds(queue);

	if (queue->hdr_digest || queue->data_digest)

		nvmet_tcp_free_crypto(queue);

	ida_free(&nvmet_tcp_queue_ida, queue->idx);



	page = virt_to_head_page(queue->pf_cache.va);

	__page_frag_cache_drain(page, queue->pf_cache.pagecnt_bias);

	kfree(queue);
@@ -1625,6 +1625,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, 
		struct socket *newsock)

{

	struct nvmet_tcp_queue *queue;

	struct file *sock_file = NULL;

	int ret;



	queue = kzalloc(sizeof(*queue), GFP_KERNEL);
@@ -1644,10 +1645,16 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, 
	init_llist_head(&queue->resp_list);

	INIT_LIST_HEAD(&queue->resp_send_list);



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

	if (IS_ERR(sock_file)) {

		ret = PTR_ERR(sock_file);

		goto out_free_queue;

	}



	queue->idx = ida_alloc(&nvmet_tcp_queue_ida, GFP_KERNEL);

	if (queue->idx < 0) {

		ret = queue->idx;

		goto out_free_queue;

		goto out_sock;

	}



	ret = nvmet_tcp_alloc_cmd(queue, &queue->connect);
@@ -1678,10 +1685,13 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, 
	nvmet_tcp_free_cmd(&queue->connect);

out_ida_remove:

	ida_free(&nvmet_tcp_queue_ida, queue->idx);

out_sock:

	fput(queue->sock->file);

out_free_queue:

	kfree(queue);

out_release:

	pr_err("failed to allocate queue, error %d\n", ret);

	if (!sock_file)

		sock_release(newsock);

}