Commit 9af8f106 authored by Arseny Krasnov's avatar Arseny Krasnov Committed by Michael S. Tsirkin
Browse files

virtio/vsock: rename 'EOR' to 'EOM' bit. 



This current implemented bit is used to mark end of messages
('EOM' - end of message), not records('EOR' - end of record).
Also rename 'record' to 'message' in implementation as it is
different things.

Signed-off-by: default avatarArseny Krasnov <arseny.krasnov@kaspersky.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Link: https://lore.kernel.org/r/20210903123109.3273053-1-arseny.krasnov@kaspersky.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 694a1116

drivers/vhost/vsock.c

+6 −6
Original line number Diff line number Diff line
@@ -178,15 +178,15 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, 
			 * small rx buffers, headers of packets in rx queue are

			 * created dynamically and are initialized with header

			 * of current packet(except length). But in case of

			 * SOCK_SEQPACKET, we also must clear record delimeter

			 * bit(VIRTIO_VSOCK_SEQ_EOR). Otherwise, instead of one

			 * packet with delimeter(which marks end of record),

			 * SOCK_SEQPACKET, we also must clear message delimeter

			 * bit(VIRTIO_VSOCK_SEQ_EOM). Otherwise, instead of one

			 * packet with delimeter(which marks end of message),

			 * there will be sequence of packets with delimeter

			 * bit set. After initialized header will be copied to

			 * rx buffer, this bit will be restored.

			 */

			if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) {

				pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR);

			if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM) {

				pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM);

				restore_flag = true;

			}

		}
@@ -225,7 +225,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, 
		 */

		if (pkt->off < pkt->len) {

			if (restore_flag)

				pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR);

				pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM);



			/* We are queueing the same virtio_vsock_pkt to handle

			 * the remaining bytes, and we want to deliver it

include/uapi/linux/virtio_vsock.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ enum virtio_vsock_shutdown { 


/* VIRTIO_VSOCK_OP_RW flags values */

enum virtio_vsock_rw {

	VIRTIO_VSOCK_SEQ_EOR = 1,

	VIRTIO_VSOCK_SEQ_EOM = 1,

};



#endif /* _UAPI_LINUX_VIRTIO_VSOCK_H */

net/vmw_vsock/virtio_transport_common.c

+7 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ virtio_transport_alloc_pkt(struct virtio_vsock_pkt_info *info, 


		if (msg_data_left(info->msg) == 0 &&

		    info->type == VIRTIO_VSOCK_TYPE_SEQPACKET)

			pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR);

			pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOM);

	}



	trace_virtio_transport_alloc_pkt(src_cid, src_port,
@@ -457,7 +457,7 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk, 
				dequeued_len += pkt_len;

		}



		if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) {

		if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM) {

			msg_ready = true;

			vvs->msg_count--;

		}
@@ -1029,7 +1029,7 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk, 
		goto out;

	}



	if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR)

	if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM)

		vvs->msg_count++;



	/* Try to copy small packets into the buffer of last packet queued,
@@ -1044,12 +1044,12 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk, 


		/* If there is space in the last packet queued, we copy the

		 * new packet in its buffer. We avoid this if the last packet

		 * queued has VIRTIO_VSOCK_SEQ_EOR set, because this is

		 * delimiter of SEQPACKET record, so 'pkt' is the first packet

		 * of a new record.

		 * queued has VIRTIO_VSOCK_SEQ_EOM set, because this is

		 * delimiter of SEQPACKET message, so 'pkt' is the first packet

		 * of a new message.

		 */

		if ((pkt->len <= last_pkt->buf_len - last_pkt->len) &&

		    !(le32_to_cpu(last_pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR)) {

		    !(le32_to_cpu(last_pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOM)) {

			memcpy(last_pkt->buf + last_pkt->len, pkt->buf,

			       pkt->len);

			last_pkt->len += pkt->len;