X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-netdev.c;h=dbc8db2ca7817f0e99028e7b55a1d54b2daeaede;hb=ff8d7a5e81625bbb13d33ca73888fc848b02db83;hp=3693004c670c52eb3835ab041ff604794892d7da;hpb=6ce39213456b27257acbaf146398dce26d1466b9;p=openvswitch diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c index 3693004c..dbc8db2c 100644 --- a/datapath/vport-netdev.c +++ b/datapath/vport-netdev.c @@ -6,6 +6,8 @@ * kernel, by Linus Torvalds and others. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -22,12 +24,39 @@ #include "vport-internal_dev.h" #include "vport-netdev.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \ + !defined(HAVE_VLAN_BUG_WORKAROUND) +#include + +static int vlan_tso __read_mostly = 0; +module_param(vlan_tso, int, 0644); +MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets"); +#else +#define vlan_tso true +#endif + /* If the native device stats aren't 64 bit use the vport stats tracking instead. */ #define USE_VPORT_STATS (sizeof(((struct net_device_stats *)0)->rx_bytes) < sizeof(u64)) static void netdev_port_receive(struct vport *vport, struct sk_buff *skb); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) +/* Called with rcu_read_lock and bottom-halves disabled. */ +static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb) +{ + struct sk_buff *skb = *pskb; + struct vport *vport; + + if (unlikely(skb->pkt_type == PACKET_LOOPBACK)) + return RX_HANDLER_PASS; + + vport = netdev_get_vport(skb->dev); + + netdev_port_receive(vport, skb); + + return RX_HANDLER_CONSUMED; +} +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) /* Called with rcu_read_lock and bottom-halves disabled. */ static struct sk_buff *netdev_frame_hook(struct sk_buff *skb) { @@ -131,7 +160,9 @@ static struct vport *netdev_create(const struct vport_parms *parms) goto error_put; dev_set_promiscuity(netdev_vport->dev, 1); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) dev_disable_lro(netdev_vport->dev); +#endif netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH; return vport; @@ -226,12 +257,6 @@ int netdev_get_ifindex(const struct vport *vport) return netdev_vport->dev->ifindex; } -int netdev_get_iflink(const struct vport *vport) -{ - const struct netdev_vport *netdev_vport = netdev_vport_priv(vport); - return netdev_vport->dev->iflink; -} - int netdev_get_mtu(const struct vport *vport) { const struct netdev_vport *netdev_vport = netdev_vport_priv(vport); @@ -241,6 +266,11 @@ int netdev_get_mtu(const struct vport *vport) /* Must be called with rcu_read_lock. */ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) { + if (unlikely(!vport)) { + kfree_skb(skb); + return; + } + /* Make our own copy of the packet. Otherwise we will mangle the * packet for anyone who came before us (e.g. tcpdump via AF_PACKET). * (No one comes after us, since we tell handle_bridge() that we took @@ -249,41 +279,93 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb) if (unlikely(!skb)) return; - skb_warn_if_lro(skb); - skb_push(skb, ETH_HLEN); - compute_ip_summed(skb, false); + + if (unlikely(compute_ip_summed(skb, false))) { + kfree_skb(skb); + return; + } vlan_copy_skb_tci(skb); vport_receive(vport, skb); } +static inline unsigned packet_length(const struct sk_buff *skb) +{ + unsigned length = skb->len - ETH_HLEN; + + if (skb->protocol == htons(ETH_P_8021Q)) + length -= VLAN_HLEN; + + return length; +} + +static bool dev_supports_vlan_tx(struct net_device *dev) +{ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) + /* Software fallback means every device supports vlan_tci on TX. */ + return true; +#elif defined(HAVE_VLAN_BUG_WORKAROUND) + return dev->features & NETIF_F_HW_VLAN_TX; +#else + /* Assume that the driver is buggy. */ + return false; +#endif +} + static int netdev_send(struct vport *vport, struct sk_buff *skb) { struct netdev_vport *netdev_vport = netdev_vport_priv(vport); + int mtu = netdev_vport->dev->mtu; int len; + if (unlikely(packet_length(skb) > mtu && !skb_is_gso(skb))) { + if (net_ratelimit()) + pr_warn("%s: dropped over-mtu packet: %d > %d\n", + dp_name(vport->dp), packet_length(skb), mtu); + goto error; + } + + if (unlikely(skb_warn_if_lro(skb))) + goto error; + skb->dev = netdev_vport->dev; - forward_ip_summed(skb); + forward_ip_summed(skb, true); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) - if (vlan_tx_tag_present(skb)) { - int err; + if (vlan_tx_tag_present(skb) && !dev_supports_vlan_tx(skb->dev)) { + int features = 0; - err = vswitch_skb_checksum_setup(skb); - if (unlikely(err)) { - kfree_skb(skb); - return 0; - } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) + features = skb->dev->features & skb->dev->vlan_features; +#endif - if (skb_is_gso(skb)) { + if (!vlan_tso) + features &= ~(NETIF_F_TSO | NETIF_F_TSO6 | + NETIF_F_UFO | NETIF_F_FSO); + + if (skb_is_gso(skb) && + (!skb_gso_ok(skb, features) || + unlikely(skb->ip_summed != CHECKSUM_PARTIAL))) { struct sk_buff *nskb; - nskb = skb_gso_segment(skb, 0); - kfree_skb(skb); - skb = nskb; - if (IS_ERR(skb)) + nskb = skb_gso_segment(skb, features); + if (!nskb) { + if (unlikely(skb_cloned(skb) && + pskb_expand_head(skb, 0, 0, GFP_ATOMIC))) { + kfree_skb(skb); + return 0; + } + + skb_shinfo(skb)->gso_type &= ~SKB_GSO_DODGY; + goto tag; + } + + if (IS_ERR(nskb)) { + kfree_skb(skb); return 0; + } + consume_skb(skb); + skb = nskb; len = 0; do { @@ -301,19 +383,24 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb) } while (skb); return len; - } else { - skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb)); - if (unlikely(!skb)) - return 0; - vlan_set_tci(skb, 0); } + +tag: + skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb)); + if (unlikely(!skb)) + return 0; + vlan_set_tci(skb, 0); } -#endif len = skb->len; dev_queue_xmit(skb); return len; + +error: + kfree_skb(skb); + vport_record_error(vport, VPORT_E_TX_DROPPED); + return 0; } /* Returns null if this device is not attached to a datapath. */ @@ -334,7 +421,7 @@ struct vport *netdev_get_vport(struct net_device *dev) } const struct vport_ops netdev_vport_ops = { - .type = ODP_VPORT_TYPE_NETDEV, + .type = OVS_VPORT_TYPE_NETDEV, .flags = (VPORT_F_REQUIRED | (USE_VPORT_STATS ? VPORT_F_GEN_STATS : 0)), .init = netdev_init, @@ -351,7 +438,6 @@ const struct vport_ops netdev_vport_ops = { .is_running = netdev_is_running, .get_operstate = netdev_get_operstate, .get_ifindex = netdev_get_ifindex, - .get_iflink = netdev_get_iflink, .get_mtu = netdev_get_mtu, .send = netdev_send, };