net: adjust skb_gso_segment() for calling in rx path
Subsystems (3)
PATCH v2 1/1 net: adjust skb_gso_segment() for calling in rx path
From: Cong Wang <[email protected]>
skb_gso_segment() is almost always called in tx path, except for openvswitch. It calls this function when it receives the packet and tries to queue it to user-space. In this special case, the ->ip_summed check inside skb_gso_segment() is no longer true, as ->ip_summed value has different meanings on rx path.
This patch adjusts skb_gso_segment() so that we can at least avoid such warnings on checksum.
--- include/linux/netdevice.h | 11 +++++++++-- net/core/dev.c | 21 ++++++++++++++++----- net/openvswitch/datapath.c | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-)
include/linux/netdevice.h +9 -2
@@ -2662,8 +2662,15 @@ extern int netdev_master_upper_dev_link(struct net_device *dev,extern void netdev_upper_dev_unlink (struct net_device *dev,struct net_device *upper_dev);extern int skb_checksum_help (struct sk_buff *skb); -extern struct sk_buff *skb_gso_segment (struct sk_buff *skb, -netdev_features_t features); +extern struct sk_buff *__skb_gso_segment (struct sk_buff *skb, +netdev_features_t features,bool tx_path); + +static inline +struct sk_buff *skb_gso_segment (struct sk_buff *skb,netdev_features_t features) +{ +return __skb_gso_segment (skb, features, true); +} +#ifdef CONFIG_BUG extern void netdev_rx_csum_fault (struct net_device *dev);#else
net/core/dev.c +16 -5
@@ -2302,18 +2302,29 @@ out: }EXPORT_SYMBOL (skb_checksum_help); +/* openvswitch calls this on rx path, so we need a different check. +*/ +static inline bool skb_needs_check (struct sk_buff *skb,bool tx_path) +{ +if (tx_path) +return skb->ip_summed !=CHECKSUM_PARTIAL ; +else +return skb->ip_summed ==CHECKSUM_NONE ; +} +/** -* skb_gso_segment - Perform segmentation on skb. +* __skb_gso_segment - Perform segmentation on skb. * @skb: buffer to segment * @features: features for the output path (see dev->features) +* @tx_path: whether it is called in TX path * * This function segments the given skb and returns a list of segments. * * It may return NULL if the skb requires no segmentation. This is * only possible when GSO is used for verifying header integrity. */ -struct sk_buff *skb_gso_segment (struct sk_buff *skb, -netdev_features_t features) +struct sk_buff *__skb_gso_segment (struct sk_buff *skb, +netdev_features_t features,bool tx_path) {struct sk_buff *segs =ERR_PTR (-EPROTONOSUPPORT );struct packet_offload *ptype;
@@ -2336,7 +2347,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, skb->mac_len = skb->network_header - skb->mac_header;__skb_pull (skb, skb->mac_len); -if (unlikely (skb->ip_summed !=CHECKSUM_PARTIAL )) { +if (unlikely (skb_needs_check (skb, tx_path))) {skb_warn_bad_offload (skb); if (skb_header_cloned(skb) &&
@@ -2365,7 +2376,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb,return segs; } -EXPORT_SYMBOL (skb_gso_segment); +EXPORT_SYMBOL (__skb_gso_segment);/* Take action when hardware reception checksum errors are detected. */ #ifdef CONFIG_BUG
net/openvswitch/datapath.c +1 -1
@@ -301,7 +301,7 @@ static int queue_gso_packets(struct net *net, int dp_ifindex,struct sk_buff *segs, *nskb;int err; - segs =skb_gso_segment (skb,NETIF_F_SG |NETIF_F_HW_CSUM ); + segs =__skb_gso_segment (skb,NETIF_F_SG |NETIF_F_HW_CSUM , false);if (IS_ERR (segs))return PTR_ERR (segs);
Signature · 1 line
1.7.7.6
net/core/dev.c out: · line 2314
Quoted 10 lines
net/core/dev.c +10
-0+/* openvswitch calls this on rx path, so we need a different check. +*/ +static inline bool skb_needs_check (struct sk_buff *skb,bool tx_path) +{ +if (tx_path) +return skb->ip_summed !=CHECKSUM_PARTIAL ; +else +return skb->ip_summed ==CHECKSUM_NONE ; +} +
That code wants a lot of unlikely() added.
It seems wrong to be adding code a very common path for one obscure caller.
Perhaps the caller should be modifying the ip_summed field (etc) to match the values expected for a tx skb.
David
Quoted 13 lines · David Laight
net/core/dev.c out: · line 2314
Quoted 10 lines
net/core/dev.c +10
-0+/* openvswitch calls this on rx path, so we need a different check. +*/ +static inline bool skb_needs_check (struct sk_buff *skb,bool tx_path) +{ +if (tx_path) +return skb->ip_summed !=CHECKSUM_PARTIAL ; +else +return skb->ip_summed ==CHECKSUM_NONE ; +} +That code wants a lot of
unlikely()added.
Quoted 2 lines
It seems wrong to be adding code a very common path for one obscure caller.
Its caller does:
+ if (unlikely(skb_needs_check(skb, tx_path))) {
Quoted 4 lines
Perhaps the caller should be modifying the
ip_summedfield (etc) to match the values expected for a tx skb.
This is even uglier, you need to restore ip_summed after calling skb_gso_segment().
Quoted 14 lines · David Laight
Quoted 13 lines
net/core/dev.c out: · line 2314
Quoted 10 lines
net/core/dev.c +10
-0+/* openvswitch calls this on rx path, so we need a different check. +*/ +static inline bool skb_needs_check (struct sk_buff *skb,bool tx_path) +{ +if (tx_path) +return skb->ip_summed !=CHECKSUM_PARTIAL ; +else +return skb->ip_summed ==CHECKSUM_NONE ; +} +That code wants a lot of
unlikely()added.
Quoted 6 lines
Quoted 2 lines
It seems wrong to be adding code a very common path for one obscure caller.
Its caller does:
+ if (
unlikely(skb_needs_check(skb, tx_path))) {
In my experience that isn't enough to get all the sub-tests of complex conditionals compiled in the desired way.
David
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Wed, 6 Feb 2013 10:36:38 +0800
Quoted 9 lines
From: Cong Wang <[email protected]>
skb_gso_segment()is almost always called in tx path, except for openvswitch. It calls this function when it receives the packet and tries to queue it to user-space. In this special case, the ->ip_summed check insideskb_gso_segment()is no longer true, as ->ip_summed value has different meanings on rx path.
Quoted 6 lines
This patch adjusts
skb_gso_segment()so that we can at least avoid such warnings on checksum.Cc Jesse Gross <[email protected]>Cc David S. Miller <[email protected]>Signed-off-by Cong Wang <[email protected]>
This looks perfect, applied, thanks!