Merge ~chris.macnaughton/ubuntu/+source/openvswitch:ubuntu/cosmic into ~ubuntu-server-dev/ubuntu/+source/openvswitch:ubuntu/cosmic

[Chris MacNaughton]

[Chris MacNaughton (chris.macnaughton)]

I have built this package for the Rocky cloud archive in https://launchpad.net/~chris.macnaughton/+archive/ubuntu/bionic-rocky/+packages

diff --git a/debian/changelog b/debian/changelog
index 6a7a2b8..09af28e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+openvswitch (2.10.0-0ubuntu3~cloud0) bionic-rocky; urgency=medium
+
+  * Don't send comms to remote connections still establishing
+    which protocol to use (LP: #1923668)
+    - d/p/0001-connmgr-Fix-vswitchd-abort-when-a-port-is-modified.patch:
+      check connection status of remote connection before processing
+      asynchronous message.
+    - d/p/0002-connmgr-Do-not-send-asynchronous-messages-to-rconns.patch:
+      check if openflow protocol has been determined before processing
+      asynchronous message.
+
+ -- Billy Olsen <[e-mail]>  Sun, 18 Apr 2021 19:43:18 -0700
+
+openvswitch (2.10.0-0ubuntu2~cloud0) bionic-rocky; urgency=medium
+
+  * New upstream release for the Ubuntu Cloud Archive.
+
+ -- Openstack Ubuntu Testing Bot <[e-mail]>  Thu, 30 Aug 2018 13:29:30 +0000
+
 openvswitch (2.10.0-0ubuntu2) cosmic; urgency=medium
 
   * d/{openvswitch-switch,ovn-common}.install: Add missed scripts and
diff --git a/debian/patches/0001-connmgr-Fix-vswitchd-abort-when-a-port-is-modified.patch b/debian/patches/0001-connmgr-Fix-vswitchd-abort-when-a-port-is-modified.patch
new file mode 100644
index 0000000..38ca517
--- /dev/null
+++ b/debian/patches/0001-connmgr-Fix-vswitchd-abort-when-a-port-is-modified.patch
@@ -0,0 +1,93 @@
+From 903f6c4f8a9bce51984435ca3990f2717c63f703 Mon Sep 17 00:00:00 2001
+From: Numan Siddique <[e-mail]>
+Date: Thu, 18 Oct 2018 16:47:05 +0530
+Subject: [PATCH] connmgr: Fix vswitchd abort when a port is added and the
+ controller is down
+
+We see the below trace when a port is added to a bridge and the configured
+controller is down
+
+0x00007fb002f8b207 in raise () from /lib64/libc.so.6
+0x00007fb002f8c8f8 in abort () from /lib64/libc.so.6
+0x00007fb004953026 in ofputil_protocol_to_ofp_version () from /lib64/libopenvswitch-2.10.so.0
+0x00007fb00494e38e in ofputil_encode_port_status () from /lib64/libopenvswitch-2.10.so.0
+0x00007fb004ef1c5b in connmgr_send_port_status () from /lib64/libofproto-2.10.so.0
+0x00007fb004efa9f4 in ofport_install () from /lib64/libofproto-2.10.so.0
+0x00007fb004efbfb2 in update_port () from /lib64/libofproto-2.10.so.0
+0x00007fb004efc7f9 in ofproto_port_add () from /lib64/libofproto-2.10.so.0
+0x0000556d540a3f95 in bridge_add_ports__ ()
+0x0000556d540a5a47 in bridge_reconfigure ()
+0x0000556d540a9199 in bridge_run ()
+0x0000556d540a02a5 in main ()
+
+The abort is because of ofputil_protocol_to_ofp_version() is called with invalid
+protocol - OFPUTIL_P_NONE. Please see [1] for more details. Similar aborts are
+seen as reported in [2].
+
+The commit [3] changed the behavior of the function rconn_get_version().
+Before the commit [3], the function ofconn_receives_async_msg() would always
+return false if the connection to the controller was down, since
+rconn_get_version() used to return -1. This patch now checks the rconn
+connection status in ofconn_receives_async_msg() and returns false if not
+connected. This would avoid the aborts seen in the above stack trace.
+
+The issue can be reproduced by running the test added in this patch
+without the fix.
+
+[1] - https://bugzilla.redhat.com/show_bug.cgi?id=1640045
+[2] - https://bugzilla.redhat.com/show_bug.cgi?id=1637926
+
+[3] - 476d2551ab ("rconn: Introduce new invariant to fix assertion failure in corner case.")
+
+Signed-off-by: Numan Siddique <[e-mail]>
+Signed-off-by: Ben Pfaff <[e-mail]>
+Acked-by: Eelco Chaudron <[e-mail]>
+---
+ ofproto/connmgr.c |  4 ++++
+ tests/bridge.at   | 21 +++++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
+index 50e0b8f991b..94312002499 100644
+--- a/ofproto/connmgr.c
++++ b/ofproto/connmgr.c
+@@ -1538,6 +1538,10 @@ ofconn_receives_async_msg(const struct ofconn *ofconn,
+     ovs_assert(reason < 32);
+     ovs_assert((unsigned int) type < OAM_N_TYPES);
+ 
++    if (!rconn_is_connected(ofconn->rconn)) {
++        return false;
++    }
++
+     /* Keep the following code in sync with the documentation in the
+      * "Asynchronous Messages" section in 'topics/design' */
+ 
+diff --git a/tests/bridge.at b/tests/bridge.at
+index 1c361856329..ee398bdb1e1 100644
+--- a/tests/bridge.at
++++ b/tests/bridge.at
+@@ -79,3 +79,24 @@ AT_CHECK([ovs-vsctl --columns=status list controller | dnl
+ OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])
+ OVS_APP_EXIT_AND_WAIT([ovsdb-server])
+ AT_CLEANUP
++
++AT_SETUP([bridge - add port after stopping controller])
++OVS_VSWITCHD_START
++
++dnl Start ovs-testcontroller
++ovs-testcontroller --detach punix:controller --pidfile=ovs-testcontroller.pid
++OVS_WAIT_UNTIL([test -e controller])
++
++AT_CHECK([ovs-vsctl set-controller br0 unix:controller])
++AT_CHECK([ovs-vsctl add-port br0 p1 -- set Interface p1 type=internal], [0], [ignore])
++AT_CHECK([ovs-appctl -t ovs-vswitchd version], [0], [ignore])
++
++# Now kill the ovs-testcontroller
++kill `cat ovs-testcontroller.pid`
++OVS_WAIT_UNTIL([! test -e controller])
++AT_CHECK([ovs-vsctl --no-wait add-port br0 p2 -- set Interface p2 type=internal], [0], [ignore])
++AT_CHECK([ovs-appctl -t ovs-vswitchd version], [0], [ignore])
++
++OVS_APP_EXIT_AND_WAIT([ovs-vswitchd])
++OVS_APP_EXIT_AND_WAIT([ovsdb-server])
++AT_CLEANUP
diff --git a/debian/patches/0002-connmgr-Do-not-send-asynchronous-messages-to-rconns.patch b/debian/patches/0002-connmgr-Do-not-send-asynchronous-messages-to-rconns.patch
new file mode 100644
index 0000000..2e8b006
--- /dev/null
+++ b/debian/patches/0002-connmgr-Do-not-send-asynchronous-messages-to-rconns.patch
@@ -0,0 +1,36 @@
+From 30e699b7ec43cc70d0d20f0969a2714bfb78c7c8 Mon Sep 17 00:00:00 2001
+From: Ben Pfaff <[e-mail]>
+Date: Wed, 12 Dec 2018 12:28:34 -0800
+Subject: [PATCH] connmgr: Do not send asynchronous messages to rconns lacking
+ protocols.
+
+There are corner cases in which an rconn might not have a defined OpenFlow
+protocol or version.  These happen at connection startup, before the
+protocol version has been negotiated, and can also happen when a connection
+is being shut down.  It's desirable to avoid these situations entirely,
+but so far we haven't managed to do this.  This commit avoids trying to
+send messages to such connection, which is what really tends to get OVS in
+trouble since there's no way to construct an OpenFlow message without
+knowing what version of OpenFlow to use (with a few exceptions that don't
+matter here).
+
+Reported-at: https://mail.openvswitch.org/pipermail/ovs-discuss/2018-December/047876.html
+Reported-by: Josh Bailey <[e-mail]>
+Signed-off-by: Ben Pfaff <[e-mail]>
+---
+ ofproto/connmgr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
+index a3f49a8ef2b..684f77c398a 100644
+--- a/ofproto/connmgr.c
++++ b/ofproto/connmgr.c
+@@ -1517,7 +1517,7 @@ ofconn_receives_async_msg(const struct ofconn *ofconn,
+     ovs_assert(reason < 32);
+     ovs_assert((unsigned int) type < OAM_N_TYPES);
+ 
+-    if (!rconn_is_connected(ofconn->rconn)) {
++    if (!rconn_is_connected(ofconn->rconn) || !ofconn_get_protocol(ofconn)) {
+         return false;
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9301bd1..a122b97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 py3-compat.patch
 erspan-add-big-endian-bit-fields.patch
 tests-Fix-hash-function-dependencies-in-tunnel-ERSPA.patch
+0001-connmgr-Fix-vswitchd-abort-when-a-port-is-modified.patch
+0002-connmgr-Do-not-send-asynchronous-messages-to-rconns.patch