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

Commit 028b86b7 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jesse Gross says:

====================
Open vSwitch

A handful of bug fixes for net/3.14. High level fixes are:
 * Regressions introduced by the zerocopy changes, particularly with
   old userspaces.
 * A few bugs lingering from the introduction of megaflows.
 * Overly zealous error checking that is now being triggered frequently
   in common cases.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9ab9831b c14e0953

net/openvswitch/datapath.c

+16 −7
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 


#include "datapath.h"

#include "flow.h"

#include "flow_table.h"

#include "flow_netlink.h"

#include "vport-internal_dev.h"

#include "vport-netdev.h"
@@ -160,7 +161,6 @@ static void destroy_dp_rcu(struct rcu_head *rcu) 
{

	struct datapath *dp = container_of(rcu, struct datapath, rcu);



	ovs_flow_tbl_destroy(&dp->table);

	free_percpu(dp->stats_percpu);

	release_net(ovs_dp_get_net(dp));

	kfree(dp->ports);
@@ -466,6 +466,14 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, 


	skb_zerocopy(user_skb, skb, skb->len, hlen);



	/* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */

	if (!(dp->user_features & OVS_DP_F_UNALIGNED)) {

		size_t plen = NLA_ALIGN(user_skb->len) - user_skb->len;



		if (plen > 0)

			memset(skb_put(user_skb, plen), 0, plen);

	}



	((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len;



	err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, upcall_info->portid);
@@ -852,11 +860,8 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info) 
			goto err_unlock_ovs;



		/* The unmasked key has to be the same for flow updates. */

		error = -EINVAL;

		if (!ovs_flow_cmp_unmasked_key(flow, &match)) {

			OVS_NLERR("Flow modification message rejected, unmasked key does not match.\n");

		if (!ovs_flow_cmp_unmasked_key(flow, &match))

			goto err_unlock_ovs;

		}



		/* Update actions. */

		old_acts = ovsl_dereference(flow->sf_acts);
@@ -1079,6 +1084,7 @@ static size_t ovs_dp_cmd_msg_size(void) 
	msgsize += nla_total_size(IFNAMSIZ);

	msgsize += nla_total_size(sizeof(struct ovs_dp_stats));

	msgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));

	msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */



	return msgsize;

}
@@ -1279,7 +1285,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info) 
err_destroy_percpu:

	free_percpu(dp->stats_percpu);

err_destroy_table:

	ovs_flow_tbl_destroy(&dp->table);

	ovs_flow_tbl_destroy(&dp->table, false);

err_free_dp:

	release_net(ovs_dp_get_net(dp));

	kfree(dp);
@@ -1306,10 +1312,13 @@ static void __dp_destroy(struct datapath *dp) 
	list_del_rcu(&dp->list_node);



	/* OVSP_LOCAL is datapath internal port. We need to make sure that

	 * all port in datapath are destroyed first before freeing datapath.

	 * all ports in datapath are destroyed first before freeing datapath.

	 */

	ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL));



	/* RCU destroy the flow table */

	ovs_flow_tbl_destroy(&dp->table, true);



	call_rcu(&dp->rcu, destroy_dp_rcu);

}

net/openvswitch/flow_table.c

+43 −45
Original line number Diff line number Diff line
@@ -153,11 +153,18 @@ static void rcu_free_flow_callback(struct rcu_head *rcu) 
	flow_free(flow);

}



static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred)

void ovs_flow_free(struct sw_flow *flow, bool deferred)

{

	if (!mask)

	if (!flow)

		return;



	if (flow->mask) {

		struct sw_flow_mask *mask = flow->mask;



		/* ovs-lock is required to protect mask-refcount and

		 * mask list.

		 */

		ASSERT_OVSL();

		BUG_ON(!mask->ref_count);

		mask->ref_count--;
@@ -170,13 +177,6 @@ static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred) 
		}

	}



void ovs_flow_free(struct sw_flow *flow, bool deferred)

{

	if (!flow)

		return;



	flow_mask_del_ref(flow->mask, deferred);



	if (deferred)

		call_rcu(&flow->rcu, rcu_free_flow_callback);

	else
@@ -188,26 +188,9 @@ static void free_buckets(struct flex_array *buckets) 
	flex_array_free(buckets);

}





static void __table_instance_destroy(struct table_instance *ti)

{

	int i;



	if (ti->keep_flows)

		goto skip_flows;



	for (i = 0; i < ti->n_buckets; i++) {

		struct sw_flow *flow;

		struct hlist_head *head = flex_array_get(ti->buckets, i);

		struct hlist_node *n;

		int ver = ti->node_ver;



		hlist_for_each_entry_safe(flow, n, head, hash_node[ver]) {

			hlist_del(&flow->hash_node[ver]);

			ovs_flow_free(flow, false);

		}

	}



skip_flows:

	free_buckets(ti->buckets);

	kfree(ti);

}
@@ -258,20 +241,38 @@ static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu) 


static void table_instance_destroy(struct table_instance *ti, bool deferred)

{

	int i;



	if (!ti)

		return;



	if (ti->keep_flows)

		goto skip_flows;



	for (i = 0; i < ti->n_buckets; i++) {

		struct sw_flow *flow;

		struct hlist_head *head = flex_array_get(ti->buckets, i);

		struct hlist_node *n;

		int ver = ti->node_ver;



		hlist_for_each_entry_safe(flow, n, head, hash_node[ver]) {

			hlist_del_rcu(&flow->hash_node[ver]);

			ovs_flow_free(flow, deferred);

		}

	}



skip_flows:

	if (deferred)

		call_rcu(&ti->rcu, flow_tbl_destroy_rcu_cb);

	else

		__table_instance_destroy(ti);

}



void ovs_flow_tbl_destroy(struct flow_table *table)

void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred)

{

	struct table_instance *ti = ovsl_dereference(table->ti);



	table_instance_destroy(ti, false);

	table_instance_destroy(ti, deferred);

}



struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *ti,
@@ -504,16 +505,11 @@ static struct sw_flow_mask *mask_alloc(void) 


	mask = kmalloc(sizeof(*mask), GFP_KERNEL);

	if (mask)

		mask->ref_count = 0;

		mask->ref_count = 1;



	return mask;

}



static void mask_add_ref(struct sw_flow_mask *mask)

{

	mask->ref_count++;

}



static bool mask_equal(const struct sw_flow_mask *a,

		       const struct sw_flow_mask *b)

{
@@ -554,9 +550,11 @@ static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow, 
		mask->key = new->key;

		mask->range = new->range;

		list_add_rcu(&mask->list, &tbl->mask_list);

	} else {

		BUG_ON(!mask->ref_count);

		mask->ref_count++;

	}



	mask_add_ref(mask);

	flow->mask = mask;

	return 0;

}

net/openvswitch/flow_table.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void ovs_flow_free(struct sw_flow *, bool deferred); 


int ovs_flow_tbl_init(struct flow_table *);

int ovs_flow_tbl_count(struct flow_table *table);

void ovs_flow_tbl_destroy(struct flow_table *table);

void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred);

int ovs_flow_tbl_flush(struct flow_table *flow_table);



int ovs_flow_tbl_insert(struct flow_table *table, struct sw_flow *flow,