From fe11c6fdf8b799a40268b4340af37c48a5d50947 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: May 14 2021 20:52:50 +0000 Subject: Import openvswitch2.15-2.15.0-19 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 2172040..b9a918e 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -1,7 +1,16 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh -index 3e5136fd4e..dd29a4182d 100755 +index 3e5136fd4e..1acf5012db 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh +@@ -201,7 +201,7 @@ fi + + if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then + if [ -z "$DPDK_VER" ]; then +- DPDK_VER="20.11" ++ DPDK_VER="20.11.1" + fi + install_dpdk $DPDK_VER + if [ "$CC" = "clang" ]; then @@ -235,7 +235,7 @@ if [ "$TESTSUITE" ]; then configure_ovs @@ -71,6 +80,49 @@ index ea3475f356..2a590b3a79 100644 done else install-man-rst: +diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst +index 6a5e4141f1..3bc34c892f 100644 +--- a/Documentation/faq/releases.rst ++++ b/Documentation/faq/releases.rst +@@ -204,9 +204,9 @@ Q: What DPDK version does each Open vSwitch release work with? + 2.10.x 17.11.10 + 2.11.x 18.11.9 + 2.12.x 18.11.9 +- 2.13.x 19.11.2 +- 2.14.x 19.11.2 +- 2.15.x 20.11.0 ++ 2.13.x 19.11.8 ++ 2.14.x 19.11.8 ++ 2.15.x 20.11.1 + ============ ======== + + Q: Are all the DPDK releases that OVS versions work with maintained? +diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst +index 3a24e54f97..612f2fdbc3 100644 +--- a/Documentation/intro/install/dpdk.rst ++++ b/Documentation/intro/install/dpdk.rst +@@ -42,7 +42,7 @@ Build requirements + In addition to the requirements described in :doc:`general`, building Open + vSwitch with DPDK will require the following: + +-- DPDK 20.11 ++- DPDK 20.11.1 + + - A `DPDK supported NIC`_ + +@@ -73,9 +73,9 @@ Install DPDK + #. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``:: + + $ cd /usr/src/ +- $ wget https://fast.dpdk.org/rel/dpdk-20.11.tar.xz +- $ tar xf dpdk-20.11.tar.xz +- $ export DPDK_DIR=/usr/src/dpdk-20.11 ++ $ wget https://fast.dpdk.org/rel/dpdk-20.11.1.tar.xz ++ $ tar xf dpdk-20.11.1.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-20.11.1 + $ cd $DPDK_DIR + + #. Configure and install DPDK using Meson diff --git a/Documentation/topics/dpdk/pmd.rst b/Documentation/topics/dpdk/pmd.rst index caa7d97bef..e481e79414 100644 --- a/Documentation/topics/dpdk/pmd.rst @@ -122,16 +174,19 @@ index 103495415a..a98ec672fc 100644 This configuration accomplishes that the high priority traffic has a guaranteed bandwidth egressing the ports at CIR (1000pps), but it can also diff --git a/NEWS b/NEWS -index bc901efdb1..036d4032c4 100644 +index bc901efdb1..d6a9395be4 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,11 @@ +@@ -1,3 +1,14 @@ +v2.15.1 - xx xxx xxxx +--------------------- + - ovs-ctl: + * New option '--no-record-hostname' to disable hostname configuration + in ovsdb on startup. + * New command 'record-hostname-if-not-set' to update hostname in ovsdb. ++ - DPDK: ++ * OVS validated with DPDK 20.11.1. It is recommended to use this version ++ until further releases. + + v2.15.0 - 15 Feb 2021 @@ -18886,10 +18941,40 @@ index bf0f8af544..737f48047b 100644 ofputil_group_to_string(group_id, name, sizeof name); ds_put_cstr(s, name); diff --git a/lib/ovsdb-cs.c b/lib/ovsdb-cs.c -index ff8adaefb5..6f9f912ac4 100644 +index ff8adaefb5..911b71dd4f 100644 --- a/lib/ovsdb-cs.c +++ b/lib/ovsdb-cs.c -@@ -1367,7 +1367,7 @@ ovsdb_cs_send_transaction(struct ovsdb_cs *cs, struct json *operations) +@@ -903,8 +903,27 @@ ovsdb_cs_db_set_condition(struct ovsdb_cs_db *db, const char *table, + } + + /* Conditions will be up to date when we receive replies for already +- * requested and new conditions, if any. */ +- return db->cond_seqno + (t->new_cond ? 1 : 0) + (t->req_cond ? 1 : 0); ++ * requested and new conditions, if any. This includes condition change ++ * requests for other tables too. ++ */ ++ if (t->new_cond) { ++ /* New condition will be sent out after all already requested ones ++ * are acked. ++ */ ++ bool any_req_cond = false; ++ HMAP_FOR_EACH (t, hmap_node, &db->tables) { ++ if (t->req_cond) { ++ any_req_cond = true; ++ break; ++ } ++ } ++ return db->cond_seqno + any_req_cond + 1; ++ } else { ++ /* Already requested conditions should be up to date at ++ * db->cond_seqno + 1 while acked conditions are already up to date. ++ */ ++ return db->cond_seqno + !!t->req_cond; ++ } + } + + /* Sets the replication condition for 'tc' in 'cs' to 'condition' and arranges +@@ -1367,7 +1386,7 @@ ovsdb_cs_send_transaction(struct ovsdb_cs *cs, struct json *operations) sizeof *cs->txns); } cs->txns[cs->n_txns++] = request_id; @@ -18898,7 +18983,7 @@ index ff8adaefb5..6f9f912ac4 100644 } /* Makes 'cs' drop its record of transaction 'request_id'. If a reply arrives -@@ -1380,6 +1380,7 @@ ovsdb_cs_forget_transaction(struct ovsdb_cs *cs, const struct json *request_id) +@@ -1380,6 +1399,7 @@ ovsdb_cs_forget_transaction(struct ovsdb_cs *cs, const struct json *request_id) { for (size_t i = 0; i < cs->n_txns; i++) { if (json_equal(request_id, cs->txns[i])) { diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index dab60cd..f31b710 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: 18%{?dist} +Release: 19%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -697,6 +697,13 @@ exit 0 %endif %changelog +* Fri May 14 2021 Open vSwitch CI - 2.15.0-19 +- Merging upstream branch-2.15 [RH gerrit: 6aa50cbb89] + Commit list: + 553d523929 ovsdb-cs: Consider all tables when computing expected cond seqno. + 8d0aebcc49 dpdk: Use DPDK 20.11.1 release. + + * Wed May 12 2021 Timothy Redaelli - 2.15.0-18 - Merge tag 'b6167fabb202faa025946348f514e369dba5853b' into fast-datapath-rhel-8 [RH gerrit: 1cdc5555f9] dpdk-20.11.1