Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36d277ba authored by Peng Tao's avatar Peng Tao Committed by David S. Miller
Browse files

vsock: track pkt owner vsock 



So that we can cancel a queued pkt later if necessary.

Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a0f5ccf

include/linux/virtio_vsock.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ struct virtio_vsock_pkt { 
	struct virtio_vsock_hdr	hdr;

	struct work_struct work;

	struct list_head list;

	/* socket refcnt not held, only use for cancellation */

	struct vsock_sock *vsk;

	void *buf;

	u32 len;

	u32 off;
@@ -56,6 +58,7 @@ struct virtio_vsock_pkt { 


struct virtio_vsock_pkt_info {

	u32 remote_cid, remote_port;

	struct vsock_sock *vsk;

	struct msghdr *msg;

	u32 pkt_len;

	u16 type;

net/vmw_vsock/virtio_transport_common.c

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, 
	pkt->len		= len;

	pkt->hdr.len		= cpu_to_le32(len);

	pkt->reply		= info->reply;

	pkt->vsk		= info->vsk;



	if (info->msg && len > 0) {

		pkt->buf = kmalloc(len, GFP_KERNEL);
@@ -180,6 +181,7 @@ static int virtio_transport_send_credit_update(struct vsock_sock *vsk, 
	struct virtio_vsock_pkt_info info = {

		.op = VIRTIO_VSOCK_OP_CREDIT_UPDATE,

		.type = type,

		.vsk = vsk,

	};



	return virtio_transport_send_pkt_info(vsk, &info);
@@ -519,6 +521,7 @@ int virtio_transport_connect(struct vsock_sock *vsk) 
	struct virtio_vsock_pkt_info info = {

		.op = VIRTIO_VSOCK_OP_REQUEST,

		.type = VIRTIO_VSOCK_TYPE_STREAM,

		.vsk = vsk,

	};



	return virtio_transport_send_pkt_info(vsk, &info);
@@ -534,6 +537,7 @@ int virtio_transport_shutdown(struct vsock_sock *vsk, int mode) 
			  VIRTIO_VSOCK_SHUTDOWN_RCV : 0) |

			 (mode & SEND_SHUTDOWN ?

			  VIRTIO_VSOCK_SHUTDOWN_SEND : 0),

		.vsk = vsk,

	};



	return virtio_transport_send_pkt_info(vsk, &info);
@@ -560,6 +564,7 @@ virtio_transport_stream_enqueue(struct vsock_sock *vsk, 
		.type = VIRTIO_VSOCK_TYPE_STREAM,

		.msg = msg,

		.pkt_len = len,

		.vsk = vsk,

	};



	return virtio_transport_send_pkt_info(vsk, &info);
@@ -581,6 +586,7 @@ static int virtio_transport_reset(struct vsock_sock *vsk, 
		.op = VIRTIO_VSOCK_OP_RST,

		.type = VIRTIO_VSOCK_TYPE_STREAM,

		.reply = !!pkt,

		.vsk = vsk,

	};



	/* Send RST only if the original pkt is not a RST pkt */
@@ -826,6 +832,7 @@ virtio_transport_send_response(struct vsock_sock *vsk, 
		.remote_cid = le64_to_cpu(pkt->hdr.src_cid),

		.remote_port = le32_to_cpu(pkt->hdr.src_port),

		.reply = true,

		.vsk = vsk,

	};



	return virtio_transport_send_pkt_info(vsk, &info);