X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=d607315edbc23f13c03021be31e976d3ed5f3a20;hb=045b2e5c77d02cd0d7bba046e2dbed72ec4828c8;hp=fc00d78788a567c35a77d5505bc2ab699b726c6e;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=openvswitch

diff --git a/datapath/datapath.c b/datapath/datapath.c
index fc00d787..d607315e 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -273,10 +273,11 @@ void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
 	if (!OVS_CB(skb)->flow) {
 		struct sw_flow_key key;
 		struct tbl_node *flow_node;
+		int key_len;
 		bool is_frag;
 
 		/* Extract flow from 'skb' into 'key'. */
-		error = flow_extract(skb, p->port_no, &key, &is_frag);
+		error = flow_extract(skb, p->port_no, &key, &key_len, &is_frag);
 		if (unlikely(error)) {
 			kfree_skb(skb);
 			return;
@@ -289,8 +290,8 @@ void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
 		}
 
 		/* Look up flow. */
-		flow_node = tbl_lookup(rcu_dereference(dp->table), &key,
-					flow_hash(&key), flow_cmp);
+		flow_node = tbl_lookup(rcu_dereference(dp->table), &key, key_len,
+				       flow_hash(&key, key_len), flow_cmp);
 		if (unlikely(!flow_node)) {
 			struct dp_upcall_info upcall;
 
@@ -651,9 +652,11 @@ static int odp_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 	bool is_frag;
 	int len;
 	int err;
+	int key_len;
 
 	err = -EINVAL;
-	if (!a[ODP_PACKET_ATTR_PACKET] || !a[ODP_PACKET_ATTR_ACTIONS] ||
+	if (!a[ODP_PACKET_ATTR_PACKET] || !a[ODP_PACKET_ATTR_KEY] ||
+	    !a[ODP_PACKET_ATTR_ACTIONS] ||
 	    nla_len(a[ODP_PACKET_ATTR_PACKET]) < ETH_HLEN)
 		goto err;
 
@@ -687,10 +690,16 @@ static int odp_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 	if (IS_ERR(flow))
 		goto err_kfree_skb;
 
-	err = flow_extract(packet, -1, &flow->key, &is_frag);
+	err = flow_extract(packet, -1, &flow->key, &key_len, &is_frag);
+	if (err)
+		goto err_flow_put;
+	flow->tbl_node.hash = flow_hash(&flow->key, key_len);
+
+	err = flow_metadata_from_nlattrs(&flow->key.eth.in_port,
+					 &flow->key.eth.tun_id,
+					 a[ODP_PACKET_ATTR_KEY]);
 	if (err)
 		goto err_flow_put;
-	flow->tbl_node.hash = flow_hash(&flow->key);
 
 	acts = flow_actions_alloc(a[ODP_PACKET_ATTR_ACTIONS]);
 	err = PTR_ERR(acts);
@@ -723,6 +732,7 @@ err:
 
 static const struct nla_policy packet_policy[ODP_PACKET_ATTR_MAX + 1] = {
 	[ODP_PACKET_ATTR_PACKET] = { .type = NLA_UNSPEC },
+	[ODP_PACKET_ATTR_KEY] = { .type = NLA_NESTED },
 	[ODP_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
 };
 
@@ -935,12 +945,13 @@ static int odp_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
 	struct tbl *table;
 	u32 hash;
 	int error;
+	int key_len;
 
 	/* Extract key. */
 	error = -EINVAL;
 	if (!a[ODP_FLOW_ATTR_KEY])
 		goto error;
-	error = flow_from_nlattrs(&key, a[ODP_FLOW_ATTR_KEY]);
+	error = flow_from_nlattrs(&key, &key_len, a[ODP_FLOW_ATTR_KEY]);
 	if (error)
 		goto error;
 
@@ -959,9 +970,9 @@ static int odp_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
 	if (!dp)
 		goto error;
 
-	hash = flow_hash(&key);
+	hash = flow_hash(&key, key_len);
 	table = get_table_protected(dp);
-	flow_node = tbl_lookup(table, &key, hash, flow_cmp);
+	flow_node = tbl_lookup(table, &key, key_len, hash, flow_cmp);
 	if (!flow_node) {
 		struct sw_flow_actions *acts;
 
@@ -1071,10 +1082,11 @@ static int odp_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
 	struct datapath *dp;
 	struct tbl *table;
 	int err;
+	int key_len;
 
 	if (!a[ODP_FLOW_ATTR_KEY])
 		return -EINVAL;
-	err = flow_from_nlattrs(&key, a[ODP_FLOW_ATTR_KEY]);
+	err = flow_from_nlattrs(&key, &key_len, a[ODP_FLOW_ATTR_KEY]);
 	if (err)
 		return err;
 
@@ -1083,7 +1095,8 @@ static int odp_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
 		return -ENODEV;
 
 	table = get_table_protected(dp);
-	flow_node = tbl_lookup(table, &key, flow_hash(&key), flow_cmp);
+	flow_node = tbl_lookup(table, &key, key_len, flow_hash(&key, key_len),
+			       flow_cmp);
 	if (!flow_node)
 		return -ENOENT;
 
@@ -1106,10 +1119,11 @@ static int odp_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
 	struct datapath *dp;
 	struct tbl *table;
 	int err;
+	int key_len;
 
 	if (!a[ODP_FLOW_ATTR_KEY])
 		return flush_flows(odp_header->dp_ifindex);
-	err = flow_from_nlattrs(&key, a[ODP_FLOW_ATTR_KEY]);
+	err = flow_from_nlattrs(&key, &key_len, a[ODP_FLOW_ATTR_KEY]);
 	if (err)
 		return err;
 
@@ -1118,7 +1132,8 @@ static int odp_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
  		return -ENODEV;
 
 	table = get_table_protected(dp);
-	flow_node = tbl_lookup(table, &key, flow_hash(&key), flow_cmp);
+	flow_node = tbl_lookup(table, &key, key_len, flow_hash(&key, key_len),
+			       flow_cmp);
 	if (!flow_node)
 		return -ENOENT;
 	flow = flow_cast(flow_node);
@@ -1897,7 +1912,9 @@ static int odp_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
 	if (IS_ERR(reply))
 		goto exit_unlock;
 
-	err = genlmsg_reply(reply, info);
+	rcu_read_unlock();
+
+	return genlmsg_reply(reply, info);
 
 exit_unlock:
 	rcu_read_unlock();