From patchwork Wed Sep 2 14:59:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1355889 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BhS3Z2jSyz9sTR for ; Thu, 3 Sep 2020 01:07:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B7CA786A24; Wed, 2 Sep 2020 15:07:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JyCcIQKmIbhX; Wed, 2 Sep 2020 15:07:35 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id DCC258445E; Wed, 2 Sep 2020 15:07:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C7914C0890; Wed, 2 Sep 2020 15:07:35 +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 472F8C0051 for ; Wed, 2 Sep 2020 15:07:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3A6A02E13E for ; Wed, 2 Sep 2020 15:07:35 +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 S0v6d06cSDgE for ; Wed, 2 Sep 2020 15:07:24 +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 0DCDB2E16F for ; Wed, 2 Sep 2020 15:03:15 +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 1kDUI5-0000ts-Ip; Wed, 02 Sep 2020 15:03:13 +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 1kDUFM-0006lF-Et; Wed, 02 Sep 2020 16:00:26 +0100 From: anton.ivanov@cambridgegreys.com To: dev@openvswitch.org Date: Wed, 2 Sep 2020 15:59:44 +0100 Message-Id: <20200902145950.25875-18-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200902145950.25875-1-anton.ivanov@cambridgegreys.com> References: <20200902145950.25875-1-anton.ivanov@cambridgegreys.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: Anton Ivanov Subject: [ovs-dev] [PATCH ovn RFC v4 18/24] Pull out lswitch ARP/ND respond, known IPs into functions 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 | 119 +++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index a4549f5ef..973fc922a 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6644,7 +6644,18 @@ build_lswitch_flows_admission_control(struct ovn_datapath *od, struct hmap *lflo } static void -build_lswitch_flows_arp_nd_responder(struct ovn_port *op, struct hmap *lflows) +build_lswitch_flows_arp_nd_responder_od( + struct ovn_datapath *od, struct hmap *lflows) +{ + /* Ingress table 13: ARP/ND responder, by default goto next. + * (priority 0)*/ + if (od->nbs) { + ovn_lflow_add(lflows, od, S_SWITCH_IN_ARP_ND_RSP, 0, "1", "next;"); + } +} + +static void +build_lswitch_flows_arp_nd_responder_op(struct ovn_port *op, struct hmap *lflows) { struct ds match = DS_EMPTY_INITIALIZER; @@ -6665,53 +6676,15 @@ build_lswitch_flows_arp_nd_responder(struct ovn_port *op, struct hmap *lflows) } static void -build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, - struct hmap *port_groups, struct hmap *lflows, - struct hmap *mcgroups, struct hmap *igmp_groups, - struct shash *meter_groups, - struct hmap *lbs) +build_lswitch_flows_arp_nd_responder_known_ips_op( + struct ovn_port *op, struct hmap *lflows, struct hmap *ports) { - /* This flow table structure is documented in ovn-northd(8), so please - * update ovn-northd.8.xml if you change anything. */ - struct ds match = DS_EMPTY_INITIALIZER; struct ds actions = DS_EMPTY_INITIALIZER; - struct ovn_datapath *od; - struct ovn_port *op; - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_pre_acl_and_acl_od( - od, lflows, meter_groups, lbs, port_groups); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_forwarding_groups(od, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_admission_control(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lswitch_input_port_sec_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_input_port_sec_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lswitch_flows_arp_nd_responder(op, lflows); - } - /* Ingress table 13: ARP/ND responder, reply for known IPs. * (priority 50). */ - HMAP_FOR_EACH (op, key_node, ports) { - if (!op->nbsp) { - continue; - } - + if (op->nbsp) { if (!strcmp(op->nbsp->type, "virtual")) { /* Handle * - GARPs for virtual ip which belongs to a logical port @@ -6727,7 +6700,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, "virtual-parents"); if (!virtual_ip || !virtual_parents || !ip_parse(virtual_ip, &ip)) { - continue; + goto arp_nd_responder_known_ips_done; } char *tokstr = xstrdup(virtual_parents); @@ -6770,11 +6743,11 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, */ if (!lsp_is_up(op->nbsp) && strcmp(op->nbsp->type, "router") && strcmp(op->nbsp->type, "localport")) { - continue; + goto arp_nd_responder_known_ips_done; } if (lsp_is_external(op->nbsp) || op->has_unknown) { - continue; + goto arp_nd_responder_known_ips_done; } for (size_t i = 0; i < op->n_lsp_addrs; i++) { @@ -6866,15 +6839,59 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } } +arp_nd_responder_known_ips_done: + ds_destroy(&actions); + ds_destroy(&match); +} + +static void +build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, + struct hmap *port_groups, struct hmap *lflows, + struct hmap *mcgroups, struct hmap *igmp_groups, + struct shash *meter_groups, + struct hmap *lbs) +{ + /* This flow table structure is documented in ovn-northd(8), so please + * update ovn-northd.8.xml if you change anything. */ + + struct ds match = DS_EMPTY_INITIALIZER; + struct ds actions = DS_EMPTY_INITIALIZER; + + struct ovn_datapath *od; + struct ovn_port *op; - /* Ingress table 13: ARP/ND responder, by default goto next. - * (priority 0)*/ HMAP_FOR_EACH (od, key_node, datapaths) { - if (!od->nbs) { - continue; - } + build_lswitch_flows_pre_acl_and_acl_od( + od, lflows, meter_groups, lbs, port_groups); + } - ovn_lflow_add(lflows, od, S_SWITCH_IN_ARP_ND_RSP, 0, "1", "next;"); + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_forwarding_groups(od, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_admission_control(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_input_port_sec_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_input_port_sec_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_flows_arp_nd_responder_op(op, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_flows_arp_nd_responder_known_ips_op( + op, lflows, ports); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_arp_nd_responder_od(od, lflows); } /* Ingress table 13: ARP/ND responder for service monitor source ip.