Commit bb349bb4 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

be2net: allocate more headroom in incoming skbs

Allocation of 64 bytes in skb headroom is not enough if we have to pull
ethernet + ipv6 + tcp headers, and/or extra tunneling header.

Its currently not noticed because netdev_alloc_skb_ip_align(64) give us
more room, thanks to power-of-two kmalloc() roundups.

Make sure we ask for 128 bytes so that side effects of upcoming patches
from Ian Campbell dont decrease benet rx performance, because of extra
skb head reallocations.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Cc: Ian Campbell <Ian.Campbell@citrix.com>
Cc: Vasundhara Volam <vasundhara.volam@emulex.com>
Cc: Sathya Perla <sathya.perla@emulex.com>
Cc: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85b26ea1
...@@ -74,6 +74,9 @@ static inline char *nic_name(struct pci_dev *pdev) ...@@ -74,6 +74,9 @@ static inline char *nic_name(struct pci_dev *pdev)
/* Number of bytes of an RX frame that are copied to skb->data */ /* Number of bytes of an RX frame that are copied to skb->data */
#define BE_HDR_LEN ((u16) 64) #define BE_HDR_LEN ((u16) 64)
/* allocate extra space to allow tunneling decapsulation without head reallocation */
#define BE_RX_SKB_ALLOC_SIZE (BE_HDR_LEN + 64)
#define BE_MAX_JUMBO_FRAME_SIZE 9018 #define BE_MAX_JUMBO_FRAME_SIZE 9018
#define BE_MIN_MTU 256 #define BE_MIN_MTU 256
......
...@@ -1189,7 +1189,7 @@ static void be_rx_compl_process(struct be_adapter *adapter, ...@@ -1189,7 +1189,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct sk_buff *skb; struct sk_buff *skb;
skb = netdev_alloc_skb_ip_align(netdev, BE_HDR_LEN); skb = netdev_alloc_skb_ip_align(netdev, BE_RX_SKB_ALLOC_SIZE);
if (unlikely(!skb)) { if (unlikely(!skb)) {
rx_stats(rxo)->rx_drops_no_skbs++; rx_stats(rxo)->rx_drops_no_skbs++;
be_rx_compl_discard(adapter, rxo, rxcp); be_rx_compl_discard(adapter, rxo, rxcp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment