Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09ce069d authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 948e306d 93d8fd15

include/uapi/linux/openvswitch.h

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ enum ovs_vport_type { 
 * optional; if not specified a free port number is automatically selected.

 * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type

 * of vport.

 * and other attributes are ignored.

 *

 * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to

 * look up the vport to operate on; otherwise dp_idx from the &struct

net/openvswitch/actions.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

net/openvswitch/datapath.c

+8 −9
Original line number Diff line number Diff line
@@ -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 (a[OVS_VPORT_ATTR_UPCALL_PID])

		vport->upcall_portid = nla_get_u32(a[OVS_VPORT_ATTR_UPCALL_PID]);

net/openvswitch/flow.c

+15 −14
Original line number Diff line number Diff line
@@ -590,10 +590,10 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, 
 *    - 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,

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;

			}

		}

net/openvswitch/flow.h

+2 −2
Original line number Diff line number Diff line
@@ -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