From f1f8eb9fde09ab70b9e8159f6ca677ca0c1b9c1c Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: May 29 2023 21:03:45 +0000
Subject: Import openvswitch2.17-2.17.0-102 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index 2758f07..73fea50 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -54508,7 +54508,7 @@ index b89dfdd52a..6c90946388 100644
                                              gnh->options, &crit_opt);
  
 diff --git a/lib/netdev-offload-dpdk.c b/lib/netdev-offload-dpdk.c
-index 94dc6a9b74..303b99daf4 100644
+index 94dc6a9b74..1ad87e5ffc 100644
 --- a/lib/netdev-offload-dpdk.c
 +++ b/lib/netdev-offload-dpdk.c
 @@ -18,6 +18,7 @@
@@ -54607,6 +54607,21 @@ index 94dc6a9b74..303b99daf4 100644
              .queue_num = netdev_n_rxq(netdev),
              .queue = rss_data->queue,
              .key_len = 0,
+@@ -2310,13 +2334,13 @@ netdev_offload_dpdk_flow_destroy(struct ufid_to_rte_flow_data *rte_flow_data)
+             ovsrcu_get(void *, &netdev->hw_info.offload_data);
+         data->rte_flow_counters[tid]--;
+ 
+-        ufid_to_rte_flow_disassociate(rte_flow_data);
+         VLOG_DBG_RL(&rl, "%s/%s: rte_flow 0x%"PRIxPTR
+                     " flow destroy %d ufid " UUID_FMT,
+                     netdev_get_name(netdev), netdev_get_name(physdev),
+                     (intptr_t) rte_flow,
+                     netdev_dpdk_get_port_id(physdev),
+                     UUID_ARGS((struct uuid *) ufid));
++        ufid_to_rte_flow_disassociate(rte_flow_data);
+     } else {
+         VLOG_ERR("Failed flow: %s/%s: flow destroy %d ufid " UUID_FMT,
+                  netdev_get_name(netdev), netdev_get_name(physdev),
 diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
 index 9845e8d3fe..6fa27d1dda 100644
 --- a/lib/netdev-offload-tc.c
@@ -72066,6 +72081,23 @@ index 62928d50fc..763ece2a78 100644
 diff --git a/utilities/ovs-appctl-bashcomp.bash b/utilities/ovs-appctl-bashcomp.bash
 old mode 100755
 new mode 100644
+index 4384be8ae1..0a9af1a18f
+--- a/utilities/ovs-appctl-bashcomp.bash
++++ b/utilities/ovs-appctl-bashcomp.bash
+@@ -223,6 +223,13 @@ printf_stderr() {
+ # The code below is taken from Peter Amidon.  His change makes it more
+ # robust.
+ extract_bash_prompt() {
++    # On Bash 4.4+ just use the @P expansion
++    if ((BASH_VERSINFO[0] > 4 ||
++        (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
++        _BASH_PROMPT="${PS1@P}"
++        return
++    fi
++
+     local myPS1 v
+ 
+     myPS1="$(sed 's/Begin prompt/\\Begin prompt/; s/End prompt/\\End prompt/' <<< "$PS1")"
 diff --git a/utilities/ovs-dpctl-top.in b/utilities/ovs-dpctl-top.in
 index fbe6e4f560..2c1766eff5 100755
 --- a/utilities/ovs-dpctl-top.in
@@ -72282,6 +72314,23 @@ index 82d1bedfa6..420c11eb8a 100755
 diff --git a/utilities/ovs-vsctl-bashcomp.bash b/utilities/ovs-vsctl-bashcomp.bash
 old mode 100755
 new mode 100644
+index fc8245bfb5..c5ad24fb70
+--- a/utilities/ovs-vsctl-bashcomp.bash
++++ b/utilities/ovs-vsctl-bashcomp.bash
+@@ -413,6 +413,13 @@ _ovs_vsctl_get_PS1 () {
+         return;
+     fi
+ 
++    # On Bash 4.4+ just use the @P expansion
++    if ((BASH_VERSINFO[0] > 4 ||
++        (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 4))); then
++        printf '%s\n' "${PS1@P}"
++        return
++    fi
++
+     # Original inspiration from
+     # http://stackoverflow.com/questions/10060500/bash-how-to-evaluate-ps1-ps2,
+     # but changed quite a lot to make it more robust.
 diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
 index 37cc72d401..1032089fc2 100644
 --- a/utilities/ovs-vsctl.c
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index b64412e..e255481 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 101%{?dist}
+Release: 102%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -749,6 +749,13 @@ exit 0
 %endif
 
 %changelog
+* Mon May 29 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-102
+- Merging upstream branch-2.17 [RH git: 4e79737790]
+    Commit list:
+    5285dad182 utilities/bashcomp: Fix PS1 generation on new bash. (#2170344)
+    ebe7bd7b68 netdev-offload-dpdk: Fix crash in debug log.
+
+
 * Fri May 26 2023 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-101
 - Merging upstream branch-2.17 [RH git: 8a8882d1cb]
     Commit list: