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

Commit 5bb50632 authored by Andy Zhou's avatar Andy Zhou Committed by Jesse Gross
Browse files

openvswitch: Change ovs_flow_tbl_lookup_xx() APIs 



API changes only for code readability. No functional chnages.

This patch removes the underscored version. Added a new API
ovs_flow_tbl_lookup_stats() that returns the n_mask_hits.

Reported by: Ben Pfaff <blp@nicira.com>
Reviewed-by: default avatarThomas Graf <tgraf@redhat.com>
Signed-off-by: default avatarAndy Zhou <azhou@nicira.com>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 8f49ce11

net/openvswitch/datapath.c

+4 −12
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb) 
	}



	/* Look up flow. */

	flow = ovs_flow_tbl_lookup(&dp->table, &key, &n_mask_hit);

	flow = ovs_flow_tbl_lookup_stats(&dp->table, &key, &n_mask_hit);

	if (unlikely(!flow)) {

		struct dp_upcall_info upcall;
@@ -751,14 +751,6 @@ static struct sk_buff *ovs_flow_cmd_build_info(struct sw_flow *flow, 
	return skb;

}



static struct sw_flow *__ovs_flow_tbl_lookup(struct flow_table *tbl,

					      const struct sw_flow_key *key)

{

	u32 __always_unused n_mask_hit;



	return ovs_flow_tbl_lookup(tbl, key, &n_mask_hit);

}



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

{

	struct nlattr **a = info->attrs;
@@ -809,7 +801,7 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info) 
		goto err_unlock_ovs;



	/* Check if this is a duplicate flow */

	flow = __ovs_flow_tbl_lookup(&dp->table, &key);

	flow = ovs_flow_tbl_lookup(&dp->table, &key);

	if (!flow) {

		/* Bail out if we're not allowed to create a new flow. */

		error = -ENOENT;
@@ -921,7 +913,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info) 
		goto unlock;

	}



	flow = __ovs_flow_tbl_lookup(&dp->table, &key);

	flow = ovs_flow_tbl_lookup(&dp->table, &key);

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

		err = -ENOENT;

		goto unlock;
@@ -969,7 +961,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) 
	if (err)

		goto unlock;



	flow = __ovs_flow_tbl_lookup(&dp->table, &key);

	flow = ovs_flow_tbl_lookup(&dp->table, &key);

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

		err = -ENOENT;

		goto unlock;

net/openvswitch/flow_table.c

+9 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti, 
	return NULL;

}



struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,

struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,

				    const struct sw_flow_key *key,

				    u32 *n_mask_hit)

{
@@ -447,6 +447,14 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl, 
	return NULL;

}



struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,

				    const struct sw_flow_key *key)

{

	u32 __always_unused n_mask_hit;



	return ovs_flow_tbl_lookup_stats(tbl, key, &n_mask_hit);

}



int ovs_flow_tbl_num_masks(const struct flow_table *table)

{

	struct sw_flow_mask *mask;

net/openvswitch/flow_table.h

+3 −1
Original line number Diff line number Diff line
@@ -69,9 +69,11 @@ void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow); 
int  ovs_flow_tbl_num_masks(const struct flow_table *table);

struct sw_flow *ovs_flow_tbl_dump_next(struct table_instance *table,

				       u32 *bucket, u32 *idx);

struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,

struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *,

				    const struct sw_flow_key *,

				    u32 *n_mask_hit);

struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *,

				    const struct sw_flow_key *);



bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow,

			       struct sw_flow_match *match);