Commit 99a50bb1 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by David S. Miller
Browse files

netvsc: Use the new in-place consumption APIs in the rx path 



Use the new APIs for eliminating a copy on the receive path. These new APIs also
help in minimizing the number of memory barriers we end up issuing (in the
ringbuffer code) since we can better control when we want to expose the ring
state to the host.

The patch is being resent to address earlier email issues.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bba7eb5d

drivers/net/hyperv/netvsc.c

+59 −29
Original line number Original line Diff line number Diff line
@@ -1128,6 +1128,39 @@ static inline void netvsc_receive_inband(struct hv_device *hdev, 
	}

	}

}

}





static void netvsc_process_raw_pkt(struct hv_device *device,

				   struct vmbus_channel *channel,

				   struct netvsc_device *net_device,

				   struct net_device *ndev,

				   u64 request_id,

				   struct vmpacket_descriptor *desc)

{

	struct nvsp_message *nvmsg;



	nvmsg = (struct nvsp_message *)((unsigned long)

		desc + (desc->offset8 << 3));



	switch (desc->type) {

	case VM_PKT_COMP:

		netvsc_send_completion(net_device, channel, device, desc);

		break;



	case VM_PKT_DATA_USING_XFER_PAGES:

		netvsc_receive(net_device, channel, device, desc);

		break;



	case VM_PKT_DATA_INBAND:

		netvsc_receive_inband(device, net_device, nvmsg);

		break;



	default:

		netdev_err(ndev, "unhandled packet type %d, tid %llx\n",

			   desc->type, request_id);

		break;

	}

}





void netvsc_channel_cb(void *context)

void netvsc_channel_cb(void *context)

{

{

	int ret;

	int ret;
@@ -1140,7 +1173,7 @@ void netvsc_channel_cb(void *context) 
	unsigned char *buffer;

	unsigned char *buffer;

	int bufferlen = NETVSC_PACKET_SIZE;

	int bufferlen = NETVSC_PACKET_SIZE;

	struct net_device *ndev;

	struct net_device *ndev;

	struct nvsp_message *nvmsg;

	bool need_to_commit = false;





	if (channel->primary_channel != NULL)

	if (channel->primary_channel != NULL)

		device = channel->primary_channel->device_obj;

		device = channel->primary_channel->device_obj;
@@ -1154,39 +1187,36 @@ void netvsc_channel_cb(void *context) 
	buffer = get_per_channel_state(channel);

	buffer = get_per_channel_state(channel);





	do {

	do {

		desc = get_next_pkt_raw(channel);

		if (desc != NULL) {

			netvsc_process_raw_pkt(device,

					       channel,

					       net_device,

					       ndev,

					       desc->trans_id,

					       desc);



			put_pkt_raw(channel, desc);

			need_to_commit = true;

			continue;

		}

		if (need_to_commit) {

			need_to_commit = false;

			commit_rd_index(channel);

		}



		ret = vmbus_recvpacket_raw(channel, buffer, bufferlen,

		ret = vmbus_recvpacket_raw(channel, buffer, bufferlen,

					   &bytes_recvd, &request_id);

					   &bytes_recvd, &request_id);

		if (ret == 0) {

		if (ret == 0) {

			if (bytes_recvd > 0) {

			if (bytes_recvd > 0) {

				desc = (struct vmpacket_descriptor *)buffer;

				desc = (struct vmpacket_descriptor *)buffer;

				nvmsg = (struct nvsp_message *)((unsigned long)

				netvsc_process_raw_pkt(device,

					 desc + (desc->offset8 << 3));

				switch (desc->type) {

				case VM_PKT_COMP:

					netvsc_send_completion(net_device,

						       channel,

						       channel,

								device, desc);

					break;



				case VM_PKT_DATA_USING_XFER_PAGES:

					netvsc_receive(net_device, channel,

						       device, desc);

					break;



				case VM_PKT_DATA_INBAND:

					netvsc_receive_inband(device,

						       net_device,

						       net_device,

							      nvmsg);

						       ndev,

					break;

						       request_id,

						       desc);





				default:

					netdev_err(ndev,

						   "unhandled packet type %d, "

						   "tid %llx len %d\n",

						   desc->type, request_id,

						   bytes_recvd);

					break;

				}





			} else {

			} else {

				/*

				/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE