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. ====================

David S. Miller committed 13 years ago

Commit 09ce0692 parents 948e306 93d8fd110 files · +51 −37Browse files

Unified · Split

10 files

include/uapi/linux/openvswitch.h +0 −1
net/openvswitch/actions.c +4 −0
net/openvswitch/datapath.c +8 −9
net/openvswitch/flow.c +15 −14
net/openvswitch/flow.h +2 −2
net/openvswitch/vport-internal_dev.c +1 −0
net/openvswitch/vport-netdev.c +4 −3
net/openvswitch/vport-netdev.h +0 −1
net/openvswitch/vport.c +8 −3
net/openvswitch/vport.h +9 −4

include/uapi/linux/openvswitch.h+0−1

@@ -192,7 +192,6 @@ enum ovs_vport_type { · 191 unmodified lines
192	* optional; if not specified a free port number is automatically selected.	192	* optional; if not specified a free port number is automatically selected.
193	* Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type	193	* Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
194	* of vport.	194	* of vport.
195	* and other attributes are ignored.
196	*	195	*
197	* For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to	196	* For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
198	* look up the vport to operate on; otherwise dp_idx from the &struct	197	* look up the vport to operate on; otherwise dp_idx from the &struct

net/openvswitch/actions.c+4−0

 	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;
 }

net/openvswitch/datapath.c+8−9

 	if (err)
 		goto err_flow_free;
-	err = ovs_flow_metadata_from_nlattrs(&flow->key.phy.priority,
+	err = ovs_flow_metadata_from_nlattrs(flow, a[OVS_PACKET_ATTR_KEY]);
-					     &flow->key.phy.skb_mark,
-					     &flow->key.phy.in_port,
-					     a[OVS_PACKET_ATTR_KEY]);
 	if (err)
 		goto err_flow_free;
 	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) {
 		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)
+		if (err)
-		goto exit_free;
+			goto exit_free;
+	}
 	if (a[OVS_VPORT_ATTR_UPCALL_PID])
 		vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);

net/openvswitch/flow.c+15−14

  *    - 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)
 	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);
 /**
  * ovs_flow_metadata_from_nlattrs - parses Netlink attributes into a flow key.
- * @priority: receives the skb priority
+ * @flow: Receives extracted in_port, priority, tun_key and skb_mark.
- * @mark: receives the skb mark
+ * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
- * @in_port: receives the extracted input port.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
  * sequence.
  *
  * This parses a series of Netlink attributes that form a flow key, which must
  * 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,
+int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,
-			       const struct nlattr *attr)
+				   const struct nlattr *attr)
 {
 	const struct nlattr *nla;
 	int rem;
-	*in_port = DP_MAX_PORTS;
+	flow->key.phy.in_port = DP_MAX_PORTS;
-	*priority = 0;
+	flow->key.phy.priority = 0;
-	*mark = 0;
+	flow->key.phy.skb_mark = 0;
 	nla_for_each_nested(nla, attr, rem) {
 		int type = nla_type(nla);
 			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;
 			}
 		}

net/openvswitch/flow.h+2−2

@@ -141,8 +141,8 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); · 140 unmodified lines
141	int ovs_flow_to_nlattrs(const struct sw_flow_key , struct sk_buff );	141	int ovs_flow_to_nlattrs(const struct sw_flow_key , struct sk_buff );
142	int ovs_flow_from_nlattrs(struct sw_flow_key swkey, int key_lenp,	142	int ovs_flow_from_nlattrs(struct sw_flow_key swkey, int key_lenp,
143	const struct nlattr *);	143	const struct nlattr *);
144	int ovs_flow_metadata_from_nlattrs(u32 priority, u32 mark, u16 *in_port,	144	int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow,
145	const struct nlattr *);	145	const struct nlattr *attr);
146		146
147	#define MAX_ACTIONS_BUFSIZE (16 * 1024)	147	#define MAX_ACTIONS_BUFSIZE (16 * 1024)
148	#define TBL_MIN_BUCKETS 1024	148	#define TBL_MIN_BUCKETS 1024

net/openvswitch/vport-internal_dev.c+1−0

@@ -221,6 +221,7 @@ static int internal_dev_recv(struct vport vport, struct sk_buff skb) · 220 unmodified lines
221	skb->dev = netdev;	221	skb->dev = netdev;
222	skb->pkt_type = PACKET_HOST;	222	skb->pkt_type = PACKET_HOST;
223	skb->protocol = eth_type_trans(skb, netdev);	223	skb->protocol = eth_type_trans(skb, netdev);
		224	skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
224		225
225	netif_rx(skb);	226	netif_rx(skb);
226		227

net/openvswitch/vport-netdev.c+4−3

 		return;
 	skb_push(skb, ETH_HLEN);
+	ovs_skb_postpush_rcsum(skb, skb->data, ETH_HLEN);
 	ovs_vport_receive(vport, skb);
 	return;
 		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;
 	return len;
-error:
+drop:
 	kfree_skb(skb);
-	ovs_vport_record_error(vport, VPORT_E_TX_DROPPED);
 	return 0;
 }

net/openvswitch/vport-netdev.h+0−1

@@ -39,6 +39,5 @@ netdev_vport_priv(const struct vport *vport) · 38 unmodified lines
39	}	39	}
40		40
41	const char ovs_netdev_get_name(const struct vport );	41	const char ovs_netdev_get_name(const struct vport );
42	const char ovs_netdev_get_config(const struct vport );
43		42
44	#endif /* vport_netdev.h */	43	#endif /* vport_netdev.h */

net/openvswitch/vport.c+8−3

 {
 	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);
 		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;
 }
  * @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)
 {

net/openvswitch/vport.h+9−4

  * 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.
+ * @send: Send a packet on the device.  Returns the length of the packet sent,
- * May be null if the device does not have an ifindex.
+ * zero for dropped packets or negative for error.
- * @send: Send a packet on the device.  Returns the length of the packet sent.
  */
 struct vport_ops {
 	enum ovs_vport_type type;
 	/* 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 *);
 };
 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 */

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code