From patchwork Sun Oct 13 08:55:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1996491 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=k2.cloud header.i=@k2.cloud header.a=rsa-sha256 header.s=cloudmail header.b=ZkOx3B+Y; 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 4XRDkW6FnYz1xtp for ; Sun, 13 Oct 2024 19:56:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id EFFC7608D3; Sun, 13 Oct 2024 08:56:46 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cKvr0sv8ZSHp; Sun, 13 Oct 2024 08:56:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AECC360845 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=k2.cloud header.i=@k2.cloud header.a=rsa-sha256 header.s=cloudmail header.b=ZkOx3B+Y Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id AECC360845; Sun, 13 Oct 2024 08:56:45 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 877ABC08A6; Sun, 13 Oct 2024 08:56:45 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 17EB9C08A3 for ; Sun, 13 Oct 2024 08:56:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F2B406084F for ; Sun, 13 Oct 2024 08:56:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id GB4lOGmNgR-G for ; Sun, 13 Oct 2024 08:56:42 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=109.73.14.253; helo=mail2.k2.cloud; envelope-from=vlodintsov@k2.cloud; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 8DF8E60845 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=k2.cloud DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8DF8E60845 Received: from mail2.k2.cloud (mail2.k2.cloud [109.73.14.253]) by smtp3.osuosl.org (Postfix) with ESMTPS id 8DF8E60845 for ; Sun, 13 Oct 2024 08:56:38 +0000 (UTC) From: Vladislav Odintsov DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=k2.cloud; s=cloudmail; t=1728809795; bh=d/4gnUubej9Hz+w0uHB2cqpdqqBHi05/HmFBp2bh49E=; h=From:To:Cc:Subject:Date; b=ZkOx3B+YQkNpx4aQcuxmDxVi4tq95ScLi6PIMzgD/Wyp0YfFRB1dpLsrLktBamHNe p0iyA6Iv0nUEWbblhW+IsSGyGSsxaXElwKyTv9XbhveQbcgTzi/1HeotYDBEPjrDZ0 Yz5BRTzukgcDJ+KOktFSMjfrYOlsEMGQxfCAJt0A= To: dev@openvswitch.org Date: Sun, 13 Oct 2024 11:55:08 +0300 Message-Id: <20241013085510.84940-1-vlodintsov@k2.cloud> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH ovn branch-23.09] ovs: Bump submodule to branch-3.2. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilya Maximets , Dumitru Ceara Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Dumitru Ceara 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 Acked-by: Ilya Maximets (cherry picked from commit 66ef6709678486f7abf88db10eed15fb72edcc4a) Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2024-October/417627.html Signed-off-by: Vladislav Odintsov --- The current revision differs from original commit referred above: - ovs submodule commit sha if another - discarded change at classifier_lookup() - adjusted commit message @Dumitru, @Ilya, I'm not aware of a correct handling of Signed-off-by and Acked-By tags and commit content & message modification when cherry-picking, just wanted to save credits. So if it is not right to keep them, or to modify backport so please let me know, I can re-send v2 as a normal non-backport patch. --- controller/ofctrl.c | 2 +- ovs | 2 +- tests/test-ovn.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/ofctrl.c b/controller/ofctrl.c index 497890eed..718baac18 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -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); diff --git a/ovs b/ovs index c88a35fc2..c2f287013 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit c88a35fc29f0c0eb6189853bfc738c2100d4860f +Subproject commit c2f287013025ad5b0c40e0c7fc3a9042d4899ce1 diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 16d2d779d..6f38b1493 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -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);