From b771c4f138885fdb9b7746ddddacc8255d3738d7 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 05 2023 13:53:41 +0000
Subject: Import openvswitch2.17-2.17.0-89 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 73fea50..78f8119 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -53699,7 +53699,7 @@ index 482400d8d1..ca3f2431ea 100644
          count = umem_pool_count(&pool->umem_info->mpool);
          ovs_assert(count + pool->lost_in_rings <= NUM_FRAMES);
 diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
-index b6b29c75e3..39a1fd388d 100644
+index b6b29c75e3..dbdd540d09 100644
 --- a/lib/netdev-dpdk.c
 +++ b/lib/netdev-dpdk.c
 @@ -622,9 +622,9 @@ dpdk_mp_full(const struct rte_mempool *mp) OVS_REQUIRES(dpdk_mp_mutex)
@@ -53714,6 +53714,15 @@ index b6b29c75e3..39a1fd388d 100644
          if (!dmp->refcount && dpdk_mp_full(dmp->mp)) {
              VLOG_DBG("Freeing mempool \"%s\"", dmp->mp->name);
              ovs_list_remove(&dmp->list_node);
+@@ -787,7 +787,7 @@ dpdk_mp_create(struct netdev_dpdk *dev, int mtu, bool per_port_mp)
+ static struct dpdk_mp *
+ dpdk_mp_get(struct netdev_dpdk *dev, int mtu, bool per_port_mp)
+ {
+-    struct dpdk_mp *dmp, *next;
++    struct dpdk_mp *dmp = NULL, *next;
+     bool reuse = false;
+ 
+     ovs_mutex_lock(&dpdk_mp_mutex);
 @@ -2561,90 +2561,6 @@ netdev_dpdk_vhost_update_tx_counters(struct netdev_dpdk *dev,
      }
  }
@@ -53915,7 +53924,7 @@ index b6b29c75e3..39a1fd388d 100644
 +        cnt = dpdk_copy_batch_to_mbuf(netdev, batch);
 +        stats->tx_failure_drops += pkt_cnt - cnt;
 +        pkt_cnt = cnt;
-+    }
+     }
 +
 +    /* Drop oversized packets. */
 +    cnt = netdev_dpdk_filter_packet_len(dev, pkts, pkt_cnt);
@@ -53927,7 +53936,7 @@ index b6b29c75e3..39a1fd388d 100644
 +        cnt = netdev_dpdk_prep_hwol_batch(dev, pkts, pkt_cnt);
 +        stats->tx_invalid_hwol_drops += pkt_cnt - cnt;
 +        pkt_cnt = cnt;
-     }
++    }
 +
 +    /* Apply Quality of Service policy. */
 +    cnt = netdev_dpdk_qos_run(dev, pkts, pkt_cnt, true);
@@ -53963,7 +53972,7 @@ index b6b29c75e3..39a1fd388d 100644
 -        __netdev_dpdk_vhost_send(netdev, qid, batch->packets,
 -                                 dp_packet_batch_size(batch));
 +        return 0;
-+    }
+     }
 +
 +    if (OVS_UNLIKELY(!rte_spinlock_trylock(&dev->tx_q[qid].tx_lock))) {
 +        COVERAGE_INC(vhost_tx_contention);
@@ -54011,7 +54020,7 @@ index b6b29c75e3..39a1fd388d 100644
 +    pkts = (struct rte_mbuf **) batch->packets;
 +    for (int i = 0; i < vhost_batch_cnt; i++) {
 +        rte_pktmbuf_free(pkts[i]);
-     }
++    }
 +
      return 0;
  }
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 049c4b8..01e22b0 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 88%{?dist}
+Release: 89%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -748,6 +748,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jun 02 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-89
+- Merging upstream branch-2.17 [RH git: febaa37b14]
+    Commit list:
+    75152d3d62 netdev-dpdk: Fix warning with gcc 13.
+
+
 * Mon May 29 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-88
 - Merging upstream branch-2.17 [RH git: c24e4da8ec]
     Commit list: