{"id":2095630,"url":"http://patchwork.ozlabs.org/api/patches/2095630/?format=json","web_url":"http://patchwork.ozlabs.org/project/ovn/patch/20250609173539.1636916-4-mmichels@redhat.com/","project":{"id":68,"url":"http://patchwork.ozlabs.org/api/projects/68/?format=json","name":"Open Virtual Network development","link_name":"ovn","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20250609173539.1636916-4-mmichels@redhat.com>","list_archive_url":null,"date":"2025-06-09T17:35:22","name":"[ovs-dev,03/14] lflow-mgr: Use one ovn_datapaths arg for ovn_dp_group_create().","commit_ref":null,"pull_url":null,"state":"deferred","archived":false,"hash":"8d34d8aa8c2073d012b32b1d3e74964861aa55bd","submitter":{"id":71978,"url":"http://patchwork.ozlabs.org/api/people/71978/?format=json","name":"Mark Michelson","email":"mmichels@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/ovn/patch/20250609173539.1636916-4-mmichels@redhat.com/mbox/","series":[{"id":460139,"url":"http://patchwork.ozlabs.org/api/series/460139/?format=json","web_url":"http://patchwork.ozlabs.org/project/ovn/list/?series=460139","date":"2025-06-09T17:35:19","name":"Logical Flow Sync Refactor.","version":1,"mbox":"http://patchwork.ozlabs.org/series/460139/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2095630/comments/","check":"success","checks":"http://patchwork.ozlabs.org/api/patches/2095630/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@legolas.ozlabs.org","ovs-dev@lists.linuxfoundation.org"],"Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=goB2G+43;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=140.211.166.133; helo=smtp2.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)","smtp2.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key)\n header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=goB2G+43","smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com","smtp3.osuosl.org; dkim=pass (1024-bit key,\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=goB2G+43"],"Received":["from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4bGJwt04vxz1yZ1\n\tfor ; Tue, 10 Jun 2025 03:35:41 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp2.osuosl.org (Postfix) with ESMTP id 277FB41E0C;\n\tMon, 9 Jun 2025 17:35:53 +0000 (UTC)","from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id axYclMO4mKfo; Mon, 9 Jun 2025 17:35:49 +0000 (UTC)","from lists.linuxfoundation.org (lf-lists.osuosl.org\n [IPv6:2605:bc80:3010:104::8cd3:938])\n\tby smtp2.osuosl.org (Postfix) with ESMTPS id 1615241D7B;\n\tMon, 9 Jun 2025 17:35:49 +0000 (UTC)","from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id DD2C5C0AC6;\n\tMon, 9 Jun 2025 17:35:48 +0000 (UTC)","from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id EB76BC0AC5\n for ; Mon, 9 Jun 2025 17:35:46 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id D00A5613CE\n for ; Mon, 9 Jun 2025 17:35:46 +0000 (UTC)","from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id CAuN9R3crGiA for ;\n Mon, 9 Jun 2025 17:35:46 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp3.osuosl.org (Postfix) with ESMTPS id 04AA861098\n for ; Mon, 9 Jun 2025 17:35:45 +0000 (UTC)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-589-hNT04oIlPIuZgO_RvAZoqQ-1; Mon,\n 09 Jun 2025 13:35:43 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 2AE44180028D\n for ; Mon, 9 Jun 2025 17:35:43 +0000 (UTC)","from localhost.localdomain.com (unknown [10.22.58.15])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id B03EA1800284\n for ; Mon, 9 Jun 2025 17:35:42 +0000 (UTC)"],"X-Virus-Scanned":["amavis at osuosl.org","amavis at osuosl.org"],"X-Comment":"SPF check N/A for local connections -\n client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver= ","DKIM-Filter":["OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1615241D7B","OpenDKIM Filter v2.11.0 smtp3.osuosl.org 04AA861098"],"Received-SPF":"Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=mmichels@redhat.com;\n receiver=","DMARC-Filter":"OpenDMARC Filter v1.4.2 smtp3.osuosl.org 04AA861098","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1749490545;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=e0IhxgJeAyYjPW/j09cCQEfsasa9z/3aW3PR305u4A8=;\n b=goB2G+43PpPCJe64yU7d1doTg1i0cP29dkaA045FFzJXCeQvZWIzf8nKUlU5qbEW5M76YY\n Rg0JoIXlDJYz9CtjEZPr35TEstocedqEkKIESc5aWVH0I391rMNRWGImv3dlr0sHeSWHeX\n G56Gx5FeSqBd4HDdYJdgxHmwLYb7Xm4=","X-MC-Unique":"hNT04oIlPIuZgO_RvAZoqQ-1","X-Mimecast-MFC-AGG-ID":"hNT04oIlPIuZgO_RvAZoqQ_1749490543","To":"dev@openvswitch.org","Date":"Mon, 9 Jun 2025 13:35:22 -0400","Message-ID":"<20250609173539.1636916-4-mmichels@redhat.com>","In-Reply-To":"<20250609173539.1636916-1-mmichels@redhat.com>","References":"<20250609173539.1636916-1-mmichels@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"MYHAqYWjP0GEIyYhEABreieDhWqHjAVuZCeiv8PkGHM_1749490543","X-Mimecast-Originator":"redhat.com","Subject":"[ovs-dev] [PATCH ovn 03/14] lflow-mgr: Use one ovn_datapaths arg\n for ovn_dp_group_create().","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.30","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","From":"Mark Michelson via dev ","Reply-To":"Mark Michelson ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"ovs-dev-bounces@openvswitch.org","Sender":"\"dev\" "},"content":"Every caller of this function is aware of the type of datapath group\nthey are creating and therefore only needs to pass a single type of\ndatapaths in.\n\nSigned-off-by: Mark Michelson \n---\n northd/en-sync-sb.c | 6 ++----\n northd/lflow-mgr.c | 18 ++++++------------\n northd/lflow-mgr.h | 6 ++----\n 3 files changed, 10 insertions(+), 20 deletions(-)","diff":"diff --git a/northd/en-sync-sb.c b/northd/en-sync-sb.c\nindex 0a68d1d65..52f1c8206 100644\n--- a/northd/en-sync-sb.c\n+++ b/northd/en-sync-sb.c\n@@ -793,8 +793,7 @@ sync_sb_lb_record(struct sb_lb_record *sb_lb,\n sb_lb->ls_dpg = ovn_dp_group_create(\n ovnsb_txn, &sb_lbs->ls_dp_groups, sbrec_ls_dp_group,\n lb_dps->n_nb_ls, lb_dps->nb_ls_map,\n- ods_size(ls_datapaths), true,\n- ls_datapaths, lr_datapaths);\n+ ods_size(ls_datapaths), ls_datapaths);\n }\n \n if (chassis_features->ls_dpg_column) {\n@@ -848,8 +847,7 @@ sync_sb_lb_record(struct sb_lb_record *sb_lb,\n sb_lb->lr_dpg = ovn_dp_group_create(\n ovnsb_txn, &sb_lbs->lr_dp_groups, sbrec_lr_dp_group,\n lb_dps->n_nb_lr, lb_dps->nb_lr_map,\n- ods_size(lr_datapaths), false,\n- ls_datapaths, lr_datapaths);\n+ ods_size(lr_datapaths), lr_datapaths);\n }\n \n sbrec_load_balancer_set_lr_datapath_group(sbrec_lb,\ndiff --git a/northd/lflow-mgr.c b/northd/lflow-mgr.c\nindex a1e962ee2..4456d9ea6 100644\n--- a/northd/lflow-mgr.c\n+++ b/northd/lflow-mgr.c\n@@ -761,9 +761,7 @@ ovn_dp_group_create(struct ovsdb_idl_txn *ovnsb_txn,\n size_t desired_n,\n const unsigned long *desired_bitmap,\n size_t bitmap_len,\n- bool is_switch,\n- const struct ovn_datapaths *ls_datapaths,\n- const struct ovn_datapaths *lr_datapaths)\n+ const struct ovn_datapaths *datapaths)\n {\n struct ovn_dp_group *dpg;\n \n@@ -775,10 +773,8 @@ ovn_dp_group_create(struct ovsdb_idl_txn *ovnsb_txn,\n for (i = 0; sb_group && i < sb_group->n_datapaths; i++) {\n struct ovn_datapath *datapath_od;\n \n- datapath_od = ovn_datapath_from_sbrec(\n- ls_datapaths ? &ls_datapaths->datapaths : NULL,\n- lr_datapaths ? &lr_datapaths->datapaths : NULL,\n- sb_group->datapaths[i]);\n+ datapath_od = ovn_datapath_from_sbrec_(&datapaths->datapaths,\n+ sb_group->datapaths[i]);\n if (!datapath_od || ovn_datapath_is_stale(datapath_od)) {\n break;\n }\n@@ -807,8 +803,7 @@ ovn_dp_group_create(struct ovsdb_idl_txn *ovnsb_txn,\n dpg->dp_group = ovn_sb_insert_or_update_logical_dp_group(\n ovnsb_txn,\n can_modify ? sb_group : NULL,\n- desired_bitmap,\n- is_switch ? ls_datapaths : lr_datapaths);\n+ desired_bitmap, datapaths);\n }\n dpg->dpg_uuid = dpg->dp_group->header_.uuid;\n hmap_insert(dp_groups, &dpg->node, hash_int(desired_n, 0));\n@@ -1170,9 +1165,8 @@ sync_lflow_to_sb(struct ovn_lflow *lflow,\n lflow->dpg = ovn_dp_group_create(\n ovnsb_txn, dp_groups, sbrec_dp_group,\n lflow->n_ods, lflow->dpg_bitmap,\n- n_datapaths, is_switch,\n- ls_datapaths,\n- lr_datapaths);\n+ n_datapaths,\n+ is_switch ? ls_datapaths : lr_datapaths);\n }\n sbrec_logical_flow_set_logical_dp_group(sbflow,\n lflow->dpg->dp_group);\ndiff --git a/northd/lflow-mgr.h b/northd/lflow-mgr.h\nindex 2c05b352d..16ffc105c 100644\n--- a/northd/lflow-mgr.h\n+++ b/northd/lflow-mgr.h\n@@ -179,9 +179,7 @@ struct ovn_dp_group *ovn_dp_group_create(\n struct ovsdb_idl_txn *ovnsb_txn, struct hmap *dp_groups,\n struct sbrec_logical_dp_group *sb_group,\n size_t desired_n, const unsigned long *desired_bitmap,\n- size_t bitmap_len, bool is_switch,\n- const struct ovn_datapaths *ls_datapaths,\n- const struct ovn_datapaths *lr_datapaths);\n+ size_t bitmap_len, const struct ovn_datapaths *datapaths);\n \n static inline void\n inc_ovn_dp_group_ref(struct ovn_dp_group *dpg)\n@@ -201,4 +199,4 @@ dec_ovn_dp_group_ref(struct hmap *dp_groups, struct ovn_dp_group *dpg)\n }\n }\n \n-#endif /* LFLOW_MGR_H */\n\\ No newline at end of file\n+#endif /* LFLOW_MGR_H */\n","prefixes":["ovs-dev","03/14"]}