Acked-by: Yi-Hung Wei <[email protected]> Actually, this patch has been backported in the MPLS GSO fix series as in here: https://patchwork.ozlabs.org/patch/746674/
-Yi-Hung On Wed, Apr 19, 2017 at 2:35 PM, Jarno Rajahalme <[email protected]> wrote: > From: Yi-Hung Wei <[email protected]> > > Upstream commit: > > commit 6f56f6186c18e3fd54122b73da68e870687b8c59 > Author: Yi-Hung Wei <[email protected]> > Date: Thu Mar 30 12:36:03 2017 -0700 > > openvswitch: Fix ovs_flow_key_update() > > 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 <[email protected]> > Acked-by: Jiri Benc <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > > Signed-off-by: Jarno Rajahalme <[email protected]> > --- > datapath/flow.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/datapath/flow.c b/datapath/flow.c > index 2bc1ad0..39cac25 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; > > @@ -756,7 +756,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.1.4 > _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
