Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 47d29646a2c1c147d8a7598aeac2c87dd71ed638

Authored by David S. Miller
1 parent 4381548237
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

net: Inline skb_pull() in eth_type_trans(). 

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>

Showing 3 changed files with 7 additions and 2 deletions Side-by-side Diff

include/linux/skbuff.h
Diff comments   View file @ 47d2964
... ... @@ -1128,6 +1128,11 @@
1128 1128 return skb->data += len;
1129 1129 }
1130 1130  
  1131 +static inline unsigned char *skb_pull_inline(struct sk_buff *skb, unsigned int len)
  1132 +{
  1133 + return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
  1134 +}
  1135 +
1131 1136 extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
1132 1137  
1133 1138 static inline unsigned char *__pskb_pull(struct sk_buff *skb, unsigned int len)
... ... @@ -1051,7 +1051,7 @@
1051 1051 */
1052 1052 unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
1053 1053 {
1054   - return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
  1054 + return skb_pull_inline(skb, len);
1055 1055 }
1056 1056 EXPORT_SYMBOL(skb_pull);
1057 1057  
... ... @@ -162,7 +162,7 @@
162 162  
163 163 skb->dev = dev;
164 164 skb_reset_mac_header(skb);
165   - skb_pull(skb, ETH_HLEN);
  165 + skb_pull_inline(skb, ETH_HLEN);
166 166 eth = eth_hdr(skb);
167 167  
168 168 if (unlikely(is_multicast_ether_addr(eth->h_dest))) {