evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

e1000: switch to napi_gro_frags api

Browse source 
napi_gro_frags allows skb re-use in case GRO can merge payload pages
into an skb on the GRO lists.

netperf TCP_STREAM, kvm-e1000 emulation, mtu 9k:
Size   Size    Size     Time     Throughput
bytes  bytes   bytes    secs.    10^6bits/sec
old: 87380  16384  16384    30.00  8985.78
new: 87380  16384  16384    30.00  9907.05

Signed-off-by: Florian Westphal <fw@strlen.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Florian Westphal 2014-09-03 13:34:42 +00:00 • committed by Jeff Kirsher
parent 1380960961
commit de591c783a
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/net/ethernet/intel/e1000/e1000_main.c
View file

@ -2117,10 +2117,8 @@ static void e1000_clean_rx_ring(struct e1000_adapter *adapter,
} }
/* there also may be some cached data from a chained receive */ /* there also may be some cached data from a chained receive */
if (rx_ring->rx_skb_top) { napi_free_frags(&adapter->napi);
dev_kfree_skb(rx_ring->rx_skb_top); rx_ring->rx_skb_top = NULL;
rx_ring->rx_skb_top = NULL;
}
size = sizeof(struct e1000_rx_buffer) * rx_ring->count; size = sizeof(struct e1000_rx_buffer) * rx_ring->count;
memset(rx_ring->buffer_info, 0, size); memset(rx_ring->buffer_info, 0, size);
@ -4133,7 +4131,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,
int cleaned_count = 0; int cleaned_count = 0;
bool cleaned = false; bool cleaned = false;
unsigned int total_rx_bytes=0, total_rx_packets=0; unsigned int total_rx_bytes=0, total_rx_packets=0;
static const unsigned int bufsz = 256 - 16; /* for skb_reserve */
i = rx_ring->next_to_clean; i = rx_ring->next_to_clean;
rx_desc = E1000_RX_DESC(*rx_ring, i); rx_desc = E1000_RX_DESC(*rx_ring, i);
@ -4192,7 +4189,7 @@ process_skb:
/* this descriptor is only the beginning (or middle) */ /* this descriptor is only the beginning (or middle) */
if (!rxtop) { if (!rxtop) {
/* this is the beginning of a chain */ /* this is the beginning of a chain */
rxtop = e1000_alloc_rx_skb(adapter, bufsz); rxtop = napi_get_frags(&adapter->napi);
if (!rxtop) if (!rxtop)
break; break;
@ -4221,14 +4218,17 @@ process_skb:
/* no chain, got EOP, this buf is the packet /* no chain, got EOP, this buf is the packet
* copybreak to save the put_page/alloc_page * copybreak to save the put_page/alloc_page
*/ */
skb = e1000_alloc_rx_skb(adapter, bufsz);
if (!skb)
break;
p = buffer_info->rxbuf.page; p = buffer_info->rxbuf.page;
if (length <= copybreak && if (length <= copybreak) {
skb_tailroom(skb) >= length) {
u8 *vaddr; u8 *vaddr;
if (likely(!(netdev->features & NETIF_F_RXFCS)))
length -= 4;
skb = e1000_alloc_rx_skb(adapter,
length);
if (!skb)
break;
vaddr = kmap_atomic(p); vaddr = kmap_atomic(p);
memcpy(skb_tail_pointer(skb), vaddr, memcpy(skb_tail_pointer(skb), vaddr,
length); length);
@ -4237,7 +4237,22 @@ process_skb:
* buffer_info->rxbuf.page * buffer_info->rxbuf.page
*/ */
skb_put(skb, length); skb_put(skb, length);
e1000_rx_checksum(adapter,
status | rx_desc->errors << 24,
le16_to_cpu(rx_desc->csum), skb);
total_rx_bytes += skb->len;
total_rx_packets++;
e1000_receive_skb(adapter, status,
rx_desc->special, skb);
goto next_desc;
} else { } else {
skb = napi_get_frags(&adapter->napi);
if (!skb) {
adapter->alloc_rx_buff_failed++;
break;
}
skb_fill_page_desc(skb, 0, p, 0, skb_fill_page_desc(skb, 0, p, 0,
length); length);
e1000_consume_page(buffer_info, skb, e1000_consume_page(buffer_info, skb,
@ -4257,14 +4272,14 @@ process_skb:
pskb_trim(skb, skb->len - 4); pskb_trim(skb, skb->len - 4);
total_rx_packets++; total_rx_packets++;
/* eth type trans needs skb->data to point to something */ if (status & E1000_RXD_STAT_VP) {
if (!pskb_may_pull(skb, ETH_HLEN)) { __le16 vlan = rx_desc->special;
e_err(drv, "pskb_may_pull failed.\n"); u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK;
dev_kfree_skb(skb);
goto next_desc; __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
} }
e1000_receive_skb(adapter, status, rx_desc->special, skb); napi_gro_frags(&adapter->napi);
next_desc: next_desc:
rx_desc->status = 0; rx_desc->status = 0;