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

Merge branch 'net-openvswitch-improve-the-codes' 



Tonghao Zhang says:

====================
net: openvswitch: improve the codes

This series patches are not bug fix, just improve codes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 34e1ec31 e6896163

net/openvswitch/actions.c

+3 −2
Original line number Diff line number Diff line
@@ -741,7 +741,8 @@ static int set_sctp(struct sk_buff *skb, struct sw_flow_key *flow_key, 
	return 0;

}



static int ovs_vport_output(struct net *net, struct sock *sk, struct sk_buff *skb)

static int ovs_vport_output(struct net *net, struct sock *sk,

			    struct sk_buff *skb)

{

	struct ovs_frag_data *data = this_cpu_ptr(&ovs_frag_data_storage);

	struct vport *vport = data->vport;

net/openvswitch/datapath.c

+22 −16
Original line number Diff line number Diff line
@@ -1080,7 +1080,8 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) 
}



/* Factor out action copy to avoid "Wframe-larger-than=1024" warning. */

static noinline_for_stack struct sw_flow_actions *get_flow_actions(struct net *net,

static noinline_for_stack

struct sw_flow_actions *get_flow_actions(struct net *net,

					 const struct nlattr *a,

					 const struct sw_flow_key *key,

					 const struct sw_flow_mask *mask,
@@ -1383,7 +1384,8 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) 


			ovs_notify(&dp_flow_genl_family, reply, info);

		} else {

			netlink_set_err(sock_net(skb->sk)->genl_sock, 0, 0, PTR_ERR(reply));

			netlink_set_err(sock_net(skb->sk)->genl_sock, 0, 0,

					PTR_ERR(reply));

		}

	}
@@ -1572,11 +1574,13 @@ static struct datapath *lookup_datapath(struct net *net, 
	return dp ? dp : ERR_PTR(-ENODEV);

}



static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *info)

static void ovs_dp_reset_user_features(struct sk_buff *skb,

				       struct genl_info *info)

{

	struct datapath *dp;



	dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);

	dp = lookup_datapath(sock_net(skb->sk), info->userhdr,

			     info->attrs);

	if (IS_ERR(dp))

		return;
@@ -2093,11 +2097,12 @@ static void ovs_update_headroom(struct datapath *dp, unsigned int new_headroom) 
	int i;



	dp->max_headroom = new_headroom;

	for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)

	for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {

		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node,

					 lockdep_ovsl_is_held())

			netdev_set_rx_headroom(vport->dev, new_headroom);

	}

}



static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)

{
@@ -2551,7 +2556,8 @@ static int __init dp_init(void) 
{

	int err;



	BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > sizeof_field(struct sk_buff, cb));

	BUILD_BUG_ON(sizeof(struct ovs_skb_cb) >

		     sizeof_field(struct sk_buff, cb));



	pr_info("Open vSwitch switching datapath\n");

net/openvswitch/flow_table.c

+35 −35
Original line number Diff line number Diff line
@@ -111,12 +111,16 @@ static void flow_free(struct sw_flow *flow) 
	if (ovs_identifier_is_key(&flow->id))

		kfree(flow->id.unmasked_key);

	if (flow->sf_acts)

		ovs_nla_free_flow_actions((struct sw_flow_actions __force *)flow->sf_acts);

		ovs_nla_free_flow_actions((struct sw_flow_actions __force *)

					  flow->sf_acts);

	/* We open code this to make sure cpu 0 is always considered */

	for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask))

	for (cpu = 0; cpu < nr_cpu_ids;

	     cpu = cpumask_next(cpu, &flow->cpu_used_mask)) {

		if (flow->stats[cpu])

			kmem_cache_free(flow_stats_cache,

					(struct sw_flow_stats __force *)flow->stats[cpu]);

	}



	kmem_cache_free(flow_cache, flow);

}
@@ -164,7 +168,6 @@ static struct table_instance *table_instance_alloc(int new_size) 


	ti->n_buckets = new_size;

	ti->node_ver = 0;

	ti->keep_flows = false;

	get_random_bytes(&ti->hash_seed, sizeof(u32));



	return ti;
@@ -448,25 +451,22 @@ int ovs_flow_tbl_init(struct flow_table *table) 


static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu)

{

	struct table_instance *ti = container_of(rcu, struct table_instance, rcu);

	struct table_instance *ti;



	ti = container_of(rcu, struct table_instance, rcu);

	__table_instance_destroy(ti);

}



static void table_instance_flow_free(struct flow_table *table,

				     struct table_instance *ti,

				     struct table_instance *ufid_ti,

				  struct sw_flow *flow,

				  bool count)

				     struct sw_flow *flow)

{

	hlist_del_rcu(&flow->flow_table.node[ti->node_ver]);

	if (count)

	table->count--;



	if (ovs_identifier_is_ufid(&flow->id)) {

		hlist_del_rcu(&flow->ufid_table.node[ufid_ti->node_ver]);



		if (count)

		table->ufid_count--;

	}
@@ -480,22 +480,25 @@ void table_instance_flow_flush(struct flow_table *table, 
{

	int i;



	if (ti->keep_flows)

		return;



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

		struct sw_flow *flow;

		struct hlist_head *head = &ti->buckets[i];

		struct hlist_node *n;

		struct sw_flow *flow;



		hlist_for_each_entry_safe(flow, n, head,

					  flow_table.node[ti->node_ver]) {



			table_instance_flow_free(table, ti, ufid_ti,

						 flow, false);

						 flow);

			ovs_flow_free(flow, true);

		}

	}



	if (WARN_ON(table->count != 0 ||

		    table->ufid_count != 0)) {

		table->count = 0;

		table->ufid_count = 0;

	}

}



static void table_instance_destroy(struct table_instance *ti,
@@ -596,8 +599,6 @@ static void flow_table_copy_flows(struct table_instance *old, 
						 lockdep_ovsl_is_held())

				table_instance_insert(new, flow);

	}



	old->keep_flows = true;

}



static struct table_instance *table_instance_rehash(struct table_instance *ti,
@@ -632,8 +633,6 @@ int ovs_flow_tbl_flush(struct flow_table *flow_table) 
	rcu_assign_pointer(flow_table->ti, new_ti);

	rcu_assign_pointer(flow_table->ufid_ti, new_ufid_ti);

	flow_table->last_rehash = jiffies;

	flow_table->count = 0;

	flow_table->ufid_count = 0;



	table_instance_flow_flush(flow_table, old_ti, old_ufid_ti);

	table_instance_destroy(old_ti, old_ufid_ti);
@@ -897,7 +896,8 @@ static bool ovs_flow_cmp_ufid(const struct sw_flow *flow, 
	return !memcmp(flow->id.ufid, sfid->ufid, sfid->ufid_len);

}



bool ovs_flow_cmp(const struct sw_flow *flow, const struct sw_flow_match *match)

bool ovs_flow_cmp(const struct sw_flow *flow,

		  const struct sw_flow_match *match)

{

	if (ovs_identifier_is_ufid(&flow->id))

		return flow_cmp_masked_key(flow, match->key, &match->range);
@@ -950,7 +950,7 @@ void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow) 
	struct table_instance *ufid_ti = ovsl_dereference(table->ufid_ti);



	BUG_ON(table->count == 0);

	table_instance_flow_free(table, ti, ufid_ti, flow, true);

	table_instance_flow_free(table, ti, ufid_ti, flow);

}



static struct sw_flow_mask *mask_alloc(void)

net/openvswitch/flow_table.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct table_instance { 
	struct rcu_head rcu;

	int node_ver;

	u32 hash_seed;

	bool keep_flows;

};



struct flow_table {

net/openvswitch/vport.c

+4 −3
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ int ovs_vport_get_upcall_portids(const struct vport *vport, 
 *

 * Returns the portid of the target socket.  Must be called with rcu_read_lock.

 */

u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb)

u32 ovs_vport_find_upcall_portid(const struct vport *vport,

				 struct sk_buff *skb)

{

	struct vport_portids *ids;

	u32 ids_index;