[ovs-git] [openvswitch/ovs] 25010c: ofproto: Don't use connmgr after destruction.

GitHub noreply at github.com
Tue Sep 13 22:43:34 UTC 2016


  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 25010c68dbcac5f31a53821b0b0ebd9202698a5d
      https://github.com/openvswitch/ovs/commit/25010c68dbcac5f31a53821b0b0ebd9202698a5d
  Author: Jarno Rajahalme <jarno at ovn.org>
  Date:   2016-09-13 (Tue, 13 Sep 2016)

  Changed paths:
    M ofproto/connmgr.c
    M ofproto/connmgr.h
    M ofproto/fail-open.c
    M ofproto/fail-open.h
    M ofproto/in-band.c
    M ofproto/ofproto-provider.h
    M ofproto/ofproto.c
    M ofproto/ofproto.h

  Log Message:
  -----------
  ofproto: Don't use connmgr after destruction.

Set ofproto's connmgr pointer to NULL after the connmgr has been
destructed, and check for NULL when sending a flow removed
notification.

Verified by sending the flow removed message unconditionally and
observing numerous core dumps in the test suite.

Found by inspection.

Fixes: f695ebfae5 ("ofproto: Postpone sending flow removed messages.")
Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: 68030e16f6b8f91c5e3da676797d4c3dcc498b2d
      https://github.com/openvswitch/ovs/commit/68030e16f6b8f91c5e3da676797d4c3dcc498b2d
  Author: Jarno Rajahalme <jarno at ovn.org>
  Date:   2016-09-13 (Tue, 13 Sep 2016)

  Changed paths:
    M tests/ofp-print.at
    M tests/ofproto.at

  Log Message:
  -----------
  tests: Keyword fixes.

Add "bundle" keyword to ofp-print.at tests about bundle messages.
Add a missing ofp-print.at test for bundle group mods.
Remove "monitor" keyword from ofproto.at tests that do not use a monitor.

Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: 51bb26fae190519451b1e95569d7425bef7fec84
      https://github.com/openvswitch/ovs/commit/51bb26fae190519451b1e95569d7425bef7fec84
  Author: Jarno Rajahalme <jarno at ovn.org>
  Date:   2016-09-13 (Tue, 13 Sep 2016)

  Changed paths:
    M NEWS
    M ofproto/bundles.c
    M ofproto/bundles.h
    M ofproto/connmgr.c
    M ofproto/ofproto.c
    M tests/ofproto.at
    M vswitchd/ovs-vswitchd.8.in

  Log Message:
  -----------
  ofproto: Add a fixed bundle idle timeout of 10 seconds.

Timing out idle bundles frees memory that would effectively be leaked
if a long standing OpenFlow connection would fail to commit or discard
a bundle.

OpenFlow specification mandates the timeout to be at least one second,
if the switch implements such a timeout.  This patch makes the bundle
idle timeout to be 10 seconds.

We do not limit the number of messages in a bundle, so it does not
make sense to limit the number of bundles either, especially now that
idle bundles are timed out.

Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: 30d0452c5e35f0d01cc3969c0f00c2eaf0fb5503
      https://github.com/openvswitch/ovs/commit/30d0452c5e35f0d01cc3969c0f00c2eaf0fb5503
  Author: Jarno Rajahalme <jarno at ovn.org>
  Date:   2016-09-13 (Tue, 13 Sep 2016)

  Changed paths:
    M ofproto/ofproto-provider.h
    M ofproto/ofproto.c

  Log Message:
  -----------
  ofproto: Change rule's 'removed' member to a tri-state 'state'.

As a rule may not be re-inserted to ofproto data structures, it is
cleaner to have three states for the rule, rather than just two.  This
will be useful for managing learned flows in later patches.

Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


  Commit: b9320e5120c930139462db7a95dabf840b497aa1
      https://github.com/openvswitch/ovs/commit/b9320e5120c930139462db7a95dabf840b497aa1
  Author: Jarno Rajahalme <jarno at ovn.org>
  Date:   2016-09-13 (Tue, 13 Sep 2016)

  Changed paths:
    M ofproto/connmgr.c
    M ofproto/ofproto-dpif.c
    M ofproto/ofproto-dpif.h

  Log Message:
  -----------
  connmgr: Make connmgr_wants_packet_in_on_miss() lock-free.

Make connmgr_wants_packet_in_on_miss() use an atomic int instead of a
list traversal taking the 'ofproto_mutex'.  This allows
connmgr_wants_packet_in_on_miss() to be called also when
'ofproto_mutex' is already held, and makes it faster, too.

Remove unused ofproto_dpif_wants_packet_in_on_miss().

Signed-off-by: Jarno Rajahalme <jarno at ovn.org>
Acked-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/7c127f28a873...b9320e5120c9


More information about the git mailing list