Commit b78462eb authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

skbuff: add check for non-linear to warn_if_lro and needs_linearize

We can avoid an unecessary cache miss by checking if the skb is non-linear
before accessing gso_size/gso_type in skb_warn_if_lro, the same can also be
done to avoid a cache miss on nr_frags if data_len is 0.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55c95e73
...@@ -2129,7 +2129,8 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb) ...@@ -2129,7 +2129,8 @@ static inline bool skb_warn_if_lro(const struct sk_buff *skb)
/* LRO sets gso_size but not gso_type, whereas if GSO is really /* LRO sets gso_size but not gso_type, whereas if GSO is really
* wanted then gso_type will be set. */ * wanted then gso_type will be set. */
struct skb_shared_info *shinfo = skb_shinfo(skb); struct skb_shared_info *shinfo = skb_shinfo(skb);
if (shinfo->gso_size != 0 && unlikely(shinfo->gso_type == 0)) { if (skb_is_nonlinear(skb) && shinfo->gso_size != 0 &&
unlikely(shinfo->gso_type == 0)) {
__skb_warn_lro_forwarding(skb); __skb_warn_lro_forwarding(skb);
return true; return true;
} }
......
...@@ -2103,9 +2103,10 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, ...@@ -2103,9 +2103,10 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
static inline int skb_needs_linearize(struct sk_buff *skb, static inline int skb_needs_linearize(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
return (skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) || return skb_is_nonlinear(skb) &&
(skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) || ((skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) ||
illegal_highdma(dev, skb))); (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) ||
illegal_highdma(dev, skb))));
} }
/** /**
......
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