From patchwork Mon Jan 8 15:40:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1883775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DrIr03va; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T7z2j1h7Lz1yPX for ; Tue, 9 Jan 2024 02:47:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EB9036102A; Mon, 8 Jan 2024 15:47:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org EB9036102A Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DrIr03va X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XFFLkyF1T5re; Mon, 8 Jan 2024 15:47:06 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0049E60FF9; Mon, 8 Jan 2024 15:47:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0049E60FF9 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id AD18CC0077; Mon, 8 Jan 2024 15:47:04 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id C69C3C0037 for ; Mon, 8 Jan 2024 15:47:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A2BA983168 for ; Mon, 8 Jan 2024 15:47:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A2BA983168 Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DrIr03va X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDkMXD1clZpr for ; Mon, 8 Jan 2024 15:47:02 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6D0B88208F for ; Mon, 8 Jan 2024 15:47:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6D0B88208F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704728821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kd9Q5YKUmXv/53p6dPprwlMEhZbDj5kq7GovIelKn6g=; b=DrIr03vaBsX1BQsrb5cOY+jAy/IMF+gE0xHrz4dtDNnPG6cnJmaVpXv7+4Vvetaly5Hc2a Bd1QeE7mH3g1rfYhXIm84K6vkjOpQPnUgCYFNkqiY9YUUhpg1j1dVaVucMs+KmH88mpjHu Rtjn4oWZQp2qH8Szjxln7k0+D3EuYZI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-_6FbOPQRN5S9K2QdejENnQ-1; Mon, 08 Jan 2024 10:46:58 -0500 X-MC-Unique: _6FbOPQRN5S9K2QdejENnQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D9B953C025AC; Mon, 8 Jan 2024 15:46:57 +0000 (UTC) Received: from dceara.remote.csb (unknown [10.39.193.252]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D676492BC7; Mon, 8 Jan 2024 15:46:56 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Mon, 8 Jan 2024 16:40:16 +0100 Message-Id: <20240108154016.330559-1-dceara@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn] ovs: Bump submodule to include IDL "spurious delete" fix. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" 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 Acked-by: Ilya Maximets --- NOTE: when backporting this, please make sure the corresponding OVS branch-3.X versions of the submodule versions are used. The IDl fix is backported to all required versions. --- controller/ofctrl.c | 2 +- ovs | 2 +- tests/test-ovn.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controller/ofctrl.c b/controller/ofctrl.c index 7aac0128bc..cb460a2a47 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -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); diff --git a/ovs b/ovs index fdbf0bb2ae..4102674b3e 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit fdbf0bb2aed53e70b455eb1adcfda8d8278ea690 +Subproject commit 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 diff --git a/tests/test-ovn.c b/tests/test-ovn.c index aaf2825edc..5326c6e692 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -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; @@ -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);