Commit 5fbfc7d2 authored by Arseniy Krasnov's avatar Arseniy Krasnov Committed by David S. Miller
Browse files

vsock: check for MSG_ZEROCOPY support on send 



This feature totally depends on transport, so if transport doesn't
support it, return error.

Signed-off-by: default avatarArseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49dbe25a

include/net/af_vsock.h

+7 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ struct vsock_transport { 


	/* Read a single skb */

	int (*read_skb)(struct vsock_sock *, skb_read_actor_t);



	/* Zero-copy. */

	bool (*msgzerocopy_allow)(void);

};



/**** CORE ****/
@@ -241,4 +244,8 @@ static inline void __init vsock_bpf_build_proto(void) 
{}

#endif



static inline bool vsock_msgzerocopy_allow(const struct vsock_transport *t)

{

	return t->msgzerocopy_allow && t->msgzerocopy_allow();

}

#endif /* __AF_VSOCK_H__ */

net/vmw_vsock/af_vsock.c

+6 −0
Original line number Diff line number Diff line
@@ -1824,6 +1824,12 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg, 
		goto out;

	}



	if (msg->msg_flags & MSG_ZEROCOPY &&

	    !vsock_msgzerocopy_allow(transport)) {

		err = -EOPNOTSUPP;

		goto out;

	}



	/* Wait for room in the produce queue to enqueue our user's data. */

	timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);