From c1b42f645400914ffc3572c427d93eb4d9728454 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Oct 26 2022 16:16:19 +0000
Subject: Import openvswitch2.15-2.15.0-126 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index c905c77..5822024 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -103110,6 +103110,44 @@ index c0b0ae0448..af0bcbde8d 100644
          nl_msg_put_unspec(b, OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,
                            tun->metadata.opts.gnv,
                            flow->metadata.present.len);
+diff --git a/lib/unaligned.h b/lib/unaligned.h
+index f40e4e10df..15334e3c76 100644
+--- a/lib/unaligned.h
++++ b/lib/unaligned.h
+@@ -95,7 +95,7 @@ GCC_UNALIGNED_ACCESSORS(ovs_be64, be64);
+ static inline uint16_t get_unaligned_u16(const uint16_t *p_)
+ {
+     const uint8_t *p = (const uint8_t *) p_;
+-    return ntohs((p[0] << 8) | p[1]);
++    return ntohs(((uint16_t) p[0] << 8) | (uint16_t) p[1]);
+ }
+ 
+ static inline void put_unaligned_u16(uint16_t *p_, uint16_t x_)
+@@ -110,7 +110,8 @@ static inline void put_unaligned_u16(uint16_t *p_, uint16_t x_)
+ static inline uint32_t get_unaligned_u32(const uint32_t *p_)
+ {
+     const uint8_t *p = (const uint8_t *) p_;
+-    return ntohl((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
++    return ntohl(((uint32_t) p[0] << 24) | ((uint32_t) p[1] << 16) |
++                 ((uint32_t) p[2] <<  8) | (uint32_t) p[3]);
+ }
+ 
+ static inline void put_unaligned_u32(uint32_t *p_, uint32_t x_)
+@@ -131,10 +132,10 @@ static inline uint64_t get_unaligned_u64__(const uint64_t *p_)
+                   | ((uint64_t) p[1] << 48)
+                   | ((uint64_t) p[2] << 40)
+                   | ((uint64_t) p[3] << 32)
+-                  | (p[4] << 24)
+-                  | (p[5] << 16)
+-                  | (p[6] << 8)
+-                  | p[7]);
++                  | ((uint64_t) p[4] << 24)
++                  | ((uint64_t) p[5] << 16)
++                  | ((uint64_t) p[6] << 8)
++                  | (uint64_t)  p[7]);
+ }
+ 
+ static inline void put_unaligned_u64__(uint64_t *p_, uint64_t x_)
 diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4
 index 244ea0fbab..1f560a1f93 100644
 --- a/m4/openvswitch.m4
@@ -106137,9 +106175,47 @@ index a7982de381..39d9aa391e 100644
  ])
  AT_CLEANUP
 diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at
-index 2862a3c9b9..16402ebae2 100644
+index 2862a3c9b9..938b4094ba 100644
 --- a/tests/dpif-netdev.at
 +++ b/tests/dpif-netdev.at
+@@ -6,8 +6,8 @@ m4_divert_push([PREPARE_TESTS])
+ # that vary from one run to another (e.g., timing and bond actions).
+ strip_timers () {
+     sed '
+-    s/duration:[0-9]*\.[0-9]*/duration:0.0/
+-    s/used:[0-9]*\.[0-9]*/used:0.0/
++    s/duration:[0-9\.][0-9\.]*/duration:0.0/
++    s/used:[0-9\.][0-9\.]*/used:0.0/
+ '
+ }
+ 
+@@ -15,7 +15,7 @@ strip_xout () {
+     sed '
+     s/mega_ufid:[-0-9a-f]* //
+     s/ufid:[-0-9a-f]* //
+-    s/used:[0-9]*\.[0-9]*/used:0.0/
++    s/used:[0-9\.][0-9\.]*/used:0.0/
+     s/actions:.*/actions: <del>/
+     s/packets:[0-9]*/packets:0/
+     s/bytes:[0-9]*/bytes:0/
+@@ -26,7 +26,7 @@ strip_xout_keep_actions () {
+     sed '
+     s/mega_ufid:[-0-9a-f]* //
+     s/ufid:[-0-9a-f]* //
+-    s/used:[0-9]*\.[0-9]*/used:0.0/
++    s/used:[0-9\.][0-9\.]*/used:0.0/
+     s/packets:[0-9]*/packets:0/
+     s/bytes:[0-9]*/bytes:0/
+ ' | sort
+@@ -51,7 +51,7 @@ filter_hw_packet_netdev_dummy () {
+ filter_flow_dump () {
+     grep 'flow_dump ' | sed '
+         s/.*flow_dump //
+-        s/used:[0-9]*\.[0-9]*/used:0.0/
++        s/used:[0-9\.][0-9\.]*/used:0.0/
+     ' | sort | uniq
+ }
+ 
 @@ -299,60 +299,87 @@ type=drop rate=1 burst_size=2
  ])
  
@@ -109178,6 +109254,19 @@ index 0f74709f5a..5bca84351c 100644
  run
    should send probe
    in IDLE for 0 ms (1000 ms backoff)
+diff --git a/tests/stp.at b/tests/stp.at
+index 7ddacfc3a0..69475843e5 100644
+--- a/tests/stp.at
++++ b/tests/stp.at
+@@ -368,7 +368,7 @@ AT_CLEANUP
+ # Strips out uninteresting parts of flow output, as well as parts
+ # that vary from one run to another (e.g., timing and bond actions).
+ m4_define([STRIP_USED], [[sed '
+-    s/used:[0-9]*\.[0-9]*/used:0.0/
++    s/used:[0-9\.][0-9\.]*/used:0.0/
+     s/duration=[0-9.]*s*/duration=Xs/
+     s/idle_age=[0-9]*,/idle_age=X,/
+ ']])
 diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
 index 9d5e24a292..7a44e697a3 100644
 --- a/tests/system-common-macros.at
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index 645cb3b..bb0ae9b 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 125%{?dist}
+Release: 126%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -702,6 +702,13 @@ exit 0
 %endif
 
 %changelog
+* Wed Oct 26 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-126
+- Merging upstream branch-2.15 [RH git: 5ee74656ff]
+    Commit list:
+    5c1dc396fc unaligned: Correct the stats of packet_count and byte_count on Windows.
+    b538282cd8 tests: Fix filtering of whole-second durations.
+
+
 * Thu Oct 13 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-125
 - Merging upstream branch-2.15 [RH git: f665a8bee1]
     Commit list: