From patchwork Fri Sep 11 16:30:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1362513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cambridgegreys.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bp1TK2zvNz9sTS for ; Sat, 12 Sep 2020 02:30:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DCF5F87AB6; Fri, 11 Sep 2020 16:30:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W8wjm+jkukuC; Fri, 11 Sep 2020 16:30:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 2128E87A68; Fri, 11 Sep 2020 16:30:36 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0234DC089E; Fri, 11 Sep 2020 16:30:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id DAB7FC0051 for ; Fri, 11 Sep 2020 16:30:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C21E62E292 for ; Fri, 11 Sep 2020 16:30:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NNh07cIftUb5 for ; Fri, 11 Sep 2020 16:30:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.kot-begemot.co.uk (ivanoab7.miniserver.com [37.128.132.42]) by silver.osuosl.org (Postfix) with ESMTPS id DA16C2E28B for ; Fri, 11 Sep 2020 16:30:33 +0000 (UTC) Received: from tun252.jain.kot-begemot.co.uk ([192.168.18.6] helo=jain.kot-begemot.co.uk) by www.kot-begemot.co.uk with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kGlwW-0007MA-G8; Fri, 11 Sep 2020 16:30:32 +0000 Received: from jain.kot-begemot.co.uk ([192.168.3.3]) by jain.kot-begemot.co.uk with esmtp (Exim 4.92) (envelope-from ) id 1kGlwT-0007d9-Rb; Fri, 11 Sep 2020 17:30:31 +0100 From: anton.ivanov@cambridgegreys.com To: dev@openvswitch.org Date: Fri, 11 Sep 2020 17:30:12 +0100 Message-Id: <20200911163023.28894-4-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200911163023.28894-1-anton.ivanov@cambridgegreys.com> References: <20200911163023.28894-1-anton.ivanov@cambridgegreys.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: i.maximets@ovn.org, Anton Ivanov Subject: [ovs-dev] [PATCH ovn v5 03/14] ovn-northd: move logical flows for forwardig groups to a function 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" From: Anton Ivanov Signed-off-by: Anton Ivanov --- northd/ovn-northd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 3bf7087f0..08eea008e 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6608,6 +6608,11 @@ build_lswitch_flows_pre_acl_and_acl_od(struct ovn_datapath *od, struct hmap *lflows, struct hmap *port_groups, struct shash *meter_groups, struct hmap *lbs); +/* Build logical flows for the forwarding groups */ +static void +build_lswitch_forwarding_group_lflows_od( + struct ovn_datapath *od, struct hmap *lflows); + /* * Do not remove this comment - it is here as a marker to * make diffs readable. @@ -6632,12 +6637,8 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, port_groups, meter_groups, lbs); } - /* Build logical flows for the forwarding groups */ HMAP_FOR_EACH (od, key_node, datapaths) { - if (!od->nbs || !od->nbs->n_forwarding_groups) { - continue; - } - build_fwd_group_lflows(od, lflows); + build_lswitch_forwarding_group_lflows_od(od, lflows); } /* Logical switch ingress table 0: Admission control framework (priority @@ -7322,6 +7323,14 @@ build_lswitch_flows_pre_acl_and_acl_od(struct ovn_datapath *od, } } +static void +build_lswitch_forwarding_group_lflows_od( + struct ovn_datapath *od, struct hmap *lflows) +{ + if (!(!od->nbs || !od->nbs->n_forwarding_groups)) { + build_fwd_group_lflows(od, lflows); + } +} /* Returns a string of the IP address of the router port 'op' that * overlaps with 'ip_s". If one is not found, returns NULL. *