From 4c16cd039c837f0c91384c1c25964acc16507828 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Aug 16 2021 22:56:51 +0000 Subject: Import openvswitch2.15-2.15.0-35 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 3e13104..ff5606e 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -19138,6 +19138,21 @@ index ecda896c78..f9728e6739 100644 const struct flow *flow; /* Flow extracted from 'packet'. */ /* Input, but possibly modified as a side effect of execution. */ +diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c +index 6f7b610a99..fd0127ed17 100644 +--- a/lib/dynamic-string.c ++++ b/lib/dynamic-string.c +@@ -460,6 +460,10 @@ ds_chomp(struct ds *ds, int c) + void + ds_clone(struct ds *dst, struct ds *source) + { ++ if (!source->allocated) { ++ ds_init(dst); ++ return; ++ } + dst->length = source->length; + dst->allocated = dst->length; + dst->string = xmalloc(dst->allocated + 1); diff --git a/lib/ipf.c b/lib/ipf.c index c20bcc0b33..9c83f1913a 100644 --- a/lib/ipf.c @@ -19675,6 +19690,19 @@ index 72b7915052..32f52b46f2 100644 ovsthread_once_done(&once); } +diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c +index 47077e9478..5cb96fa6ec 100644 +--- a/lib/netlink-socket.c ++++ b/lib/netlink-socket.c +@@ -917,7 +917,7 @@ nl_sock_transact_multiple__(struct nl_sock *sock, + } + if (txn->error) { + VLOG_DBG_RL(&rl, "received NAK error=%d (%s)", +- error, ovs_strerror(txn->error)); ++ txn->error, ovs_strerror(txn->error)); + } + } else { + txn->error = 0; diff --git a/lib/odp-util.c b/lib/odp-util.c index a8598d52af..e1199d1da6 100644 --- a/lib/odp-util.c @@ -20229,6 +20257,18 @@ index 05bb48d66c..d93483245e 100644 const struct ovsdb_idl_row *ovsdb_idl_track_get_first( const struct ovsdb_idl *, const struct ovsdb_idl_table_class *); const struct ovsdb_idl_row *ovsdb_idl_track_get_next(const struct ovsdb_idl_row *); +diff --git a/lib/tc.c b/lib/tc.c +index 3192207984..2eb271d621 100644 +--- a/lib/tc.c ++++ b/lib/tc.c +@@ -2557,6 +2557,7 @@ nl_msg_put_flower_acts(struct ofpbuf *request, struct tc_flower *flower) + if (!released && flower->tunnel) { + act_offset = nl_msg_start_nested(request, act_index++); + nl_msg_put_act_tunnel_key_release(request); ++ nl_msg_put_act_flags(request); + nl_msg_end_nested(request, act_offset); + released = true; + } diff --git a/lib/tun-metadata.c b/lib/tun-metadata.c index c0b0ae0448..af0bcbde8d 100644 --- a/lib/tun-metadata.c diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 648c057..89f32cb 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: 33%{?dist} +Release: 35%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -697,46 +697,64 @@ exit 0 %endif %changelog +* Mon Aug 16 2021 Open vSwitch CI - 2.15.0-35 +- Merging upstream branch-2.15 [RH git: 11bcf52d03] + Commit list: + d3ff41d609 tc: Set action flags for tunnel_key release. + 079a4de723 netlink-socket: Replace error with txn->error when logging nacked transactions. + f8cc5aa35c dynamic-string: Fix a crash in ds_clone(). + + +* Mon Aug 16 2021 Michael Santana - 2.15.0-34 +- pkgtool: Swap bugzilla id and RH git [RH git: c2e6243d60] + Having the bugzilla ID not at the end of the line breakes another script + that parses for said ID. This patch fixes that by putting the ID next to + the new line + + Fixes: f6b2db4dd33e ("Make changelog in spec file more informative") + Signed-off-by: Michael Santana + + * Mon Aug 16 2021 Open vSwitch CI - 2.15.0-33 -- Merging upstream branch-2.15 [RH gerrit: 08b4ccb1c4] +- Merging upstream branch-2.15 [RH git: 08b4ccb1c4] Commit list: 64d1bba919 dpif-netdev: fix memory leak in dpcls subtable set command * Tue Aug 03 2021 Open vSwitch CI - 2.15.0-32 -- Merging upstream branch-2.15 [RH gerrit: 2cc833ce5b] +- Merging upstream branch-2.15 [RH git: 2cc833ce5b] Commit list: 90b219275d dpif-netdev: Do not flush PMD offloads on reload. * Mon Aug 02 2021 Open vSwitch CI - 2.15.0-31 -- Merging upstream branch-2.15 [RH gerrit: 88fb0bba8a] +- Merging upstream branch-2.15 [RH git: 88fb0bba8a] Commit list: b29b04f85f dpif-netdev: Fix offloads of modified flows. 1d0b89ea7b dpif-netdev: Fix flow modification after failure. * Mon Jul 26 2021 Open vSwitch CI - 2.15.0-30 -- Merging upstream branch-2.15 [RH gerrit: a76a4dfca6] +- Merging upstream branch-2.15 [RH git: a76a4dfca6] Commit list: 8d84a4b166 netdev-offload-dpdk: Fix IPv6 rewrite cast-align warning. f3f7849cbb daemon-unix: Fix leak of a fork error message. * Fri Jul 23 2021 Open vSwitch CI - 2.15.0-29 -- Merging upstream branch-2.15 [RH gerrit: 60c8b2a15b] +- Merging upstream branch-2.15 [RH git: 60c8b2a15b] Commit list: 8aa0f03747 ovsdb-cs: Perform forced reconnects without a backoff. * Wed Jul 21 2021 Open vSwitch CI - 2.15.0-28 -- Merging upstream branch-2.15 [RH gerrit: 48a90081e8] +- Merging upstream branch-2.15 [RH git: 48a90081e8] Commit list: ee4e034dc9 datapath-windows:Correct checksum for DNAT action * Sat Jul 17 2021 Open vSwitch CI - 2.15.0-27 -- Merging upstream branch-2.15 [RH gerrit: abdd952536] +- Merging upstream branch-2.15 [RH git: abdd952536] Commit list: 72132a9403 bond: Fix broken rebalancing after link state changes. aa84cfe25d dpif-netlink: Fix report_loss() message. @@ -757,13 +775,13 @@ exit 0 * Wed Jun 30 2021 Timothy Redaelli - 2.15.0-26 -- Use 10 characters of hash to generate the changelog [RH gerrit: d89d9cd0f1] +- Use 10 characters of hash to generate the changelog [RH git: d89d9cd0f1] This is needed to avoid that the history changes since the default changes from time to time * Wed Jun 30 2021 Timothy Redaelli - 2.15.0-25 -- Merging 881d71ea22e datapath-windows: Specify external include .. [RH gerrit: 8ad5538601] +- Merging 881d71ea22e datapath-windows: Specify external include .. [RH git: 8ad5538601] Commit list: 881d71ea22e datapath-windows: Specify external include paths 934668c295e Remove Python 2 leftovers. @@ -771,7 +789,7 @@ exit 0 * Fri Jun 11 2021 Open vSwitch CI - 2.15.0-24 -- Merging upstream branch-2.15 [RH gerrit: 78ba3622d9] +- Merging upstream branch-2.15 [RH git: 78ba3622d9] Commit list: bc0aa785a8 ovsdb-idl: Fix the database update signaling if it has never been connected. 559426d2b0 ofproto: Fix potential NULL dereference in ofproto_ct_*_zone_timeout_policy(). @@ -779,7 +797,7 @@ exit 0 * Thu May 27 2021 Open vSwitch CI - 2.15.0-23 -- Merging upstream branch-2.15 [RH gerrit: ba3ba16d42] +- Merging upstream branch-2.15 [RH git: ba3ba16d42] Commit list: 8995d53112 dpif-netlink: Fix send of uninitialized memory in ct limit requests. 0c056891c2 ofproto-dpif: Fix use of uninitialized attributes of timeout policy. @@ -788,37 +806,37 @@ exit 0 * Wed May 19 2021 Open vSwitch CI - 2.15.0-22 -- Merging upstream branch-2.15 [RH gerrit: 8b6b82c2ed] +- Merging upstream branch-2.15 [RH git: 8b6b82c2ed] Commit list: e87adce83c dpif-netdev: Remove meter rate from the bucket size calculation. * Sat May 15 2021 Open vSwitch CI - 2.15.0-21 -- Merging upstream branch-2.15 [RH gerrit: c7b9daa243] +- Merging upstream branch-2.15 [RH git: c7b9daa243] Commit list: a3ee3258e2 ovs-ofctl: Fix coredump when using "add-groups" command. * Fri May 14 2021 Open vSwitch CI - 2.15.0-20 -- Merging upstream branch-2.15 [RH gerrit: 69559c9283] +- Merging upstream branch-2.15 [RH git: 69559c9283] Commit list: c5d2a62750 raft: Transfer leadership before creating snapshots. * Fri May 14 2021 Open vSwitch CI - 2.15.0-19 -- Merging upstream branch-2.15 [RH gerrit: 6aa50cbb89] +- Merging upstream branch-2.15 [RH git: 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] +- Merge tag 'b6167fabb202faa025946348f514e369dba5853b' into fast-datapath-rhel-8 [RH git: 1cdc5555f9] dpdk-20.11.1 * Tue May 11 2021 Open vSwitch CI - 2.15.0-17 -- Merging upstream branch-2.15 [RH gerrit: 120e2a5d87] +- Merging upstream branch-2.15 [RH git: 120e2a5d87] Commit list: 21452722b7 github: Fix up malformed /etc/hosts. 90d1984b99 doc: automake: Add support for sphinx 4.0. @@ -826,42 +844,42 @@ exit 0 * Mon May 10 2021 Open vSwitch CI - 2.15.0-16 -- Merging upstream branch-2.15 [RH gerrit: dbd5501f48] +- Merging upstream branch-2.15 [RH git: dbd5501f48] Commit list: 255c38c745 ofp-group: Use big-enough buffer in ofputil_format_group(). * Wed Apr 21 2021 Open vSwitch CI - 2.15.0-15 -- Merging upstream branch-2.15 [RH gerrit: 85f5aecb83] +- Merging upstream branch-2.15 [RH git: 85f5aecb83] Commit list: f2c0744d2f ofproto/ofproto-dpif-sflow: Check sflow agent in case of race * Tue Apr 20 2021 Aaron Conole - 2.15.0-14 -- Merging ct_state_fix [RH gerrit: f847e4fac1] +- Merging ct_state_fix [RH git: f847e4fac1] Commit list: 09a2081067 netdev-offload-tc: Add support for ct_state flag rel. 423048a34f netdev-offload-tc: Add support for ct_state flags inv and rpl * Tue Apr 20 2021 Aaron Conole - 2.15.0-13 -- ab157ef34d dpif: Fix use of uninitialized execute hash. b1fded0208 odp-util: Fix use of uninitialized erspan metadata. f473ee5689 dpif-netlink: Fix using uninitialized info.tc_modify_flow_deleted in out label. 2721606bd4 netdev-offload-tc: Probe for support for any of the ct_state flags. 091bc48d9c compat: Add ct_state flags definitions. [RH gerrit: e4336ed96c] +- ab157ef34d dpif: Fix use of uninitialized execute hash. b1fded0208 odp-util: Fix use of uninitialized erspan metadata. f473ee5689 dpif-netlink: Fix using uninitialized info.tc_modify_flow_deleted in out label. 2721606bd4 netdev-offload-tc: Probe for support for any of the ct_state flags. 091bc48d9c compat: Add ct_state flags definitions. [RH git: e4336ed96c] * Tue Apr 20 2021 Timothy Redaelli - 2.15.0-12 -- Fix typo in rh-mock-srpm [RH gerrit: 85631264db] +- Fix typo in rh-mock-srpm [RH git: 85631264db] Thanks fbl for reporting * Wed Apr 14 2021 Open vSwitch CI - 2.15.0-11 -- Merging upstream branch-2.15 [RH gerrit: 71c33052b9] +- Merging upstream branch-2.15 [RH git: 71c33052b9] Commit list: 1307e90e3f Add test cases for ingress_policing parameters d184c6ce67 netdev-linux: correct unit of burst parameter * Wed Apr 07 2021 Michael Santana - 2.15.0-10 -- Make changelog in spec file more informative [RH gerrit: f6b2db4dd3] +- Make changelog in spec file more informative [RH git: f6b2db4dd3] This is done by adding the body of the commit message to the changelong. The body is indented and has extra spacing separating each entry in the changelog to make each one more discernible since now they could be @@ -871,13 +889,13 @@ exit 0 * Thu Apr 01 2021 Open vSwitch CI - 2.15.0-9 -- Merging upstream branch-2.15 [RH gerrit: 504b67ec8d] +- Merging upstream branch-2.15 [RH git: 504b67ec8d] Commit list: cab998e500 ipsec: Fix IPv6 default route support for Libreswan. * Thu Apr 01 2021 Open vSwitch CI - 2.15.0-8 -- Merging upstream branch-2.15 [RH gerrit: 147a0970be] +- Merging upstream branch-2.15 [RH git: 147a0970be] Commit list: b9ab7827ec ovsdb-idl: Mark arc sources as updated when destination is deleted. c82d2e3fbc ovsdb-idl: Preserve references for deleted rows. @@ -885,20 +903,20 @@ exit 0 * Wed Mar 31 2021 Open vSwitch CI - 2.15.0-7 -- Merging upstream branch-2.15 [RH gerrit: cbb083630e] +- Merging upstream branch-2.15 [RH git: cbb083630e] Commit list: 8d71feb1b8 ovs-ofctl: Fix segfault due to bad meter n_bands. * Wed Mar 31 2021 Open vSwitch CI - 2.15.0-6 -- Merging upstream branch-2.15 [RH gerrit: 221cf613d7] +- Merging upstream branch-2.15 [RH git: 221cf613d7] Commit list: 3a716b1d9c dpif-netdev: Refactor and fix the buckets calculation. 73ece9c87b dpif-netdev: Fix the meter buckets overflow. * Mon Mar 22 2021 Kevin Traynor - 2.15.0-5 -- dpif-netdev: Allow PMD auto load balance with cross-numa. (#1941673) [RH gerrit: 47e2824210] +- dpif-netdev: Allow PMD auto load balance with cross-numa. [RH git: 47e2824210] (#1941673) commit ec68a877db5bbfba49ddeb9929479c033420ea6b Author: Kevin Traynor Date: Thu Mar 18 11:34:04 2021 +0000 @@ -928,11 +946,11 @@ exit 0 * Fri Mar 19 2021 Kevin Traynor - 2.15.0-4 -- redhat: Update docs for test builds [RH gerrit: 7620c95a37] +- redhat: Update docs for test builds [RH git: 7620c95a37] * Tue Mar 16 2021 Open vSwitch CI - 2.15.0-3 -- Merging upstream branch-2.15 [RH gerrit: c4fc969d7e] +- Merging upstream branch-2.15 [RH git: c4fc969d7e] Commit list: d5dc16670e python: Send notifications after the transaction ends. 556e65e179 ovs-ctl: Allow recording hostname separately. @@ -952,10 +970,10 @@ exit 0 * Tue Feb 16 2021 Timothy Redaelli - 2.15.0-2 -- build with ipsec support by default [RH gerrit: 105482aee7] +- build with ipsec support by default [RH git: 105482aee7] * Mon Feb 15 2021 Timothy Redaelli - 2.15.0-1 -- Use official 2.15.0 tarball [RH gerrit: 9e107c6359] +- Use official 2.15.0 tarball [RH git: 9e107c6359]