GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-30 19:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Inline skb_pull() in eth_type_trans().

Browse source 
In commit 6be8ac2f ("[NET]: uninline skb_pull, de-bloats a lot")
we uninlined skb_pull.

But in some critical paths it makes sense to inline this thing
and it helps performance significantly.

Create an skb_pull_inline() so that we can do this in a way that
serves also as annotation.

Based upon a patch by Eric Dumazet.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2010-05-02 02:21:44 -07:00
parent 4381548237
commit 47d29646a2
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/skbuff.h
View file

@ -1128,6 +1128,11 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len)
return skb->data += len; return skb->data += len;
} }
static inline unsigned char *skb_pull_inline(struct sk_buff *skb, unsigned int len)
{
return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
}
extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta); extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len) static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)

2
net/core/skbuff.c
View file

@ -1051,7 +1051,7 @@ EXPORT_SYMBOL(skb_push);
*/ */
unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
{ {
return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len); return skb_pull_inline(skb, len);
} }
EXPORT_SYMBOL(skb_pull); EXPORT_SYMBOL(skb_pull);

2
net/ethernet/eth.c
View file

@ -162,7 +162,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
skb->dev = dev; skb->dev = dev;
skb_reset_mac_header(skb); skb_reset_mac_header(skb);
skb_pull(skb, ETH_HLEN); skb_pull_inline(skb, ETH_HLEN);
eth = eth_hdr(skb); eth = eth_hdr(skb);
if (unlikely(is_multicast_ether_addr(eth->h_dest))) { if (unlikely(is_multicast_ether_addr(eth->h_dest))) {