Merge ~fnordahl/ubuntu/+source/ovn:ubuntu/impish into ~ubuntu-server-dev/ubuntu/+source/ovn:ubuntu/impish

[Frode Nordahl]

Unmerged commits

76bee9e... by Frode Nordahl on 2022-07-05

Adapt to changes made in previous OVS point release

  - d/control: Update required openvswitch build requirement.
  - d/p/lp-1980213-treewide-bump-ovs-and-fix-problematic-loops.patch

Signed-off-by: Frode Nordahl <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 0fd75c7..c483f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
 ovn (21.09.0-0ubuntu2) UNRELEASED; urgency=medium
 
+  [ Frode Nordahl ]
+  * Adapt to changes made in previous OVS point release (LP: #1980212):
+    - d/control: Update required openvswitch build requirement.
+    - d/p/lp-1980212-treewide-bump-ovs-and-fix-problematic-loops.patch
+
+  [ James Page ]
   * d/p/deliver-multicast-traffic-to-localport-ports.patch: Cherry pick
-    potential fix for issue with metadata access with OpenStack (LP:
-    #1951841).
+    potential fix for issue with metadata access with OpenStack
+    (LP: #1951841).
 
- -- James Page <[e-mail]>  Mon, 29 Nov 2021 11:52:19 +0000
+ -- Frode Nordahl <[e-mail]  Tue, 05 Jul 2022 15:42:00 +0200
 
 ovn (21.09.0-0ubuntu1) impish; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3601c28..316ff9f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  libtool,
  libunbound-dev,
  openssl,
- openvswitch-source (>= 2.16.0-0ubuntu2~),
+ openvswitch-source (>= 2.16.4-0ubuntu1~),
  pkg-config,
  procps,
  python3-all-dev,
diff --git a/debian/patches/lp-1980212-treewide-bump-ovs-and-fix-problematic-loops.patch b/debian/patches/lp-1980212-treewide-bump-ovs-and-fix-problematic-loops.patch
new file mode 100644
index 0000000..043cd24
--- /dev/null
+++ b/debian/patches/lp-1980212-treewide-bump-ovs-and-fix-problematic-loops.patch
@@ -0,0 +1,262 @@
+Origin: backport, https://github.com/ovn-org/ovn/commit/996ed75db776c59098b6539d0c03d43977202885
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openvswitch/1980212
+Last-Update: 2022-07-05
+
+From 56fbcb2efb4d61ed95a2addba40d1f7d4652fffe Mon Sep 17 00:00:00 2001
+From: Adrian Moreno <[e-mail]>
+Date: Wed, 20 Apr 2022 07:55:35 +0200
+Subject: [PATCH] treewide: bump ovs and fix problematic loops
+
+The minimum changes to adapt to new ovs are:
+- adapt to changes made in inet_parse_active function by passing an
+  extra NULL argument
+
+- fix those places where next variable was being used inside *_SAFE
+  iterators since. Now the next variable might not always be safe to use
+  so extra checks are needed.
+
+Signed-off-by: Adrian Moreno <[e-mail]>
+Acked-by: Dumitru Ceara <[e-mail]>
+Signed-off-by: Mark Michelson <[e-mail]>
+(cherry picked from commit 996ed75db776c59098b6539d0c03d43977202885)
+---
+ .gitmodules           |  3 ---
+ controller/ofctrl.c   |  7 ++++++-
+ lib/actions.c         |  2 +-
+ lib/expr.c            | 33 +++++++++++++++++++--------------
+ lib/ovn-util.c        |  2 +-
+ ovs                   |  1 -
+ utilities/ovn-nbctl.c |  6 +++---
+ utilities/ovn-trace.c |  8 +++++---
+ 8 files changed, 35 insertions(+), 27 deletions(-)
+ delete mode 160000 ovs
+
+diff --git a/controller/ofctrl.c b/controller/ofctrl.c
+index 08fcfed8b..d0c15c1ac 100644
+--- a/controller/ofctrl.c
++++ b/controller/ofctrl.c
+@@ -899,7 +899,12 @@ link_installed_to_desired(struct installed_flow *i, struct desired_flow *d)
+             break;
+         }
+     }
+-    ovs_list_insert(&f->installed_ref_list_node, &d->installed_ref_list_node);
++    if (!f) {
++        ovs_list_insert(&i->desired_refs, &d->installed_ref_list_node);
++    } else {
++        ovs_list_insert(&f->installed_ref_list_node,
++                        &d->installed_ref_list_node);
++    }
+     d->installed_flow = i;
+     return installed_flow_get_active(i) == d;
+ }
+diff --git a/lib/actions.c b/lib/actions.c
+index 7cf6be308..f61f6cd50 100644
+--- a/lib/actions.c
++++ b/lib/actions.c
+@@ -2291,7 +2291,7 @@ validate_empty_lb_backends(struct action_context *ctx,
+ 
+         switch (o->option->code) {
+         case EMPTY_LB_VIP:
+-            if (!inet_parse_active(c->string, 0, &ss, false)) {
++            if (!inet_parse_active(c->string, 0, &ss, false, NULL)) {
+                 lexer_error(ctx->lexer, "Invalid load balancer VIP '%s'",
+                             c->string);
+                 return;
+diff --git a/lib/expr.c b/lib/expr.c
+index e3f6bb892..30ed25c6e 100644
+--- a/lib/expr.c
++++ b/lib/expr.c
+@@ -203,16 +203,17 @@ expr_combine(enum expr_type type, struct expr *a, struct expr *b)
+ }
+ 
+ static void
+-expr_insert_andor(struct expr *andor, struct expr *before, struct expr *new)
++expr_insert_andor(struct expr *andor, struct ovs_list *before,
++                  struct expr *new)
+ {
+     if (new->type == andor->type) {
+         if (andor->type == EXPR_T_AND) {
+             /* Conjunction junction, what's your function? */
+         }
+-        ovs_list_splice(&before->node, new->andor.next, &new->andor);
+-        free(new);
++        ovs_list_splice(before, new->andor.next, &new->andor);
++        expr_destroy(new);
+     } else {
+-        ovs_list_insert(&before->node, &new->node);
++        ovs_list_insert(before, &new->node);
+     }
+ }
+ 
+@@ -1955,7 +1956,8 @@ expr_annotate__(struct expr *expr, const struct shash *symtab,
+                 expr_destroy(expr);
+                 return NULL;
+             }
+-            expr_insert_andor(expr, next, new_sub);
++            expr_insert_andor(expr, next ? &next->node : &expr->andor,
++                              new_sub);
+         }
+         *errorp = NULL;
+         return expr;
+@@ -2155,7 +2157,7 @@ expr_evaluate_condition(struct expr *expr,
+             struct expr *e = expr_evaluate_condition(sub, is_chassis_resident,
+                                                      c_aux);
+             e = expr_fix(e);
+-            expr_insert_andor(expr, next, e);
++            expr_insert_andor(expr, next ? &next->node : &expr->andor, e);
+         }
+         return expr_fix(expr);
+ 
+@@ -2188,7 +2190,8 @@ expr_simplify(struct expr *expr)
+     case EXPR_T_OR:
+         LIST_FOR_EACH_SAFE (sub, next, node, &expr->andor) {
+             ovs_list_remove(&sub->node);
+-            expr_insert_andor(expr, next, expr_simplify(sub));
++            expr_insert_andor(expr, next ? &next->node : &expr->andor,
++                              expr_simplify(sub));
+         }
+         return expr_fix(expr);
+ 
+@@ -2298,12 +2301,13 @@ crush_and_string(struct expr *expr, const struct expr_symbol *symbol)
+      * EXPR_T_OR with EXPR_T_CMP subexpressions. */
+     struct expr *sub, *next = NULL;
+     LIST_FOR_EACH_SAFE (sub, next, node, &expr->andor) {
++        struct ovs_list *next_list = next ? &next->node : &expr->andor;
+         ovs_list_remove(&sub->node);
+         struct expr *new = crush_cmps(sub, symbol);
+         switch (new->type) {
+         case EXPR_T_CMP:
+             if (!singleton) {
+-                ovs_list_insert(&next->node, &new->node);
++                ovs_list_insert(next_list, &new->node);
+                 singleton = new;
+             } else {
+                 bool match = !strcmp(new->cmp.string, singleton->cmp.string);
+@@ -2317,7 +2321,7 @@ crush_and_string(struct expr *expr, const struct expr_symbol *symbol)
+         case EXPR_T_AND:
+             OVS_NOT_REACHED();
+         case EXPR_T_OR:
+-            ovs_list_insert(&next->node, &new->node);
++            ovs_list_insert(next_list, &new->node);
+             break;
+         case EXPR_T_BOOLEAN:
+             if (!new->boolean) {
+@@ -2413,7 +2417,7 @@ crush_and_numeric(struct expr *expr, const struct expr_symbol *symbol)
+         case EXPR_T_AND:
+             OVS_NOT_REACHED();
+         case EXPR_T_OR:
+-            ovs_list_insert(&next->node, &new->node);
++            ovs_list_insert(next ? &next->node : &expr->andor, &new->node);
+             break;
+         case EXPR_T_BOOLEAN:
+             if (!new->boolean) {
+@@ -2579,7 +2583,8 @@ crush_or(struct expr *expr, const struct expr_symbol *symbol)
+      * is now a disjunction of cmps over the same symbol. */
+     LIST_FOR_EACH_SAFE (sub, next, node, &expr->andor) {
+         ovs_list_remove(&sub->node);
+-        expr_insert_andor(expr, next, crush_cmps(sub, symbol));
++        expr_insert_andor(expr, next ? &next->node : &expr->andor,
++                          crush_cmps(sub, symbol));
+     }
+     expr = expr_fix(expr);
+     if (expr->type != EXPR_T_OR) {
+@@ -2737,8 +2742,7 @@ expr_normalize_and(struct expr *expr)
+ 
+     struct expr *a, *b;
+     LIST_FOR_EACH_SAFE (a, b, node, &expr->andor) {
+-        if (&b->node == &expr->andor
+-            || a->type != EXPR_T_CMP || b->type != EXPR_T_CMP
++        if (!b || a->type != EXPR_T_CMP || b->type != EXPR_T_CMP
+             || a->cmp.symbol != b->cmp.symbol) {
+             continue;
+         } else if (a->cmp.symbol->width
+@@ -2815,7 +2819,8 @@ expr_normalize_or(struct expr *expr)
+                 }
+                 free(new);
+             } else {
+-                expr_insert_andor(expr, next, new);
++                expr_insert_andor(expr, next ? &next->node : &expr->andor,
++                                  new);
+             }
+         } else {
+             ovs_assert(sub->type == EXPR_T_CMP ||
+diff --git a/lib/ovn-util.c b/lib/ovn-util.c
+index 683ca37d9..ab55f5d8e 100644
+--- a/lib/ovn-util.c
++++ b/lib/ovn-util.c
+@@ -746,7 +746,7 @@ ip_address_and_port_from_lb_key(const char *key, char **ip_address,
+                                 uint16_t *port, int *addr_family)
+ {
+     struct sockaddr_storage ss;
+-    if (!inet_parse_active(key, 0, &ss, false)) {
++    if (!inet_parse_active(key, 0, &ss, false, NULL)) {
+         static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);
+         VLOG_WARN_RL(&rl, "bad ip address or port for load balancer key %s",
+                      key);
+diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
+index e34bb65f7..ccbf72c2d 100644
+--- a/utilities/ovn-nbctl.c
++++ b/utilities/ovn-nbctl.c
+@@ -2794,7 +2794,7 @@ nbctl_lb_add(struct ctl_context *ctx)
+     }
+ 
+     struct sockaddr_storage ss_vip;
+-    if (!inet_parse_active(lb_vip, 0, &ss_vip, false)) {
++    if (!inet_parse_active(lb_vip, 0, &ss_vip, false, NULL)) {
+         ctl_error(ctx, "%s: should be an IP address (or an IP address "
+                   "and a port number with : as a separator).", lb_vip);
+         return;
+@@ -2824,7 +2824,7 @@ nbctl_lb_add(struct ctl_context *ctx)
+         struct sockaddr_storage ss_dst;
+ 
+         if (lb_vip_port) {
+-            if (!inet_parse_active(token, -1, &ss_dst, false)) {
++            if (!inet_parse_active(token, -1, &ss_dst, false, NULL)) {
+                 ctl_error(ctx, "%s: should be an IP address and a port "
+                           "number with : as a separator.", token);
+                 goto out;
+@@ -2970,7 +2970,7 @@ lb_info_add_smap(const struct nbrec_load_balancer *lb,
+             const struct smap_node *node = nodes[i];
+ 
+             struct sockaddr_storage ss;
+-            if (!inet_parse_active(node->key, 0, &ss, false)) {
++            if (!inet_parse_active(node->key, 0, &ss, false, NULL)) {
+                 continue;
+             }
+ 
+diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c
+index 5d016b757..b6c6e9770 100644
+--- a/utilities/ovn-trace.c
++++ b/utilities/ovn-trace.c
+@@ -203,7 +203,7 @@ static void
+ parse_lb_option(const char *s)
+ {
+     struct sockaddr_storage ss;
+-    if (!inet_parse_active(s, 0, &ss, false)) {
++    if (!inet_parse_active(s, 0, &ss, false, NULL)) {
+         ovs_fatal(0, "%s: bad address", s);
+     }
+ 
+@@ -1377,7 +1377,8 @@ ovntrace_node_prune_summary(struct ovs_list *nodes)
+             sub->type == OVNTRACE_NODE_TABLE) {
+             /* Replace 'sub' by its children, if any, */
+             ovs_list_remove(&sub->node);
+-            ovs_list_splice(&next->node, sub->subs.next, &sub->subs);
++            ovs_list_splice(next ? &next->node : nodes, sub->subs.next,
++                            &sub->subs);
+             ovntrace_node_destroy(sub);
+         }
+     }
+@@ -1421,7 +1422,8 @@ ovntrace_node_prune_hard(struct ovs_list *nodes)
+             sub->type == OVNTRACE_NODE_OUTPUT) {
+             /* Replace 'sub' by its children, if any, */
+             ovs_list_remove(&sub->node);
+-            ovs_list_splice(&next->node, sub->subs.next, &sub->subs);
++            ovs_list_splice(next ? &next->node : nodes, sub->subs.next,
++                            &sub->subs);
+             ovntrace_node_destroy(sub);
+         }
+     }
+-- 
+2.36.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ee7887a..3bf2264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 deliver-multicast-traffic-to-localport-ports.patch
+lp-1980213-treewide-bump-ovs-and-fix-problematic-loops.patch