netvsc: optimize calculation of number of slots
Subsystems (3)
PATCH 1/3 netvsc: optimize calculation of number of slots
Speed up transmit check for fragmented packets by using existing macros to compute number of pages, and eliminate loop since each skb fragment is only one page.
--- drivers/net/hyperv/netvsc_drv.c | 43 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 33 deletions(-)
drivers/net/hyperv/netvsc_drv.c +10 -33
@@ -343,34 +343,14 @@ static u32 init_page_array(void *hdr, u32 len, struct sk_buff *skb,return slots_used; } -static int count_skb_frag_slots (struct sk_buff *skb) -{ -int i, frags =skb_shinfo (skb)->nr_frags; -int pages =0 ; - -for (i =0 ; i < frags; i++) { -skb_frag_t *frag =skb_shinfo (skb)->frags + i; -unsigned long size =skb_frag_size (frag); -unsigned long offset = frag->page_offset; - -/* Skip unused frames from start of page */ - offset &= ~PAGE_MASK ; - pages +=PFN_UP (offset + size); - } -return pages; -} - -static int netvsc_get_slots (struct sk_buff *skb) +/* Estimate number of page buffers neede to transmit +* Need at most 2 for RNDIS header plus skb body and fragments. +*/ +static unsigned int netvsc_get_slots (const struct sk_buff *skb) { -char *data = skb->data; -unsigned int offset =offset_in_page (data); -unsigned int len =skb_headlen (skb); -int slots; -int frag_slots; - - slots =DIV_ROUND_UP (offset + len,PAGE_SIZE ); - frag_slots =count_skb_frag_slots (skb); -return slots + frag_slots; +return PFN_UP (offset_in_page (skb->data)+skb_headlen (skb)) + +skb_shinfo (skb)->nr_frags + +2 ; }static u32 net_checksum_info (struct sk_buff *skb)
@@ -408,21 +388,18 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)struct hv_page_buffer page_buf[MAX_PAGE_BUFFER_COUNT ];struct hv_page_buffer *pb = page_buf; -/* We will atmost need two pages to describe the rndis -* header. We can only transmit MAX_PAGE_BUFFER_COUNT number +/* We can only transmit MAX_PAGE_BUFFER_COUNT number * of pages in a single packet. If skb is scattered around * more pages we try linearizing it. */ - - num_data_pgs =netvsc_get_slots (skb) +2 ; - + num_data_pgs =netvsc_get_slots (skb);if (unlikely (num_data_pgs >MAX_PAGE_BUFFER_COUNT )) { ++net_device_ctx->eth_stats.tx_scattered;if (skb_linearize (skb)) goto no_memory; - num_data_pgs =netvsc_get_slots (skb) +2 ; + num_data_pgs =netvsc_get_slots (skb);if (num_data_pgs >MAX_PAGE_BUFFER_COUNT ) { ++net_device_ctx->eth_stats.tx_too_big; goto drop;
Signature · 1 line
2.11.0
PATCH 2/3 netvsc: use hv_get_bytes_to_read
Don't need need to look at write space in netvsc_close.
--- drivers/net/hyperv/netvsc_drv.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/net/hyperv/netvsc_drv.c +3 -7
@@ -118,7 +118,7 @@ static int netvsc_close(struct net_device *net)struct net_device_context *net_device_ctx =netdev_priv (net);struct netvsc_device *nvdev =rtnl_dereference (net_device_ctx->nvdev);int ret; -u32 aread, awrite, i, msec =10 , retry =0 , retry_max =20 ; +u32 aread, i, msec =10 , retry =0 , retry_max =20 ;struct vmbus_channel *chn;netif_tx_disable (net);
@@ -139,15 +139,11 @@ static int netvsc_close(struct net_device *net)if (!chn)continue ; -hv_get_ringbuffer_availbytes (&chn->inbound, &aread, - &awrite); - + aread =hv_get_bytes_to_read (&chn->inbound);if (aread)break ; -hv_get_ringbuffer_availbytes (&chn->outbound, &aread, - &awrite); - + aread =hv_get_bytes_to_read (&chn->outbound);if (aread)break ; }
Signature · 1 line
2.11.0
PATCH 3/3 netvsc: use typed pointer for internal state
In reply to Stephen HemmingerThe element netvsc_device:extension is always a pointer to RNDIS information.
--- drivers/net/hyperv/hyperv_net.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/hyperv/hyperv_net.h +1 -2
@@ -763,8 +763,7 @@ struct netvsc_device {refcount_t sc_offered; -/* Holds rndis device info */ -void *extension; +struct rndis_device *extension;int ring_size;
Signature · 1 line
2.11.0
David Miller
maintainerStephen, please provide proper header "[PATCH net-next 0/3] " postings with your patch series, so we know at a high level what this patch series is doing, how it is doing it, and why it is doing it that way.
I've been quite liberal with your patch postings in the past, hoping you would catch on, but now I'm going to simply enforce what I ask of every other patch series submitter.
Thanks.
Quoted 4 lines · On Mon, 29 May 2017 20:42:04 -0400 (EDT) David Miller <[email protected]>…
Stephen, please provide proper header "[PATCH net-next 0/3] " postings with your patch series, so we know at a high level what this patch series is doing, how it is doing it, and why it is doing it that way.
Sure, these were just misc small cleanups. Prefer to send them out in small chunks, not mixed with bug fixes and new features.
Quoted 3 lines
I've been quite liberal with your patch postings in the past, hoping you would catch on, but now I'm going to simply enforce what I ask of every other patch series submitter.
Sorry, thought it was obvious from content.