From e1472422865ae4d219cf4ca17395261052cdbccd Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jun 27 2022 16:20:43 +0000
Subject: Import openvswitch2.13-2.13.0-189 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 2a03b4d..5b14184 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -82370,7 +82370,7 @@ index 416cb769d2..47261c7551 100644
      }
  
 diff --git a/lib/conntrack.c b/lib/conntrack.c
-index ff5a89457c..4a26f370c3 100644
+index ff5a89457c..4f7a22461d 100644
 --- a/lib/conntrack.c
 +++ b/lib/conntrack.c
 @@ -44,6 +44,7 @@ VLOG_DEFINE_THIS_MODULE(conntrack);
@@ -82508,6 +82508,15 @@ index ff5a89457c..4a26f370c3 100644
  }
  
  static bool
+@@ -2169,7 +2214,7 @@ nat_range_hash(const struct conn *conn, uint32_t basis)
+     hash = ct_addr_hash_add(hash, &conn->nat_info->min_addr);
+     hash = ct_addr_hash_add(hash, &conn->nat_info->max_addr);
+     hash = hash_add(hash,
+-                    (conn->nat_info->max_port << 16)
++                    ((uint32_t) conn->nat_info->max_port << 16)
+                     | conn->nat_info->min_port);
+     hash = ct_endpoint_hash_add(hash, &conn->key.src);
+     hash = ct_endpoint_hash_add(hash, &conn->key.dst);
 @@ -2249,8 +2294,8 @@ nat_select_range_tuple(struct conntrack *ct, const struct conn *conn,
                conn->nat_info->nat_action & NAT_ACTION_SRC_PORT
            ? true : false;
@@ -85545,7 +85554,7 @@ index 42d3335f0f..97320a4dba 100644
      } else {
          a = attrs[OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL];
 diff --git a/lib/odp-util.c b/lib/odp-util.c
-index 746d1e97d4..0df892132e 100644
+index 746d1e97d4..fa6287f6db 100644
 --- a/lib/odp-util.c
 +++ b/lib/odp-util.c
 @@ -390,7 +390,8 @@ format_odp_push_nsh_action(struct ds *ds,
@@ -85620,6 +85629,28 @@ index 746d1e97d4..0df892132e 100644
      }
  
      nl_msg_end_nested(a, tun_key_ofs);
+@@ -3334,16 +3341,16 @@ format_eth(struct ds *ds, const char *name, const struct eth_addr key,
+ 
+ static void
+ format_be64(struct ds *ds, const char *name, ovs_be64 key,
+-            const ovs_be64 *mask, bool verbose)
++            const ovs_32aligned_be64 *mask_, bool verbose)
+ {
+-    bool mask_empty = mask && !*mask;
++    ovs_be64 mask = mask_ ? get_32aligned_be64(mask_) : htonll(0);
+ 
+-    if (verbose || !mask_empty) {
+-        bool mask_full = !mask || *mask == OVS_BE64_MAX;
++    if (verbose || mask) {
++        bool mask_full = !mask_ || mask == OVS_BE64_MAX;
+ 
+         ds_put_format(ds, "%s=0x%"PRIx64, name, ntohll(key));
+         if (!mask_full) { /* Partially masked. */
+-            ds_put_format(ds, "/%#"PRIx64, ntohll(*mask));
++            ds_put_format(ds, "/%#"PRIx64, ntohll(mask));
+         }
+         ds_put_char(ds, ',');
+     }
 @@ -4514,6 +4521,11 @@ odp_flow_format(const struct nlattr *key, size_t key_len,
                      ds_put_char(ds, ',');
                  }
@@ -86221,6 +86252,21 @@ index 4579548ee1..9485ddfc93 100644
              break;
           }
  
+diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
+index 4edb3c114a..05c0b5711d 100644
+--- a/lib/ofpbuf.c
++++ b/lib/ofpbuf.c
+@@ -422,6 +422,10 @@ void
+ ofpbuf_reserve(struct ofpbuf *b, size_t size)
+ {
+     ovs_assert(!b->size);
++
++    if (!size) {
++        return;
++    }
+     ofpbuf_prealloc_tailroom(b, size);
+     b->data = (char*)b->data + size;
+ }
 diff --git a/lib/ovs-actions.xml b/lib/ovs-actions.xml
 index ab8e08b84d..8f8c9041ac 100644
 --- a/lib/ovs-actions.xml
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index ab80acc..a0a7d50 100644
--- a/SPECS/openvswitch2.13.spec
+++ b/SPECS/openvswitch2.13.spec
@@ -59,7 +59,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.13.0
-Release: 188%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 189%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -715,6 +715,14 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 27 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-189
+- Merging upstream branch-2.13 [RH git: bf0662bc0f]
+    Commit list:
+    a2c937f66f conntrack: Fix incorrect bit shift while hashing nat range.
+    e4f75b330f odp-util: Fix unaligned access to tunnel id.
+    f5a714b30e ofpbuf: Fix offsetting a NULL pointer in ofpbuf_reserve.
+
+
 * Fri Jun 24 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-188
 - Merging upstream branch-2.13 [RH git: 8c4e8acfb7]
     Commit list: