[ovs-git] [openvswitch/ovs] bfa683: ofproto-dpif-xlate: Fix revalidation in execute_co...

[GitHub]

  Branch: refs/heads/branch-2.3
  Home:   https://github.com/openvswitch/ovs
  Commit: bfa68329d48afd8399c392bdbd3bd8a417655067
      https://github.com/openvswitch/ovs/commit/bfa68329d48afd8399c392bdbd3bd8a417655067
  Author: Daniele Di Proietto <diproiettod at vmware.com>
  Date:   2015-12-11 (Fri, 11 Dec 2015)

  Changed paths:
    M ofproto/ofproto-dpif-xlate.c

  Log Message:
  -----------
  ofproto-dpif-xlate: Fix revalidation in execute_controller_action().

If there's no actual packet (e.g. during revalidation),
execute_controller_action() exits right away, without calling
commit_odp_actions().

commit_odp_actions() might have an influence on slow_path reason
(which is included in the generated ODP actions), meaning that the
revalidation will not generate the same actions than the original
translation.

Fix the problem by making execute_controller_action() call
commit_odp_actions() even without a packet.

Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>


  Commit: 9ff8360b2697236b7080976c3bf158ab43bc6e4d
      https://github.com/openvswitch/ovs/commit/9ff8360b2697236b7080976c3bf158ab43bc6e4d
  Author: Daniele Di Proietto <diproiettod at vmware.com>
  Date:   2015-12-14 (Mon, 14 Dec 2015)

  Changed paths:
    M lib/odp-util.c

  Log Message:
  -----------
  odp-util: Correctly [de]serialize mask for ND attributes.

When converting between ODP attributes and struct flow_wildcards, we
check that all the prerequisites are exact matched on the mask.

For ND(ICMPv6) attributes, an exact match on tp_src and tp_dst
(which in this context are the icmp type and code) shold look like
htons(0xff), not htons(0xffff).  Fix this in two places.

The consequences were that the ODP mask wouldn't include the ND
attributes and the flow would be deleted by the revalidation.

Signed-off-by: Daniele Di Proietto <diproiettod at vmware.com>
Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/58c9bc31c92c...9ff8360b2697