From a581831a4b93d21fbbb37ef90c27346867413776 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 30 2022 02:02:32 +0000
Subject: Import openvswitch2.16-2.16.0-86 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index 6a23fe8..a973d35 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -2412,7 +2412,7 @@ index a782d9678a..ac4885538c 100644
  
      /* Flow-Table and classifiers
 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index bddce75b63..f96d0ecf54 100644
+index bddce75b63..5f90dd4ceb 100644
 --- a/lib/dpif-netdev.c
 +++ b/lib/dpif-netdev.c
 @@ -984,7 +984,9 @@ dpif_netdev_subtable_lookup_set(struct unixctl_conn *conn, int argc OVS_UNUSED,
@@ -2623,7 +2623,15 @@ index bddce75b63..f96d0ecf54 100644
  }
  
  /* Sets the 'struct dp_netdev_pmd_thread' for non-pmd threads. */
-@@ -8942,9 +8984,12 @@ dpcls_create_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
+@@ -6751,6 +6793,7 @@ dp_netdev_destroy_pmd(struct dp_netdev_pmd_thread *pmd)
+     seq_destroy(pmd->reload_seq);
+     ovs_mutex_destroy(&pmd->port_mutex);
+     ovs_mutex_destroy(&pmd->bond_mutex);
++    free(pmd->netdev_input_func_userdata);
+     free(pmd);
+ }
+ 
+@@ -8942,9 +8985,12 @@ dpcls_create_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
  
      /* Get the preferred subtable search function for this (u0,u1) subtable.
       * The function is guaranteed to always return a valid implementation, and
@@ -2638,7 +2646,7 @@ index bddce75b63..f96d0ecf54 100644
  
      cmap_insert(&cls->subtables_map, &subtable->cmap_node, mask->hash);
      /* Add the new subtable at the end of the pvector (with no hits yet) */
-@@ -8973,6 +9018,10 @@ dpcls_find_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
+@@ -8973,6 +9019,10 @@ dpcls_find_subtable(struct dpcls *cls, const struct netdev_flow_key *mask)
  /* Checks for the best available implementation for each subtable lookup
   * function, and assigns it as the lookup function pointer for each subtable.
   * Returns the number of subtables that have changed lookup implementation.
@@ -2649,7 +2657,7 @@ index bddce75b63..f96d0ecf54 100644
   */
  static uint32_t
  dpcls_subtable_lookup_reprobe(struct dpcls *cls)
-@@ -8985,10 +9034,13 @@ dpcls_subtable_lookup_reprobe(struct dpcls *cls)
+@@ -8985,10 +9035,13 @@ dpcls_subtable_lookup_reprobe(struct dpcls *cls)
          uint32_t u0_bits = subtable->mf_bits_set_unit0;
          uint32_t u1_bits = subtable->mf_bits_set_unit1;
          void *old_func = subtable->lookup_func;
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index d5b1c11..29dd560 100644
--- a/SPECS/openvswitch2.16.spec
+++ b/SPECS/openvswitch2.16.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.16.0
-Release: 85%{?dist}
+Release: 86%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -699,6 +699,12 @@ exit 0
 %endif
 
 %changelog
+* Wed Jun 29 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-86
+- Merging upstream branch-2.16 [RH git: c1bbe117f8]
+    Commit list:
+    2e6d28fafe dpif-netdev: Fix leak of AVX512 DPIF scratch pad.
+
+
 * Wed Jun 29 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-85
 - Merging upstream branch-2.16 [RH git: df1ebc7699]
     Commit list: