From b3acf00c6b31c96476b1410c1472bebcabb30c2e Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Apr 14 2021 17:53:24 +0000 Subject: Import openvswitch2.15-2.15.0-11 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 0cf4c21..ac7509c 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -325,7 +325,7 @@ index 4381c618f1..251788b049 100644 meter->max_delta_t = band_max_delta_t; } diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c -index 6be23dbeed..15b25084b3 100644 +index 6be23dbeed..f87a200756 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1255,21 +1255,21 @@ netdev_linux_batch_rxq_recv_sock(struct netdev_rxq_linux *rx, int mtu, @@ -364,6 +364,15 @@ index 6be23dbeed..15b25084b3 100644 } do { +@@ -2572,7 +2572,7 @@ exit: + static struct tc_police + tc_matchall_fill_police(uint32_t kbits_rate, uint32_t kbits_burst) + { +- unsigned int bsize = MIN(UINT32_MAX / 1024, kbits_burst) * 1024 / 64; ++ unsigned int bsize = MIN(UINT32_MAX / 1024, kbits_burst) * 1024 / 8; + unsigned int bps = ((uint64_t) kbits_rate * 1000) / 8; + struct tc_police police; + struct tc_ratespec rate; diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index e2e829772a..0342a228b7 100644 --- a/lib/ofp-actions.c @@ -959,6 +968,20 @@ index 5850ac7abf..4226d1cb2f 100644 def __check_server_db(self): """Returns True if this is a valid server database, False otherwise.""" +diff --git a/tests/atlocal.in b/tests/atlocal.in +index 02e2dc57f2..cfca7e1926 100644 +--- a/tests/atlocal.in ++++ b/tests/atlocal.in +@@ -175,6 +175,9 @@ find_command() + # Set HAVE_NC + find_command nc + ++# Set HAVE_TC ++find_command tc ++ + # Determine correct netcat option to quit on stdin EOF + if nc --version 2>&1 | grep -q nmap.org; then + # Nmap netcat diff --git a/tests/automake.mk b/tests/automake.mk index 677b99a6b4..fc80e027df 100644 --- a/tests/automake.mk @@ -1150,6 +1173,37 @@ index 31064ed95e..24bbd884ca 100644 dnl Advance time by 1 second. AT_CHECK([ovs-appctl time/warp 1000], [0], [ignore]) +diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at +index c8babe3612..1f1fc3c79a 100644 +--- a/tests/ovs-vsctl.at ++++ b/tests/ovs-vsctl.at +@@ -1639,3 +1639,26 @@ AT_CHECK([grep "server name" ovsdb-server.log], [0], + + OVS_VSCTL_CLEANUP + AT_CLEANUP ++ ++dnl ---------------------------------------------------------------------- ++AT_BANNER([set ingress policing test]) ++ ++AT_SETUP([set ingress_policing_rate and ingress_policing_burst]) ++AT_KEYWORDS([ingress_policing]) ++OVS_VSCTL_SETUP ++AT_CHECK([RUN_OVS_VSCTL_TOGETHER( ++ [add-br a], ++ [add-port a a1], ++ [set interface a1 ingress_policing_rate=100], ++ [set interface a1 ingress_policing_burst=10], ++ [--columns=ingress_policing_burst,ingress_policing_rate list interface a1])], ++ [0], ++ [ ++ ++ ++ ++ingress_policing_burst: 10 ++ingress_policing_rate: 100 ++]) ++OVS_VSCTL_CLEANUP ++AT_CLEANUP diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at index 8d777a0275..5e3b26aea8 100644 --- a/tests/ovsdb-client.at @@ -2324,6 +2378,64 @@ index 4b4791a7da..62181dd4de 100644 +008: table simple: i=1 r=2 b=true s= u=<0> ia=[] ra=[] ba=[] sa=[] ua=[] uuid=<2> 009: done ]]) +diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at +index 4f601ef939..c8e4c68fae 100644 +--- a/tests/system-offloads-traffic.at ++++ b/tests/system-offloads-traffic.at +@@ -70,3 +70,53 @@ AT_CHECK([ovs-appctl upcall/show | grep -E "offloaded flows : [[1-9]]"], [0], [i + + OVS_TRAFFIC_VSWITCHD_STOP + AT_CLEANUP ++ ++AT_SETUP([offloads - set ingress_policing_rate and ingress_policing_burst - offloads disabled]) ++AT_KEYWORDS([ingress_policing]) ++AT_SKIP_IF([test $HAVE_TC = "no"]) ++OVS_TRAFFIC_VSWITCHD_START() ++AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:hw-offload=false]) ++AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ++ADD_NAMESPACES(at_ns0) ++ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") ++AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_rate=100]) ++AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_burst=10]) ++AT_CHECK([ovs-vsctl --columns=other_config list open], [0], [dnl ++other_config : {hw-offload="false"} ++]) ++AT_CHECK([tc -o -s -d filter show dev ovs-p0 ingress | ++ sed -n 's/.*\(rate [[0-9]]*[[a-zA-Z]]* burst [[0-9]]*[[a-zA-Z]]*\).*/\1/; T; p; q'], ++ [0],[dnl ++rate 100Kbit burst 1280b ++]) ++AT_CHECK([tc -s -d filter show dev ovs-p0 ingress | grep basic | ++ sed -n 's/.*\(basic\).*/\1/; T; p; q'], [0], [dnl ++basic ++]) ++OVS_TRAFFIC_VSWITCHD_STOP ++AT_CLEANUP ++ ++AT_SETUP([offloads - set ingress_policing_rate and ingress_policing_burst - offloads enabled]) ++AT_KEYWORDS([ingress_policing]) ++AT_SKIP_IF([test $HAVE_TC = "no"]) ++OVS_TRAFFIC_VSWITCHD_START() ++AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:hw-offload=true]) ++AT_CHECK([ovs-ofctl add-flow br0 "actions=normal"]) ++ADD_NAMESPACES(at_ns0) ++ADD_VETH(p0, at_ns0, br0, "10.1.1.1/24") ++AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_rate=100]) ++AT_CHECK([ovs-vsctl set interface ovs-p0 ingress_policing_burst=10]) ++AT_CHECK([ovs-vsctl --columns=other_config list open], [0], [dnl ++other_config : {hw-offload="true"} ++]) ++AT_CHECK([tc -o -s -d filter show dev ovs-p0 ingress | ++ sed -n 's/.*\(rate [[0-9]]*[[a-zA-Z]]* burst [[0-9]]*[[a-zA-Z]]*\).*/\1/; T; p; q'], ++ [0],[dnl ++rate 100Kbit burst 1280b ++]) ++AT_CHECK([tc -o -s -d filter show dev ovs-p0 ingress | grep matchall | ++ sed -n 's/.*\(matchall\).*/\1/; T; p; q'], [0], [dnl ++matchall ++]) ++OVS_TRAFFIC_VSWITCHD_STOP ++AT_CLEANUP diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c index 15433e3472..a886f971e7 100644 --- a/tests/test-ovsdb.c diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 31e6fef..35ca2f8 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: 9%{?dist} +Release: 11%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -697,39 +697,109 @@ exit 0 %endif %changelog +* Wed Apr 14 2021 Open vSwitch CI - 2.15.0-11 +- Merging upstream branch-2.15 [RH gerrit: 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] + 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 + longer + + Signed-off-by: Michael Santana + + * Thu Apr 01 2021 Open vSwitch CI - 2.15.0-9 -- Merging upstream branch-2.15 - [504b67ec8d91641bafdf73b29456b3447b396bda] +- Merging upstream branch-2.15 [RH gerrit: 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 - [147a0970bec73a4133ac1fbeebb0cd16887f2e21] +- Merging upstream branch-2.15 [RH gerrit: 147a0970be] + Commit list: + b9ab7827ec ovsdb-idl: Mark arc sources as updated when destination is deleted. + c82d2e3fbc ovsdb-idl: Preserve references for deleted rows. + 9a24ecbc2a ovsdb-idl.at: Make test outputs more predictable. + * Wed Mar 31 2021 Open vSwitch CI - 2.15.0-7 -- Merging upstream branch-2.15 - [cbb083630e893c069842cbad76381b677dd15298] +- Merging upstream branch-2.15 [RH gerrit: 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 - [221cf613d702776d42a960a0ab99da970d50b555] +- Merging upstream branch-2.15 [RH gerrit: 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) - [47e2824210c7a4368aa6cb8044fecffcb4674dd2] +- dpif-netdev: Allow PMD auto load balance with cross-numa. (#1941673) [RH gerrit: 47e2824210] + commit ec68a877db5bbfba49ddeb9929479c033420ea6b + Author: Kevin Traynor + Date: Thu Mar 18 11:34:04 2021 +0000 + + dpif-netdev: Allow PMD auto load balance with cross-numa. + + Previously auto load balance did not trigger a reassignment when + there was any cross-numa polling as an rxq could be polled from a + different numa after reassign and it could impact estimates. + + In the case where there is only one numa with pmds available, the + same numa will always poll before and after reassignment, so estimates + are valid. Allow PMD auto load balance to trigger a reassignment in + this case. + + Acked-by: Eelco Chaudron + Acked-by: David Marchand + Tested-by: Sunil Pai G + Acked-by: Flavio Leitner + Signed-off-by: Kevin Traynor + Signed-off-by: Ilya Maximets + + Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1941673 + Conflicts: Commit backported from upstream master branch. Commit not + present on upstream branch-2.15. Removed NEWS file update as could cause + future merge conflicts. + * Fri Mar 19 2021 Kevin Traynor - 2.15.0-4 -- redhat: Update docs for test builds - [7620c95a37c78451988a0be905237990dd2af166] +- redhat: Update docs for test builds [RH gerrit: 7620c95a37] + * Tue Mar 16 2021 Open vSwitch CI - 2.15.0-3 -- Merging upstream branch-2.15 - [c4fc969d7eeee55f3b6b248018c9575a83710044] +- Merging upstream branch-2.15 [RH gerrit: c4fc969d7e] + Commit list: + d5dc16670e python: Send notifications after the transaction ends. + 556e65e179 ovs-ctl: Allow recording hostname separately. + 3982aee455 dpif-netdev: Fix crash when add dp flow without in_port field. + 02096f1b37 Documentation: Fix DPDK qos example. + 8f1dda3164 raft: Report disconnected in cluster/status if candidate retries election. + 79e9749daa raft: Reintroduce jsonrpc inactivity probes. + 2e84a4adb1 ovsdb-cs: Fix use-after-free for the request id. + d2c311dce8 connmgr: Check nullptr inside ofmonitor_report(). + 7307af6908 ovsdb-client: Fix needs-conversion when SERVER is explicitly specified. + 2a7a635718 windows, tests: Modify service test. + 9b48549c68 netdev-linux: Fix indentation. + 861a9f3b4d ofproto-dpif-upcall: Fix ukey leak on udpif destroy. + 339044c3cc ci: Use parallel build for distcheck. + 38744b1bcb ofp-actions: Fix use-after-free while decoding RAW_ENCAP. + 33abe6c052 Prepare for 2.15.1. + * Tue Feb 16 2021 Timothy Redaelli - 2.15.0-2 -- build with ipsec support by default - [105482aee70fd8c98e848e260e82a135bc84d2ed] +- build with ipsec support by default [RH gerrit: 105482aee7] + * Mon Feb 15 2021 Timothy Redaelli - 2.15.0-1 -- Use official 2.15.0 tarball - [9e107c6359c1fe18fb0083ffea5de739a62b21a6] +- Use official 2.15.0 tarball [RH gerrit: 9e107c6359] +