xen-netback: add gso_segs calculation

netback already has code which parses IPv4 and v6 headers to set up checksum
offsets and these are always applied to GSO packets being sent from
frontends. It's therefore suboptimal that GSOs are being marked
SKB_GSO_DODGY to defer the gso_segs calculation when netback already has all
necessary information to hand to do the calculation. This patch adds that
calculation.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 773b731e3e52bcce8bfa23bb8d17098ed117ed2d..611aebee4583679f4377658b65691a4e8fd0e29e 100644 (file)
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1043,10 +1043,7 @@ static int xenvif_set_skb_gso(struct xenvif *vif,
        }
 
        skb_shinfo(skb)->gso_size = gso->u.gso.size;
-
-       /* Header must be checked, and gso_segs computed. */
-       skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY;
-       skb_shinfo(skb)->gso_segs = 0;
+       /* gso_segs will be calculated later */
 
        return 0;
 }
@@ -1581,6 +1578,20 @@ static int xenvif_tx_submit(struct xenvif *vif)
 
                skb_probe_transport_header(skb, 0);
 
+               /* If the packet is GSO then we will have just set up the
+                * transport header offset in checksum_setup so it's now
+                * straightforward to calculate gso_segs.
+                */
+               if (skb_is_gso(skb)) {
+                       int mss = skb_shinfo(skb)->gso_size;
+                       int hdrlen = skb_transport_header(skb) -
+                               skb_mac_header(skb) +
+                               tcp_hdrlen(skb);
+
+                       skb_shinfo(skb)->gso_segs =
+                               DIV_ROUND_UP(skb->len - hdrlen, mss);
+               }
+
                vif->dev->stats.rx_bytes += skb->len;
                vif->dev->stats.rx_packets++;