hv_sock: perf: Allow the socket buffer size options to influence the actual socket buffers (ac383f58) · Commits · 戴 / test

net/vmw_vsock/hyperv_transport.c

+40 −10

Original line number	Diff line number	Diff line
		@@ -23,14 +23,14 @@
		#include <net/sock.h>
		#include <net/af_vsock.h>

		/* The host side's design of the feature requires 6 exact 4KB pages for
		* recv/send rings respectively -- this is suboptimal considering memory
		* consumption, however unluckily we have to live with it, before the
		* host comes up with a better design in the future.
		/* Older (VMBUS version 'VERSION_WIN10' or before) Windows hosts have some
		* stricter requirements on the hv_sock ring buffer size of six 4K pages. Newer
		* hosts don't have this limitation; but, keep the defaults the same for compat.
		*/
		#define PAGE_SIZE_4K 4096
		#define RINGBUFFER_HVS_RCV_SIZE (PAGE_SIZE_4K * 6)
		#define RINGBUFFER_HVS_SND_SIZE (PAGE_SIZE_4K * 6)
		#define RINGBUFFER_HVS_MAX_SIZE (PAGE_SIZE_4K * 64)

		/* The MTU is 16KB per the host side's design */
		#define HVS_MTU_SIZE (1024 * 16)
		@@ -344,9 +344,12 @@ static void hvs_open_connection(struct vmbus_channel *chan)

		struct sockaddr_vm addr;
		struct sock sk, new = NULL;
		struct vsock_sock *vnew;
		struct hvsock hvs, hvs_new;
		struct vsock_sock *vnew = NULL;
		struct hvsock *hvs = NULL;
		struct hvsock *hvs_new = NULL;
		int rcvbuf;
		int ret;
		int sndbuf;

		if_type = &chan->offermsg.offer.if_type;
		if_instance = &chan->offermsg.offer.if_instance;
		@@ -388,9 +391,34 @@ static void hvs_open_connection(struct vmbus_channel *chan)
		}

		set_channel_read_mode(chan, HV_CALL_DIRECT);
		ret = vmbus_open(chan, RINGBUFFER_HVS_SND_SIZE,
		RINGBUFFER_HVS_RCV_SIZE, NULL, 0,
		hvs_channel_cb, conn_from_host ? new : sk);

		/* Use the socket buffer sizes as hints for the VMBUS ring size. For
		* server side sockets, 'sk' is the parent socket and thus, this will
		* allow the child sockets to inherit the size from the parent. Keep
		* the mins to the default value and align to page size as per VMBUS
		* requirements.
		* For the max, the socket core library will limit the socket buffer
		* size that can be set by the user, but, since currently, the hv_sock
		* VMBUS ring buffer is physically contiguous allocation, restrict it
		* further.
		* Older versions of hv_sock host side code cannot handle bigger VMBUS
		* ring buffer size. Use the version number to limit the change to newer
		* versions.
		*/
		if (vmbus_proto_version < VERSION_WIN10_V5) {
		sndbuf = RINGBUFFER_HVS_SND_SIZE;
		rcvbuf = RINGBUFFER_HVS_RCV_SIZE;
		} else {
		sndbuf = max_t(int, sk->sk_sndbuf, RINGBUFFER_HVS_SND_SIZE);
		sndbuf = min_t(int, sndbuf, RINGBUFFER_HVS_MAX_SIZE);
		sndbuf = ALIGN(sndbuf, PAGE_SIZE);
		rcvbuf = max_t(int, sk->sk_rcvbuf, RINGBUFFER_HVS_RCV_SIZE);
		rcvbuf = min_t(int, rcvbuf, RINGBUFFER_HVS_MAX_SIZE);
		rcvbuf = ALIGN(rcvbuf, PAGE_SIZE);
		}

		ret = vmbus_open(chan, sndbuf, rcvbuf, NULL, 0, hvs_channel_cb,
		conn_from_host ? new : sk);
		if (ret != 0) {
		if (conn_from_host) {
		hvs_new->chan = NULL;
		@@ -441,6 +469,7 @@ static u32 hvs_get_local_cid(void)
		static int hvs_sock_init(struct vsock_sock vsk, struct vsock_sock psk)
		{
		struct hvsock *hvs;
		struct sock *sk = sk_vsock(vsk);

		hvs = kzalloc(sizeof(*hvs), GFP_KERNEL);
		if (!hvs)
		@@ -448,7 +477,8 @@ static int hvs_sock_init(struct vsock_sock vsk, struct vsock_sock psk)

		vsk->trans = hvs;
		hvs->vsk = vsk;

		sk->sk_sndbuf = RINGBUFFER_HVS_SND_SIZE;
		sk->sk_rcvbuf = RINGBUFFER_HVS_RCV_SIZE;
		return 0;
		}

Admin message