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

Commit cfd8afd9 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

hv_netvsc: empty current transmit aggregation if flow blocked 



If the transmit queue is known full, then don't keep aggregating
data. And the cp_partial flag which indicates that the current
aggregation buffer is full can be folded in to avoid more
conditionals.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0da6edbd

drivers/net/hyperv/hyperv_net.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, 
					const struct netvsc_device_info *info);

int netvsc_alloc_recv_comp_ring(struct netvsc_device *net_device, u32 q_idx);

void netvsc_device_remove(struct hv_device *device);

int netvsc_send(struct net_device_context *ndc,

int netvsc_send(struct net_device *net,

		struct hv_netvsc_packet *packet,

		struct rndis_message *rndis_msg,

		struct hv_page_buffer *page_buffer,

drivers/net/hyperv/netvsc.c

+14 −6
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, 
				    struct hv_netvsc_packet *packet,

				    struct rndis_message *rndis_msg,

				    struct hv_page_buffer *pb,

				    struct sk_buff *skb)

				    bool xmit_more)

{

	char *start = net_device->send_buf;

	char *dest = start + (section_index * net_device->send_section_size)
@@ -720,7 +720,7 @@ static void netvsc_copy_to_send_buf(struct netvsc_device *net_device, 


	/* Add padding */

	remain = packet->total_data_buflen & (net_device->pkt_align - 1);

	if (skb->xmit_more && remain && !packet->cp_partial) {

	if (xmit_more && remain) {

		padding = net_device->pkt_align - remain;

		rndis_msg->msg_len += padding;

		packet->total_data_buflen += padding;
@@ -829,12 +829,13 @@ static inline void move_pkt_msd(struct hv_netvsc_packet **msd_send, 
}



/* RCU already held by caller */

int netvsc_send(struct net_device_context *ndev_ctx,

int netvsc_send(struct net_device *ndev,

		struct hv_netvsc_packet *packet,

		struct rndis_message *rndis_msg,

		struct hv_page_buffer *pb,

		struct sk_buff *skb)

{

	struct net_device_context *ndev_ctx = netdev_priv(ndev);

	struct netvsc_device *net_device

		= rcu_dereference_bh(ndev_ctx->nvdev);

	struct hv_device *device = ndev_ctx->device_ctx;
@@ -845,7 +846,7 @@ int netvsc_send(struct net_device_context *ndev_ctx, 
	struct multi_send_data *msdp;

	struct hv_netvsc_packet *msd_send = NULL, *cur_send = NULL;

	struct sk_buff *msd_skb = NULL;

	bool try_batch;

	bool try_batch, xmit_more;



	/* If device is rescinded, return error and packet will get dropped. */

	if (unlikely(!net_device || net_device->destroy))
@@ -896,10 +897,17 @@ int netvsc_send(struct net_device_context *ndev_ctx, 
		}

	}



	/* Keep aggregating only if stack says more data is coming

	 * and not doing mixed modes send and not flow blocked

	 */

	xmit_more = skb->xmit_more &&

		!packet->cp_partial &&

		!netif_xmit_stopped(netdev_get_tx_queue(ndev, packet->q_idx));



	if (section_index != NETVSC_INVALID_INDEX) {

		netvsc_copy_to_send_buf(net_device,

					section_index, msd_len,

					packet, rndis_msg, pb, skb);

					packet, rndis_msg, pb, xmit_more);



		packet->send_buf_index = section_index;
@@ -919,7 +927,7 @@ int netvsc_send(struct net_device_context *ndev_ctx, 
		if (msdp->skb)

			dev_consume_skb_any(msdp->skb);



		if (skb->xmit_more && !packet->cp_partial) {

		if (xmit_more) {

			msdp->skb = skb;

			msdp->pkt = packet;

			msdp->count++;

drivers/net/hyperv/netvsc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) 
	/* timestamp packet in software */

	skb_tx_timestamp(skb);



	ret = netvsc_send(net_device_ctx, packet, rndis_msg, pb, skb);

	ret = netvsc_send(net, packet, rndis_msg, pb, skb);

	if (likely(ret == 0))

		return NETDEV_TX_OK;

drivers/net/hyperv/rndis_filter.c

+1 −2
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ static int rndis_filter_send_request(struct rndis_device *dev, 
	struct hv_netvsc_packet *packet;

	struct hv_page_buffer page_buf[2];

	struct hv_page_buffer *pb = page_buf;

	struct net_device_context *net_device_ctx = netdev_priv(dev->ndev);

	int ret;



	/* Setup the packet to send it */
@@ -243,7 +242,7 @@ static int rndis_filter_send_request(struct rndis_device *dev, 
	}



	rcu_read_lock_bh();

	ret = netvsc_send(net_device_ctx, packet, NULL, pb, NULL);

	ret = netvsc_send(dev->ndev, packet, NULL, pb, NULL);

	rcu_read_unlock_bh();



	return ret;