From 7cf2f5089aa8e9a4aed158fd8b15a66d55f4e7ab Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Sep 20 2024 20:03:11 +0000
Subject: Import openvswitch3.2-3.2.0-101 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index cc0c6c8..d1b82e1 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -4921,6 +4921,19 @@ index b092e9e04e..f7f7b12799 100644
  
      VLOG_INFO("%s: added %s controller \"%s\"",
                mgr->name, ofconn_type_to_string(ofservice->type), target);
+diff --git a/ofproto/ofproto-dpif-mirror.c b/ofproto/ofproto-dpif-mirror.c
+index 343b75f0ed..45024580aa 100644
+--- a/ofproto/ofproto-dpif-mirror.c
++++ b/ofproto/ofproto-dpif-mirror.c
+@@ -265,7 +265,7 @@ mirror_set(struct mbridge *mbridge, void *aux, const char *name,
+     {
+         hmapx_destroy(&srcs_map);
+         hmapx_destroy(&dsts_map);
+-        return 0;
++        return ECANCELED;
+     }
+ 
+     /* XXX: Not sure if these need to be thread safe. */
 diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c
 index bb0e490910..5132f9c952 100644
 --- a/ofproto/ofproto-dpif-monitor.c
@@ -5349,7 +5362,7 @@ index 47ea0f47e7..79d62a831a 100644
          }
          return;
 diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
-index e22ca757ac..1840c0dcf3 100644
+index e22ca757ac..1796cb5414 100644
 --- a/ofproto/ofproto-dpif.c
 +++ b/ofproto/ofproto-dpif.c
 @@ -1255,7 +1255,7 @@ check_ct_eventmask(struct dpif_backer *backer)
@@ -5370,7 +5383,24 @@ index e22ca757ac..1840c0dcf3 100644
  
      /* Execute the actions.  On older datapaths this fails with EINVAL, on
       * newer datapaths it succeeds. */
-@@ -3902,15 +3902,21 @@ port_query_by_name(const struct ofproto *ofproto_, const char *devname,
+@@ -3667,6 +3667,16 @@ mirror_set__(struct ofproto *ofproto_, void *aux,
+                        s->n_dsts, s->src_vlans,
+                        bundle_lookup(ofproto, s->out_bundle),
+                        s->snaplen, s->out_vlan);
++
++    if (!error) {
++        ofproto->backer->need_revalidate = REV_RECONFIGURE;
++    } else if (error == ECANCELED) {
++        /* The user requested a change that is identical to the current state,
++         * the reconfiguration is canceled, but don't log an error message
++         * about that. */
++        error = 0;
++    }
++
+     free(srcs);
+     free(dsts);
+     return error;
+@@ -3902,15 +3912,21 @@ port_query_by_name(const struct ofproto *ofproto_, const char *devname,
      int error;
  
      if (sset_contains(&ofproto->ghost_ports, devname)) {
@@ -5398,7 +5428,7 @@ index e22ca757ac..1840c0dcf3 100644
              ofproto_port->ofp_port = ofport ? ofport->ofp_port : OFPP_NONE;
              ofproto_port->name = xstrdup(devname);
              ofproto_port->type = xstrdup(type);
-@@ -4880,7 +4886,7 @@ packet_xlate(struct ofproto *ofproto_, struct ofproto_packet_out *opo)
+@@ -4880,7 +4896,7 @@ packet_xlate(struct ofproto *ofproto_, struct ofproto_packet_out *opo)
              if (entry->type == XC_LEARN) {
                  struct ofproto_flow_mod *ofm = entry->learn.ofm;
  
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index f2d703a..6beb6f2 100644
--- a/SPECS/openvswitch3.2.spec
+++ b/SPECS/openvswitch3.2.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.2.0
-Release: 100%{?dist}
+Release: 101%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -763,6 +763,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 20 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-101
+- Merging upstream branch-3.2 [RH git: bda1be9c38]
+    Commit list:
+    ec103da96b ofproto-dpif-mirror: Always revalidate on mirror update. (FDP-788)
+
+
 * Mon Sep 16 2024 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-100
 - Merging upstream branch-3.2 [RH git: 1fcec6e3a9]
     Commit list: