Skip to content
Snippets Groups Projects
Verified Commit 7a8a52a6 authored by Louis Abel's avatar Louis Abel :tv:
Browse files

update 2.15

parent 63cfbdd4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.openvswitch.metadata
+ 5
− 5
View file @ 7a8a52a6
085d42061d9336f768cb56038ff3456f21667f56dfba0a0449e115f773bcf7ae SOURCES/docutils-0.12.tar.gz
d8293c765539d47cf93736fcfe9182b711876d22d447c2d20450748c024f57d5 SOURCES/openvswitch-2.13.0.tar.gz
3be1033bfeeab7f88a934f66958941baa0204277723b4f14c5701cac771e093f SOURCES/Pygments-1.4.tar.gz
c11016bd195f49663889c67956bf2875baf9a98c91683bee322d7fc7ead07c07 SOURCES/Sphinx-1.1.3.tar.gz
467133968843677bb1c276bb74a3458aa7c002cc21e295c51e3bd65497b112ab SOURCES/dpdk-19.11.tar.xz
c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa SOURCES/docutils-0.12.tar.gz
70f76b2a100aa03091fd3daf7073aef21d2c1186bb1e726b857082b997577565 SOURCES/dpdk-20.11.tar.xz
1cce6eecb599299e7b4dff6e8700941d9c8589cb54cf2c179a28db169dc5c07e SOURCES/openvswitch-2.15.0.tar.gz
bbff02dc309e52846dd963d29483a7295fcc021624738d33359c43971080f9ab SOURCES/Pygments-1.4.tar.gz
94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04 SOURCES/Sphinx-1.2.3.tar.gz
SOURCES/openvswitch-2.15.0.patch
+ 243
− 15
View file @ 7a8a52a6
......@@ -18597,10 +18597,37 @@ index ae59ecf2c2..34d45b82a1 100644
} else if (retval < 0) {
VLOG_FATAL("waitpid failed (%s)", ovs_strerror(errno));
diff --git a/lib/dp-packet.h b/lib/dp-packet.h
index 9e2d06b3dd..cb3f30e5b6 100644
index 9e2d06b3dd..4e02425f7c 100644
--- a/lib/dp-packet.h
+++ b/lib/dp-packet.h
@@ -726,7 +726,6 @@ enum { NETDEV_MAX_BURST = 32 }; /* Maximum number packets in a batch. */
@@ -199,6 +199,7 @@ struct dp_packet *dp_packet_clone_data_with_headroom(const void *, size_t,
void dp_packet_resize(struct dp_packet *b, size_t new_headroom,
size_t new_tailroom);
static inline void dp_packet_delete(struct dp_packet *);
+static inline void dp_packet_swap(struct dp_packet *, struct dp_packet *);
static inline void *dp_packet_at(const struct dp_packet *, size_t offset,
size_t size);
@@ -256,6 +257,18 @@ dp_packet_delete(struct dp_packet *b)
}
}
+/* Swaps content of two packets. */
+static inline void
+dp_packet_swap(struct dp_packet *a, struct dp_packet *b)
+{
+ ovs_assert(a->source == DPBUF_MALLOC || a->source == DPBUF_STUB);
+ ovs_assert(b->source == DPBUF_MALLOC || b->source == DPBUF_STUB);
+ struct dp_packet c = *a;
+
+ *a = *b;
+ *b = c;
+}
+
/* If 'b' contains at least 'offset + size' bytes of data, returns a pointer to
* byte 'offset'. Otherwise, returns a null pointer. */
static inline void *
@@ -726,7 +739,6 @@ enum { NETDEV_MAX_BURST = 32 }; /* Maximum number packets in a batch. */
struct dp_packet_batch {
size_t count;
bool trunc; /* true if the batch needs truncate. */
......@@ -18608,7 +18635,7 @@ index 9e2d06b3dd..cb3f30e5b6 100644
struct dp_packet *packets[NETDEV_MAX_BURST];
};
@@ -735,7 +734,6 @@ dp_packet_batch_init(struct dp_packet_batch *batch)
@@ -735,7 +747,6 @@ dp_packet_batch_init(struct dp_packet_batch *batch)
{
batch->count = 0;
batch->trunc = false;
......@@ -18617,7 +18644,7 @@ index 9e2d06b3dd..cb3f30e5b6 100644
static inline void
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 4381c618f1..916b7917fa 100644
index 4381c618f1..3026a0619f 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -279,8 +279,9 @@ static bool dpcls_lookup(struct dpcls *cls,
......@@ -18851,15 +18878,35 @@ index 4381c618f1..916b7917fa 100644
if (put->ufid) {
ufid = *put->ufid;
} else {
@@ -4159,7 +4140,6 @@ dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute)
@@ -4158,8 +4139,10 @@ dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute)
flow_hash_5tuple(execute->flow, 0));
}
dp_packet_batch_init_packet(&pp, execute->packet);
- dp_packet_batch_init_packet(&pp, execute->packet);
- pp.do_not_steal = true;
+ /* Making a copy because the packet might be stolen during the execution
+ * and caller might still need it. */
+ struct dp_packet *packet_clone = dp_packet_clone(execute->packet);
+ dp_packet_batch_init_packet(&pp, packet_clone);
dp_netdev_execute_actions(pmd, &pp, false, execute->flow,
execute->actions, execute->actions_len);
dp_netdev_pmd_flush_output_packets(pmd, true);
@@ -4878,6 +4858,12 @@ struct rr_numa {
@@ -4169,6 +4152,14 @@ dpif_netdev_execute(struct dpif *dpif, struct dpif_execute *execute)
dp_netdev_pmd_unref(pmd);
}
+ if (dp_packet_batch_size(&pp)) {
+ /* Packet wasn't dropped during the execution. Swapping content with
+ * the original packet, because the caller might expect actions to
+ * modify it. */
+ dp_packet_swap(execute->packet, packet_clone);
+ dp_packet_delete_batch(&pp, true);
+ }
+
return 0;
}
@@ -4878,6 +4869,12 @@ struct rr_numa {
bool idx_inc;
};
......@@ -18872,7 +18919,7 @@ index 4381c618f1..916b7917fa 100644
static struct rr_numa *
rr_numa_list_lookup(struct rr_numa_list *rr, int numa_id)
{
@@ -5149,7 +5135,6 @@ reload_affected_pmds(struct dp_netdev *dp)
@@ -5149,7 +5146,6 @@ reload_affected_pmds(struct dp_netdev *dp)
CMAP_FOR_EACH (pmd, node, &dp->poll_threads) {
if (pmd->need_reload) {
......@@ -18880,7 +18927,7 @@ index 4381c618f1..916b7917fa 100644
dp_netdev_reload_pmd__(pmd);
}
}
@@ -5590,10 +5575,17 @@ get_dry_run_variance(struct dp_netdev *dp, uint32_t *core_list,
@@ -5590,10 +5586,17 @@ get_dry_run_variance(struct dp_netdev *dp, uint32_t *core_list,
for (int i = 0; i < n_rxqs; i++) {
int numa_id = netdev_get_numa_id(rxqs[i]->port->netdev);
numa = rr_numa_list_lookup(&rr, numa_id);
......@@ -18901,7 +18948,7 @@ index 4381c618f1..916b7917fa 100644
goto cleanup;
}
@@ -6203,12 +6195,14 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
@@ -6203,12 +6206,14 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
/* Update all bands and find the one hit with the highest rate for each
* packet (if any). */
for (int m = 0; m < meter->n_bands; ++m) {
......@@ -18920,7 +18967,7 @@ index 4381c618f1..916b7917fa 100644
}
/* Drain the bucket for all the packets, if possible. */
@@ -6226,8 +6220,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
@@ -6226,8 +6231,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
* (Only one band will be fired by a packet, and that
* can be different for each packet.) */
for (int i = band_exceeded_pkt; i < cnt; i++) {
......@@ -18931,7 +18978,7 @@ index 4381c618f1..916b7917fa 100644
exceeded_band[i] = m;
}
}
@@ -6246,8 +6240,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
@@ -6246,8 +6251,8 @@ dp_netdev_run_meter(struct dp_netdev *dp, struct dp_packet_batch *packets_,
/* Update the exceeding band for the exceeding packet.
* (Only one band will be fired by a packet, and that
* can be different for each packet.) */
......@@ -18942,7 +18989,7 @@ index 4381c618f1..916b7917fa 100644
exceeded_band[i] = m;
}
}
@@ -6329,16 +6323,14 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id,
@@ -6329,16 +6334,14 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id meter_id,
config->bands[i].burst_size = config->bands[i].rate;
}
......@@ -18964,7 +19011,7 @@ index 4381c618f1..916b7917fa 100644
if (band_max_delta_t > meter->max_delta_t) {
meter->max_delta_t = band_max_delta_t;
}
@@ -8493,6 +8485,7 @@ const struct dpif_class dpif_netdev_class = {
@@ -8493,6 +8496,7 @@ const struct dpif_class dpif_netdev_class = {
NULL, /* ct_timeout_policy_dump_next */
NULL, /* ct_timeout_policy_dump_done */
dpif_netdev_ct_get_timeout_policy_name,
......@@ -19138,6 +19185,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 +19737,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 +20304,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
......@@ -20508,6 +20595,21 @@ index 5fae46adfc..ccf97266c0 100644
cmap_destroy(&udpif->ukeys[i].cmap);
ovs_mutex_destroy(&udpif->ukeys[i].mutex);
}
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 7108c8a301..479e459fcb 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -7127,7 +7127,9 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len,
break;
case OFPACT_CT_CLEAR:
- compose_ct_clear_action(ctx);
+ if (ctx->conntracked) {
+ compose_ct_clear_action(ctx);
+ }
break;
case OFPACT_NAT:
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index fd0b2fdea0..5ce56adfae 100644
--- a/ofproto/ofproto-dpif.c
......@@ -21500,7 +21602,7 @@ index 199db8ed0f..59093c03c9 100644
bad_action 'fin_timeout(foo=bar)' "invalid key 'foo' in 'fin_timeout' argument"
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 31064ed95e..5567eed115 100644
index 31064ed95e..f99a60444f 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -342,6 +342,22 @@ AT_CHECK([test `egrep 'in_port\(6\)' br1_flows.txt |wc -l` -gt 3])
......@@ -21635,6 +21737,65 @@ index 31064ed95e..5567eed115 100644
# Makes sure recirculation does not change the way packet is handled.
AT_SETUP([ofproto-dpif - balance-tcp bonding, different recirc flow ])
OVS_VSWITCHD_START(
@@ -9520,6 +9596,26 @@ OFPST_TABLE reply (OF1.3) (xid=0x2):
OVS_VSWITCHD_STOP
AT_CLEANUP
+AT_SETUP([ofproto-dpif packet-out table meter drop])
+OVS_VSWITCHD_START
+add_of_ports br0 1 2
+
+AT_CHECK([ovs-ofctl -O OpenFlow13 add-meter br0 'meter=1 pktps bands=type=drop rate=1'])
+AT_CHECK([ovs-ofctl -O OpenFlow13 add-flow br0 'in_port=1 action=meter:1,output:2'])
+
+ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000400080000 actions=resubmit(,0)"
+ovs-ofctl -O OpenFlow13 packet-out br0 "in_port=1 packet=50540000000a50540000000908004500001c000000000011a4cd0a0101010a0101020001000400080000 actions=resubmit(,0)"
+
+# Check that vswitchd hasn't crashed by dumping the meter added above
+AT_CHECK([ovs-ofctl -O OpenFlow13 dump-meters br0 | ofctl_strip], [0], [dnl
+OFPST_METER_CONFIG reply (OF1.3):
+meter=1 pktps bands=
+type=drop rate=1
+])
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
+
AT_SETUP([ofproto-dpif - ICMPv6])
OVS_VSWITCHD_START
add_of_ports br0 1
@@ -10842,6 +10938,31 @@ dnl
NXT_PACKET_IN (xid=0x0): table_id=1 cookie=0x0 total_len=106 in_port=2 (via action) data_len=106 (unbuffered)
udp,vlan_tci=0x0000,dl_src=50:54:00:00:00:0a,dl_dst=50:54:00:00:00:09,nw_src=10.1.1.2,nw_dst=10.1.1.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=2,tp_dst=1 udp_csum:553
])
+
+dnl The next test verifies that ct_clear at the datapath only gets executed
+dnl if conntrack information is present.
+AT_DATA([flows.txt], [dnl
+table=0 in_port=1 actions=ct_clear,ct_clear,ct_clear,p2
+])
+AT_CHECK([ovs-ofctl del-flows br0])
+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=p1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2'], [0], [stdout])
+AT_CHECK([tail -1 stdout], [0],
+ [Datapath actions: 2
+])
+AT_DATA([flows.txt], [dnl
+table=0 in_port=1 ip actions=ct_clear,ct(table=1)
+table=1 in_port=1 actions=ct_clear,ct_clear,goto_table:2
+table=2 in_port=1 actions=ct_clear,p2
+])
+AT_CHECK([ovs-ofctl del-flows br0])
+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=p1,dl_src=50:54:00:00:00:05,dl_dst=50:54:00:00:00:07,dl_type=0x0800,nw_src=192.168.0.1,nw_dst=192.168.0.2'], [0], [stdout])
+AT_CHECK([grep Datapath stdout | sed 's/recirc(.*)/recirc(X)/'], [0],
+ [Datapath actions: ct,recirc(X)
+Datapath actions: ct_clear,2
+])
+
OVS_VSWITCHD_STOP
AT_CLEANUP
diff --git a/tests/ovs-ofctl.at b/tests/ovs-ofctl.at
index 5ddca67e71..604f15c2d1 100644
--- a/tests/ovs-ofctl.at
......@@ -23858,6 +24019,73 @@ index f0ad9f9793..cea48eb527 100644
import errno
import sys
diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at
index 48c5de9d19..12fc1ef910 100644
--- a/tests/tunnel-push-pop.at
+++ b/tests/tunnel-push-pop.at
@@ -595,6 +595,62 @@ OVS_WAIT_UNTIL([test `ovs-pcap p0.pcap | grep 50540000000a5054000000091235 | wc
OVS_VSWITCHD_STOP
AT_CLEANUP
+AT_SETUP([tunnel_push_pop - packet_out debug_slow])
+
+OVS_VSWITCHD_START(
+ [add-port br0 p0 dnl
+ -- set Interface p0 type=dummy ofport_request=1 dnl
+ other-config:hwaddr=aa:55:aa:55:00:00])
+AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg])
+AT_CHECK([ovs-vsctl add-br int-br -- set bridge int-br datapath_type=dummy])
+AT_CHECK([ovs-vsctl add-port int-br t2 dnl
+ -- set Interface t2 type=geneve options:remote_ip=1.1.2.92 dnl
+ options:key=123 ofport_request=2])
+
+dnl First setup dummy interface IP address, then add the route
+dnl so that tnl-port table can get valid IP address for the device.
+AT_CHECK([ovs-appctl netdev-dummy/ip4addr br0 1.1.2.88/24], [0], [OK
+])
+AT_CHECK([ovs-appctl ovs/route/add 1.1.2.92/24 br0], [0], [OK
+])
+AT_CHECK([ovs-ofctl add-flow br0 action=normal])
+
+dnl This ARP reply from p0 has two effects:
+dnl 1. The ARP cache will learn that 1.1.2.92 is at f8:bc:12:44:34:b6.
+dnl 2. The br0 mac learning will learn that f8:bc:12:44:34:b6 is on p0.
+AT_CHECK([
+ ovs-appctl netdev-dummy/receive p0 dnl
+ 'recirc_id(0),in_port(2),dnl
+ eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),dnl
+ arp(sip=1.1.2.92,tip=1.1.2.88,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)'
+])
+
+AT_CHECK([ovs-vsctl -- set Interface p0 options:tx_pcap=p0.pcap])
+
+packet=50540000000a505400000009123
+encap=f8bc124434b6aa55aa5500000800450000320000400040113406010102580101025c83a917c1001e00000000655800007b00
+
+dnl Output to tunnel from a int-br internal port.
+dnl Checking that the packet arrived and it was correctly encapsulated.
+AT_CHECK([ovs-ofctl add-flow int-br "in_port=LOCAL,actions=debug_slow,output:2"])
+AT_CHECK([ovs-appctl netdev-dummy/receive int-br "${packet}4"])
+OVS_WAIT_UNTIL([test `ovs-pcap p0.pcap | grep "${encap}${packet}4" | wc -l` -ge 1])
+dnl Sending again to exercise the non-miss upcall path.
+AT_CHECK([ovs-appctl netdev-dummy/receive int-br "${packet}4"])
+OVS_WAIT_UNTIL([test `ovs-pcap p0.pcap | grep "${encap}${packet}4" | wc -l` -ge 2])
+
+dnl Output to tunnel from the controller.
+AT_CHECK([ovs-ofctl -O OpenFlow13 packet-out int-br CONTROLLER "debug_slow,output:2" "${packet}5"])
+OVS_WAIT_UNTIL([test `ovs-pcap p0.pcap | grep "${encap}${packet}5" | wc -l` -ge 1])
+
+dnl Datapath actions should not have tunnel push action.
+AT_CHECK([ovs-appctl dpctl/dump-flows | grep -q tnl_push], [1])
+dnl There should be slow_path action instead.
+AT_CHECK([ovs-appctl dpctl/dump-flows | grep -q 'slow_path(action)'], [0])
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
+
AT_SETUP([tunnel_push_pop - underlay bridge match])
OVS_VSWITCHD_START([add-port br0 p0 -- set Interface p0 type=dummy ofport_request=1 other-config:hwaddr=aa:55:aa:55:00:00])
diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
index bc6bfae15a..ac14da29b1 100755
--- a/utilities/checkpatch.py
......
SPECS/openvswitch2.15.spec
+ 79
− 34
View file @ 7a8a52a6
......@@ -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: 38%{?dist}
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
......@@ -697,46 +697,91 @@ exit 0
%endif
%changelog
* Wed Sep 15 2021 Timothy Redaelli <tredaelli@redhat.com> - 2.15.0-38
- ofproto-dpif-xlate: Avoid successive ct_clear datapath actions. [RH git: f9a9ac7608] (#1941027)
Due to flow lookup optimizations, especially in the resubmit/clone cases,
we might end up with multiple ct_clear actions, which are not necessary.
This patch only adds the ct_clear action to the datapath if any ct state
is tracked.
Resolves: #1941027
Signed-off-by: Eelco Chaudron <echaudro@redhat.com>
Acked-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
(cherry picked from commit 355fef6f2ccbcf78797b938421cb4cef9b59af13)
* Wed Sep 08 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.15.0-37
- Merging upstream branch-2.15 [RH git: b36eb7e529]
Commit list:
ef8ca3e190 dpif-netdev: Fix crash when PACKET_OUT is metered.
* Tue Aug 17 2021 Michael Santana <msantana@redhat.com> - 2.15.0-36
- Migrate openvswitch to gitlab [RH git: 93147e2cda]
Signed-off-by: Michael Santana <msantana@redhat.com>
* Mon Aug 16 2021 Open vSwitch CI <ovs-ci@redhat.com> - 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 <msantana@redhat.com> - 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 <msantana@redhat.com>
* Mon Aug 16 2021 Open vSwitch CI <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 +802,13 @@ exit 0
* Wed Jun 30 2021 Timothy Redaelli <tredaelli@redhat.com> - 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 <tredaelli@redhat.com> - 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 +816,7 @@ exit 0
* Fri Jun 11 2021 Open vSwitch CI <ovs-ci@redhat.com> - 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 +824,7 @@ exit 0
* Thu May 27 2021 Open vSwitch CI <ovs-ci@redhat.com> - 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 +833,37 @@ exit 0
* Wed May 19 2021 Open vSwitch CI <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <ovs-ci@redhat.com> - 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 <tredaelli@redhat.com> - 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 <ovs-ci@redhat.com> - 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 +871,42 @@ exit 0
* Mon May 10 2021 Open vSwitch CI <ovs-team@redhat.com> - 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 <ovs-team@redhat.com> - 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 <aconole@redhat.com> - 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 <aconole@redhat.com> - 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 <tredaelli@redhat.com> - 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 <ovs-team@redhat.com> - 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 <msantana@redhat.com> - 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 +916,13 @@ exit 0
* Thu Apr 01 2021 Open vSwitch CI <ovs-team@redhat.com> - 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 <ovs-team@redhat.com> - 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 +930,20 @@ exit 0
* Wed Mar 31 2021 Open vSwitch CI <ovs-team@redhat.com> - 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 <ovs-team@redhat.com> - 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 <ktraynor@redhat.com> - 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 <ktraynor@redhat.com>
Date: Thu Mar 18 11:34:04 2021 +0000
......@@ -928,11 +973,11 @@ exit 0
* Fri Mar 19 2021 Kevin Traynor <ktraynor@redhat.com> - 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 <ovs-team@redhat.com> - 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 +997,10 @@ exit 0
* Tue Feb 16 2021 Timothy Redaelli <tredaelli@redhat.com> - 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 <tredaelli@redhat.com> - 2.15.0-1
- Use official 2.15.0 tarball [RH gerrit: 9e107c6359]
- Use official 2.15.0 tarball [RH git: 9e107c6359]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment