Skip to content

Commit

Permalink
ovs: Bump submodule to branch-3.2.
Browse files Browse the repository at this point in the history
Specifically the following commit:
  4102674b3e ovsdb-idl: Preserve change_seqno when deleting rows.

Without it, in specific cases, the IDL might incorrectly report deletion
of yet to be seen records.

This commit differs from original by bumping OVS submodule to branch-3.2
related commit ec1d73016 ("ovsdb-idl: Preserve change_seqno when deleting
rows.")

Signed-off-by: Dumitru Ceara <[email protected]>
Acked-by: Ilya Maximets <[email protected]>
(cherry picked from commit 66ef670)
Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2024-October/417627.html
Signed-off-by: Vladislav Odintsov <[email protected]>
  • Loading branch information
dceara authored and odivlad committed Oct 11, 2024
1 parent d1f55ee commit 0deb517
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion controller/ofctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3059,7 +3059,7 @@ ofctrl_inject_pkt(const struct ovsrec_bridge *br_int, const char *flow_s,
uint64_t packet_stub[128 / 8];
struct dp_packet packet;
dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub);
flow_compose(&packet, &uflow, NULL, 64);
flow_compose(&packet, &uflow, NULL, 64, false);

uint64_t ofpacts_stub[1024 / 8];
struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub);
Expand Down
2 changes: 1 addition & 1 deletion ovs
Submodule ovs updated 72 files
+1 −1 .cirrus.yml
+1 −1 .github/workflows/build-and-test.yml
+4 −4 Documentation/faq/releases.rst
+4 −4 Documentation/intro/install/dpdk.rst
+2 −2 Documentation/topics/dpdk/vhost-user.rst
+7 −1 NEWS
+1 −1 configure.ac
+7 −1 debian/changelog
+11 −0 include/openvswitch/compiler.h
+1 −0 include/sparse/automake.mk
+34 −0 include/sparse/immintrin.h
+23 −11 lib/conntrack.c
+9 −2 lib/dp-packet.h
+6 −8 lib/dpctl.c
+3 −1 lib/dpdk.c
+1 −0 lib/dpif-netlink-rtnl.c
+36 −4 lib/flow.c
+1 −1 lib/flow.h
+4 −3 lib/hash.c
+30 −9 lib/ipf.c
+5 −5 lib/jhash.c
+1 −1 lib/match.c
+3 −1 lib/mcast-snooping.c
+25 −17 lib/netdev-dpdk.c
+2 −2 lib/netdev-dummy.c
+5 −1 lib/netdev-linux.c
+6 −4 lib/netdev-native-tnl.c
+1 −1 lib/netlink-notifier.c
+13 −0 lib/odp-execute-avx512.c
+2 −2 lib/odp-util.c
+1 −1 lib/ovs-rcu.c
+2 −0 lib/ovsdb-idl.c
+1 −1 lib/packets.c
+1 −0 lib/packets.h
+4 −4 lib/route-table.c
+9 −0 lib/socket-util.c
+1 −1 lib/table.c
+11 −11 lib/tc.c
+2 −0 lib/util.c
+5 −1 lib/vconn.c
+1 −1 lib/vlog.c
+1 −1 ofproto/bond.c
+1 −1 ofproto/ofproto-dpif-mirror.c
+3 −2 ofproto/ofproto-dpif-trace.c
+1 −1 ofproto/ofproto-dpif-trace.h
+16 −0 ofproto/ofproto-dpif-upcall.c
+1 −1 ofproto/ofproto-dpif-xlate.c
+16 −4 ofproto/ofproto-dpif.c
+3 −2 ovsdb/ovsdb-client.c
+18 −5 ovsdb/raft.c
+0 −1 ovsdb/transaction.c
+10 −3 python/ovs/db/custom_index.py
+10 −5 python/ovs/db/idl.py
+22 −21 python/ovs/flow/odp.py
+29 −0 python/ovs/tests/test_odp.py
+1 −0 python/test_requirements.txt
+1 −0 rhel/usr_lib_systemd_system_ovsdb-server.service
+4 −4 selinux/openvswitch-custom.te.in
+24 −7 tests/atlocal.in
+123 −24 tests/dpif-netdev.at
+188 −0 tests/ofproto-dpif.at
+5 −0 tests/ofproto-macros.at
+100 −4 tests/ovsdb-idl.at
+4 −22 tests/sendpkt.py
+6 −0 tests/system-dpdk.at
+269 −143 tests/system-traffic.at
+81 −0 tests/test-ovsdb.c
+16 −1 tests/test-ovsdb.py
+10 −3 tests/test-util.c
+29 −0 tests/tunnel.at
+1 −1 tests/vlog.at
+39 −8 utilities/ovs-ofctl.c
2 changes: 1 addition & 1 deletion tests/test-ovn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ test_expr_to_packets(struct ovs_cmdl_context *ctx OVS_UNUSED)
uint64_t packet_stub[128 / 8];
struct dp_packet packet;
dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub);
flow_compose(&packet, &uflow, NULL, 64);
flow_compose(&packet, &uflow, NULL, 64, false);

struct ds output = DS_EMPTY_INITIALIZER;
const uint8_t *buf = dp_packet_data(&packet);
Expand Down

0 comments on commit 0deb517

Please sign in to comment.