Skip to content

Commit

Permalink
ovs: Bump submodule to include IDL "spurious delete" fix.
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.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
  • Loading branch information
dceara committed Jan 9, 2024
1 parent 8b15ea3 commit 66ef670
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion controller/ofctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -3045,7 +3045,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 92 files
+5 −3 .ci/dpdk-build.sh
+22 −4 .ci/linux-build.sh
+1 −1 .cirrus.yml
+8 −5 .editorconfig
+40 −8 .github/workflows/build-and-test.yml
+1 −0 Documentation/automake.mk
+4 −4 Documentation/faq/releases.rst
+1 −0 Documentation/index.rst
+58 −0 Documentation/internals/contributing/inclusive-language.rst
+1 −0 Documentation/internals/contributing/index.rst
+10 −6 Documentation/internals/release-process.rst
+4 −8 Documentation/intro/install/afxdp.rst
+2 −2 Documentation/topics/dpdk/phy.rst
+30 −4 Documentation/topics/dpdk/pmd.rst
+30 −0 NEWS
+1 −1 appveyor.yml
+1 −1 build-aux/extract-ofp-fields
+4 −0 include/openflow/nicira-ext.h
+10 −4 include/openvswitch/ofp-ct.h
+4 −0 include/openvswitch/ofp-prop.h
+2 −0 lib/automake.mk
+45 −6 lib/classifier.c
+3 −1 lib/classifier.h
+8 −6 lib/conntrack.c
+5 −2 lib/conntrack.h
+50 −15 lib/ct-dpif.c
+8 −8 lib/ct-dpif.h
+168 −0 lib/dp-packet-gso.c
+23 −0 lib/dp-packet-gso.h
+3 −0 lib/dp-packet.c
+33 −0 lib/dp-packet.h
+44 −50 lib/dpctl.c
+3 −0 lib/dpif-netdev-private-thread.h
+248 −43 lib/dpif-netdev.c
+6 −23 lib/dpif-netlink.c
+11 −13 lib/dpif-provider.h
+15 −2 lib/flow.c
+1 −1 lib/flow.h
+16 −1 lib/mcast-snooping.c
+25 −8 lib/netdev-afxdp.c
+1 −1 lib/netdev-afxdp.h
+116 −37 lib/netdev-dpdk.c
+17 −6 lib/netdev-dummy.c
+1 −0 lib/netdev-linux-private.h
+200 −32 lib/netdev-linux.c
+3 −1 lib/netdev-offload-tc.c
+88 −51 lib/netdev.c
+189 −4 lib/ofp-ct.c
+42 −0 lib/ofp-prop.c
+3 −2 lib/ovs-router.c
+9 −2 lib/ovsdb-idl.c
+2 −2 lib/packets.c
+2 −1 lib/tc.h
+3 −3 lib/tnl-ports.c
+1 −1 ofproto/ofproto-dpif-trace.c
+61 −6 ofproto/ofproto-dpif-xlate.c
+72 −9 ofproto/ofproto-dpif.c
+7 −1 ofproto/ofproto-dpif.h
+13 −0 ofproto/ofproto-provider.h
+23 −0 ofproto/ofproto.c
+4 −0 ofproto/ofproto.h
+1 −0 ofproto/tunnel.c
+4 −1 python/test_requirements.txt
+1 −5 tests/automake.mk
+23 −3 tests/checkpatch.at
+99 −0 tests/classifier.at
+7 −1 tests/dpctl.at
+186 −24 tests/dpif-netdev.at
+26 −30 tests/genpkts.py
+330 −8 tests/mcast-snooping.at
+102 −0 tests/ofp-print.at
+1 −0 tests/ofproto-macros.at
+36 −0 tests/ovs-ofctl.at
+86 −2 tests/ovs-vsctl.at
+50 −0 tests/ovsdb-idl.at
+350 −28 tests/pmd.at
+10 −0 tests/system-common-macros.at
+132 −7 tests/system-dpdk-macros.at
+2 −0 tests/system-dpdk-testsuite.at
+142 −477 tests/system-dpdk.at
+5 −3 tests/system-offloads-traffic.at
+367 −80 tests/system-traffic.at
+4 −4 tests/test-classifier.c
+44 −0 tests/tunnel.at
+11 −2 utilities/checkpatch.py
+9 −6 utilities/ovs-ofctl.8.in
+54 −44 utilities/ovs-ofctl.c
+24 −7 utilities/ovs-vsctl.8.in
+135 −5 utilities/ovs-vsctl.c
+64 −18 vswitchd/bridge.c
+12 −2 vswitchd/vswitch.ovsschema
+66 −4 vswitchd/vswitch.xml
4 changes: 2 additions & 2 deletions tests/test-ovn.c
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ test_tree_shape_exhaustively(struct expr *expr, struct shash *symtab,

if (operation >= OP_FLOW) {
bool found = classifier_lookup(&cls, OVS_VERSION_MIN,
&f, NULL) != NULL;
&f, NULL, NULL) != NULL;
if (expected != found) {
struct ds expr_s, modified_s;

Expand Down 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 66ef670

Please sign in to comment.