From 8bc50076948b4ab677b405bd437317a5293e2db3 Mon Sep 17 00:00:00 2001 From: Yi-Hung Wei Date: Mon, 1 May 2017 10:24:34 -0700 Subject: [PATCH] datapath: Fix ovs_flow_key_update() Upstream commit: commit 6f56f6186c18e3fd54122b73da68e870687b8c59 Author: Yi-Hung Wei Date: Thu Mar 30 12:36:03 2017 -0700 ovs_flow_key_update() is called when the flow key is invalid, and it is used to update and revalidate the flow key. Commit 329f45bc4f19 ("openvswitch: add mac_proto field to the flow key") introduces mac_proto field to flow key and use it to determine whether the flow key is valid. However, the commit does not update the code path in ovs_flow_key_update() to revalidate the flow key which may cause BUG_ON() on execute_recirc(). This patch addresses the aforementioned issue. Fixes: 329f45bc4f19 ("openvswitch: add mac_proto field to the flow key") Signed-off-by: Yi-Hung Wei Acked-by: Jiri Benc Signed-off-by: David S. Miller Signed-off-by: Yi-Hung Wei Acked-by: Simon Horman Signed-off-by: Simon Horman --- datapath/flow.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index 1d40b2400..c4f63b0b5 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -531,7 +531,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) /* Link layer. */ clear_vlan(key); - if (key->mac_proto == MAC_PROTO_NONE) { + if (ovs_key_mac_proto(key) == MAC_PROTO_NONE) { if (unlikely(eth_type_vlan(skb->protocol))) return -EINVAL; @@ -751,7 +751,13 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key) { - return key_extract(skb, key); + int res; + + res = key_extract(skb, key); + if (!res) + key->mac_proto &= ~SW_FLOW_KEY_INVALID; + + return res; } static int key_extract_mac_proto(struct sk_buff *skb) -- 2.39.5