Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
A few miscellaneous improvements and cleanups before the GRE tunnel
integration series. Intended for net-next/3.11.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

9 files changed, 51 insertions, 36 deletions

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index 894b6cbdd929..596d6373399d 100644
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -130,9 +130,13 @@ static int set_eth_addr(struct sk_buff *skb,
         if (unlikely(err))
                 return err;
 
+        skb_postpull_rcsum(skb, eth_hdr(skb), ETH_ALEN * 2);
+
         memcpy(eth_hdr(skb)->h_source, eth_key->eth_src, ETH_ALEN);
         memcpy(eth_hdr(skb)->h_dest, eth_key->eth_dst, ETH_ALEN);
 
+        ovs_skb_postpush_rcsum(skb, eth_hdr(skb), ETH_ALEN * 2);
+
         return 0;
 }
 
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index d12d6b8b5e8b..0f783d9fa00d 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -739,10 +739,7 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
         if (err)
                 goto err_flow_free;
 
-        err = ovs_flow_metadata_from_nlattrs(&flow->key.phy.priority,
-                                             &flow->key.phy.skb_mark,
-                                             &flow->key.phy.in_port,
-                                             a[OVS_PACKET_ATTR_KEY]);
+        err = ovs_flow_metadata_from_nlattrs(flow, a[OVS_PACKET_ATTR_KEY]);
         if (err)
                 goto err_flow_free;
 
@@ -1812,10 +1809,11 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
         if (IS_ERR(vport))
                 goto exit_unlock;
 
-        err = 0;
         if (a[OVS_VPORT_ATTR_TYPE] &&
-            nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type)
+            nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type) {
                 err = -EINVAL;
+                goto exit_unlock;
+        }
 
         reply = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
         if (!reply) {
@@ -1823,10 +1821,11 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
                 goto exit_unlock;
         }
 
-        if (!err && a[OVS_VPORT_ATTR_OPTIONS])
+        if (a[OVS_VPORT_ATTR_OPTIONS]) {
                 err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
-        if (err)
-                goto exit_free;
+                if (err)
+                        goto exit_free;
+        }
 
         if (a[OVS_VPORT_ATTR_UPCALL_PID])
                 vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index b15321a2228c..093c191d4fc2 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -590,10 +590,10 @@ out:
  *    - skb->network_header: just past the Ethernet header, or just past the
  *      VLAN header, to the first byte of the Ethernet payload.
  *
- *    - skb->transport_header: If key->dl_type is ETH_P_IP or ETH_P_IPV6
+ *    - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
  *      on output, then just past the IP header, if one is present and
  *      of a correct length, otherwise the same as skb->network_header.
- *      For other key->dl_type values it is left untouched.
+ *      For other key->eth.type values it is left untouched.
  */
 int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
                  int *key_lenp)
@@ -618,6 +618,9 @@ int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
         memcpy(key->eth.dst, eth->h_dest, ETH_ALEN);
 
         __skb_pull(skb, 2 * ETH_ALEN);
+        /* We are going to push all headers that we pull, so no need to
+         * update skb->csum here.
+         */
 
         if (vlan_tx_tag_present(skb))
                 key->eth.tci = htons(skb->vlan_tci);
@@ -1122,10 +1125,8 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
 
 /**
  * ovs_flow_metadata_from_nlattrs - parses Netlink attributes into a flow key.
- * @priority: receives the skb priority
- * @mark: receives the skb mark
- * @in_port: receives the extracted input port.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
+ * @flow: Receives extracted in_port, priority, tun_key and skb_mark.
+ * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
  * sequence.
  *
  * This parses a series of Netlink attributes that form a flow key, which must
@@ -1133,15 +1134,15 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
  * get the metadata, that is, the parts of the flow key that cannot be
  * extracted from the packet itself.
  */
-int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,
-                               const struct nlattr *attr)
+int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,
+                                   const struct nlattr *attr)
 {
         const struct nlattr *nla;
         int rem;
 
-        *in_port = DP_MAX_PORTS;
-        *priority = 0;
-        *mark = 0;
+        flow->key.phy.in_port = DP_MAX_PORTS;
+        flow->key.phy.priority = 0;
+        flow->key.phy.skb_mark = 0;
 
         nla_for_each_nested(nla, attr, rem) {
                 int type = nla_type(nla);
@@ -1152,17 +1153,17 @@ int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,
 
                         switch (type) {
                         case OVS_KEY_ATTR_PRIORITY:
-                                *priority = nla_get_u32(nla);
+                                flow->key.phy.priority = nla_get_u32(nla);
                                 break;
 
                         case OVS_KEY_ATTR_IN_PORT:
                                 if (nla_get_u32(nla) >= DP_MAX_PORTS)
                                         return -EINVAL;
-                                *in_port = nla_get_u32(nla);
+                                flow->key.phy.in_port = nla_get_u32(nla);
                                 break;
 
                         case OVS_KEY_ATTR_SKB_MARK:
-                                *mark = nla_get_u32(nla);
+                                flow->key.phy.skb_mark = nla_get_u32(nla);
                                 break;
                         }
                 }
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 0875fde65b9c..2a83e2141f08 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -141,8 +141,8 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies);
 int ovs_flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);
 int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
                       const struct nlattr *);
-int ovs_flow_metadata_from_nlattrs(u32 *priority, u32 *mark, u16 *in_port,
-                               const struct nlattr *);
+int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,
+                                  const struct nlattr *attr);
 
 #define MAX_ACTIONS_BUFSIZE    (16 * 1024)
 #define TBL_MIN_BUCKETS         1024
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
index 84e0a0379186..e284c7e1fec4 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
@@ -221,6 +221,7 @@ static int internal_dev_recv(struct vport *vport, struct sk_buff *skb)
         skb->dev = netdev;
         skb->pkt_type = PACKET_HOST;
         skb->protocol = eth_type_trans(skb, netdev);
+        skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
 
         netif_rx(skb);
 
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c
index 4f01c6d2ffa4..40de815b4213 100644
--- a/net/openvswitch/vport-netdev.c
+++ b/net/openvswitch/vport-netdev.c
@@ -49,6 +49,8 @@ static void netdev_port_receive(struct vport *vport, struct sk_buff *skb)
                 return;
 
         skb_push(skb, ETH_HLEN);
+        ovs_skb_postpush_rcsum(skb, skb->data, ETH_HLEN);
+
         ovs_vport_receive(vport, skb);
         return;
 
@@ -170,7 +172,7 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb)
                 net_warn_ratelimited("%s: dropped over-mtu packet: %d > %d\n",
                                      netdev_vport->dev->name,
                                      packet_length(skb), mtu);
-                goto error;
+                goto drop;
         }
 
         skb->dev = netdev_vport->dev;
@@ -179,9 +181,8 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb)
 
         return len;
 
-error:
+drop:
         kfree_skb(skb);
-        ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
         return 0;
 }
 
diff --git a/net/openvswitch/vport-netdev.h b/net/openvswitch/vport-netdev.h
index a3cb3a32cd77..dd298b5c5cdb 100644
--- a/net/openvswitch/vport-netdev.h
+++ b/net/openvswitch/vport-netdev.h
@@ -39,6 +39,5 @@ netdev_vport_priv(const struct vport *vport)
 }
 
 const char *ovs_netdev_get_name(const struct vport *);
-const char *ovs_netdev_get_config(const struct vport *);
 
 #endif /* vport_netdev.h */
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
index 720623190eaa..176d449351eb 100644
--- a/net/openvswitch/vport.c
+++ b/net/openvswitch/vport.c
@@ -351,7 +351,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
 {
         int sent = vport->ops->send(vport, skb);
 
-        if (likely(sent)) {
+        if (likely(sent > 0)) {
                 struct pcpu_tstats *stats;
 
                 stats = this_cpu_ptr(vport->percpu_stats);
@@ -360,7 +360,12 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
                 stats->tx_packets++;
                 stats->tx_bytes += sent;
                 u64_stats_update_end(&stats->syncp);
-        }
+        } else if (sent < 0) {
+                ovs_vport_record_error(vport, VPORT_E_TX_ERROR);
+                kfree_skb(skb);
+        } else
+                ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
+
         return sent;
 }
 
@@ -371,7 +376,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
  * @err_type: one of enum vport_err_type types to indicate the error type
  *
  * If using the vport generic stats layer indicate that an error of the given
- * type has occured.
+ * type has occurred.
  */
 void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)
 {
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 68a377bc0841..293278c4c2df 100644
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -123,9 +123,8 @@ struct vport_parms {
  * existing vport to a &struct sk_buff.  May be %NULL for a vport that does not
  * have any configuration.
  * @get_name: Get the device's name.
- * @get_config: Get the device's configuration.
- * May be null if the device does not have an ifindex.
- * @send: Send a packet on the device.  Returns the length of the packet sent.
+ * @send: Send a packet on the device.  Returns the length of the packet sent,
+ * zero for dropped packets or negative for error.
  */
 struct vport_ops {
         enum ovs_vport_type type;
@@ -139,7 +138,6 @@ struct vport_ops {
 
         /* Called with rcu_read_lock or ovs_mutex. */
         const char *(*get_name)(const struct vport *);
-        void (*get_config)(const struct vport *, void *);
 
         int (*send)(struct vport *, struct sk_buff *);
 };
@@ -194,4 +192,11 @@ void ovs_vport_record_error(struct vport *, enum vport_err_type err_type);
 extern const struct vport_ops ovs_netdev_vport_ops;
 extern const struct vport_ops ovs_internal_vport_ops;
 
+static inline void ovs_skb_postpush_rcsum(struct sk_buff *skb,
+                                      const void *start, unsigned int len)
+{
+        if (skb->ip_summed == CHECKSUM_COMPLETE)
+                skb->csum = csum_add(skb->csum, csum_partial(start, len, 0));
+}
+
 #endif /* vport.h */