iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen-netfront: add support for IPv6 offloads

Browse Source 
This patch adds support for IPv6 checksum offload and GSO when those
features are available in the backend.

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paul Durrant 2014-01-15 17:30:33 +00:00 committed by David S. Miller
parent 0b4cec8c2e
commit 2c0057dec9
1 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/net/xen-netfront.c
View File

@ -617,7 +617,9 @@ static int xennet_start_xmit(struct sk_buff *skb, struct net_device *dev)
tx->flags |= XEN_NETTXF_extra_info; tx->flags |= XEN_NETTXF_extra_info;
gso->u.gso.size = skb_shinfo(skb)->gso_size; gso->u.gso.size = skb_shinfo(skb)->gso_size;
gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4; gso->u.gso.type = (skb_shinfo(skb)->gso_type & SKB_GSO_TCPV6) ?
XEN_NETIF_GSO_TYPE_TCPV6 :
XEN_NETIF_GSO_TYPE_TCPV4;
gso->u.gso.pad = 0; gso->u.gso.pad = 0;
gso->u.gso.features = 0; gso->u.gso.features = 0;
@ -809,15 +811,18 @@ static int xennet_set_skb_gso(struct sk_buff *skb,
return -EINVAL; return -EINVAL;
} }
/* Currently only TCPv4 S.O. is supported. */ if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4 &&
if (gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV4) { gso->u.gso.type != XEN_NETIF_GSO_TYPE_TCPV6) {
if (net_ratelimit()) if (net_ratelimit())
pr_warn("Bad GSO type %d\n", gso->u.gso.type); pr_warn("Bad GSO type %d\n", gso->u.gso.type);
return -EINVAL; return -EINVAL;
} }
skb_shinfo(skb)->gso_size = gso->u.gso.size; skb_shinfo(skb)->gso_size = gso->u.gso.size;
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4; skb_shinfo(skb)->gso_type =
(gso->u.gso.type == XEN_NETIF_GSO_TYPE_TCPV4) ?
SKB_GSO_TCPV4 :
SKB_GSO_TCPV6;
/* Header must be checked, and gso_segs computed. */ /* Header must be checked, and gso_segs computed. */
skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY; skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY;
@ -1191,6 +1196,15 @@ static netdev_features_t xennet_fix_features(struct net_device *dev,
features &= ~NETIF_F_SG; features &= ~NETIF_F_SG;
} }
if (features & NETIF_F_IPV6_CSUM) {
if (xenbus_scanf(XBT_NIL, np->xbdev->otherend,
"feature-ipv6-csum-offload", "%d", &val) < 0)
val = 0;
if (!val)
features &= ~NETIF_F_IPV6_CSUM;
}
if (features & NETIF_F_TSO) { if (features & NETIF_F_TSO) {
if (xenbus_scanf(XBT_NIL, np->xbdev->otherend, if (xenbus_scanf(XBT_NIL, np->xbdev->otherend,
"feature-gso-tcpv4", "%d", &val) < 0) "feature-gso-tcpv4", "%d", &val) < 0)
@ -1200,6 +1214,15 @@ static netdev_features_t xennet_fix_features(struct net_device *dev,
features &= ~NETIF_F_TSO; features &= ~NETIF_F_TSO;
} }
if (features & NETIF_F_TSO6) {
if (xenbus_scanf(XBT_NIL, np->xbdev->otherend,
"feature-gso-tcpv6", "%d", &val) < 0)
val = 0;
if (!val)
features &= ~NETIF_F_TSO6;
}
return features; return features;
} }
@ -1338,7 +1361,9 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
netif_napi_add(netdev, &np->napi, xennet_poll, 64); netif_napi_add(netdev, &np->napi, xennet_poll, 64);
netdev->features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM | netdev->features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
NETIF_F_GSO_ROBUST; NETIF_F_GSO_ROBUST;
netdev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO; netdev->hw_features = NETIF_F_SG |
NETIF_F_IPV6_CSUM |
NETIF_F_TSO | NETIF_F_TSO6;
/* /*
* Assume that all hw features are available for now. This set * Assume that all hw features are available for now. This set
@ -1716,6 +1741,19 @@ again:
goto abort_transaction; goto abort_transaction;
} }
err = xenbus_write(xbt, dev->nodename, "feature-gso-tcpv6", "1");
if (err) {
message = "writing feature-gso-tcpv6";
goto abort_transaction;
}
err = xenbus_write(xbt, dev->nodename, "feature-ipv6-csum-offload",
"1");
if (err) {
message = "writing feature-ipv6-csum-offload";
goto abort_transaction;
}
err = xenbus_transaction_end(xbt, 0); err = xenbus_transaction_end(xbt, 0);
if (err) { if (err) {
if (err == -EAGAIN) if (err == -EAGAIN)