From patchwork Wed Sep 2 14:59:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1355866 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 4BhRvp1Bb5z9sVK for ; Thu, 3 Sep 2020 01:00:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id AF655869BB; Wed, 2 Sep 2020 15:00:52 +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 1qZPXLQVdIK8; Wed, 2 Sep 2020 15:00:50 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9E99F86937; Wed, 2 Sep 2020 15:00:50 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 871E2C07FF; Wed, 2 Sep 2020 15:00:50 +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 5BD3FC0051 for ; Wed, 2 Sep 2020 15:00:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2F5FF227AA for ; Wed, 2 Sep 2020 15:00:49 +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 ZHKEXilzJSoP for ; Wed, 2 Sep 2020 15:00:33 +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 2D26B227AD for ; Wed, 2 Sep 2020 15:00:13 +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 1kDUF9-0000sb-HL; Wed, 02 Sep 2020 15:00:11 +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 1kDUF6-0006lF-Ag; Wed, 02 Sep 2020 16:00:10 +0100 From: anton.ivanov@cambridgegreys.com To: dev@openvswitch.org Date: Wed, 2 Sep 2020 15:59:35 +0100 Message-Id: <20200902145950.25875-9-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 09/24] Move ARP Resolve into a separate 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 | 203 ++++++++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 92 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 4a3484570..1e5921c29 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -10272,96 +10272,25 @@ build_lrouter_flows_ingress_policy_od( } } -static void -build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, - struct hmap *lflows, struct shash *meter_groups, - struct hmap *lbs) +static void build_lrouter_flows_arp_resolve_od( + struct ovn_datapath *od, struct hmap *lflows) { - /* 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; - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_ingress_table_0_od(od, lflows); - } - - struct ovn_port *op; - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_flows_ingress_table_0_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_arp_nd_mac_learn_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_flows_arp_nd_mac_learn_op(op, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_flows_table_3_ip_input_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_table_3_ip_input_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_dhcp_reply_op(op, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_ip_input_chassis_redirect_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_NAT_defrag_lb_od( - od, lflows, lbs, meter_groups); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_flows_NAT_defrag_lb_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_lr_ingress_ra_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lrouter_flows_lr_ingress_ip_routing_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_static_to_flows_od(od, lflows, ports); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_multicast_lookup_od(od, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lrouter_flows_ingress_policy_od(od, lflows, ports); - } - - /* XXX destination unreachable */ /* Local router ingress table ARP_RESOLVE: ARP Resolution. * * Multicast packets already have the outport set so just advance to next * table (priority 500). */ - HMAP_FOR_EACH (od, key_node, datapaths) { - if (!od->nbr) { - continue; - } + if (od->nbr) { ovn_lflow_add(lflows, od, S_ROUTER_IN_ARP_RESOLVE, 500, "ip4.mcast || ip6.mcast", "next;"); } +} +static void build_lrouter_flows_arp_resolve_op( + struct ovn_port *op, struct hmap *lflows, struct hmap *ports) +{ /* Local router ingress table ARP_RESOLVE: ARP Resolution. * * Any unicast packet that reaches this table is an IP packet whose @@ -10371,11 +10300,11 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, * REG_NEXT_HOP_IPV4/REG_NEXT_HOP_IPV6 into an output port in outport and * an Ethernet address in eth.dst. */ - HMAP_FOR_EACH (op, key_node, ports) { - if (op->nbsp && !lsp_is_enabled(op->nbsp)) { - continue; - } + struct ds match = DS_EMPTY_INITIALIZER; + struct ds actions = DS_EMPTY_INITIALIZER; + + if (!op->nbsp || lsp_is_enabled(op->nbsp)) { if (op->nbrp) { /* This is a logical router port. If next-hop IP address in * REG_NEXT_HOP_IPV4/REG_NEXT_HOP_IPV6 matches IP address of this @@ -10544,7 +10473,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, "virtual-parents"); if (!vip || !virtual_parents || !ip_parse(vip, &ip) || !op->sb) { - continue; + goto arp_resolve_op_done; } if (!op->sb->virtual_parent || !op->sb->virtual_parent[0] || @@ -10584,7 +10513,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, struct ovn_port *vp = ovn_port_find(ports, op->sb->virtual_parent); if (!vp || !vp->nbsp) { - continue; + goto arp_resolve_op_done; } for (size_t i = 0; i < vp->n_lsp_addrs; i++) { @@ -10643,18 +10572,18 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, const char *peer_name = smap_get(&op->nbsp->options, "router-port"); if (!peer_name) { - continue; + goto arp_resolve_op_done; } struct ovn_port *peer = ovn_port_find(ports, peer_name); if (!peer || !peer->nbrp) { - continue; + goto arp_resolve_op_done; } if (peer->od->nbr && smap_get_bool(&peer->od->nbr->options, "dynamic_neigh_routers", false)) { - continue; + goto arp_resolve_op_done; } for (size_t i = 0; i < op->od->n_router_ports; i++) { @@ -10706,18 +10635,108 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, } } } +arp_resolve_op_done: + ds_destroy(&match); + ds_destroy(&actions); +} - HMAP_FOR_EACH (od, key_node, datapaths) { - if (!od->nbr) { - continue; - } - +static void build_lrouter_flows_arp_resolve_finalize_od( + struct ovn_datapath *od, struct hmap *lflows) +{ + if (od->nbr) { ovn_lflow_add(lflows, od, S_ROUTER_IN_ARP_RESOLVE, 0, "ip4", "get_arp(outport, " REG_NEXT_HOP_IPV4 "); next;"); ovn_lflow_add(lflows, od, S_ROUTER_IN_ARP_RESOLVE, 0, "ip6", "get_nd(outport, " REG_NEXT_HOP_IPV6 "); next;"); } +} + +static void +build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, + struct hmap *lflows, 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; + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_ingress_table_0_od(od, lflows); + } + + struct ovn_port *op; + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_ingress_table_0_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_arp_nd_mac_learn_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_arp_nd_mac_learn_op(op, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_table_3_ip_input_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_table_3_ip_input_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_dhcp_reply_op(op, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_ip_input_chassis_redirect_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_NAT_defrag_lb_od( + od, lflows, lbs, meter_groups); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_NAT_defrag_lb_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_lr_ingress_ra_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_lr_ingress_ip_routing_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_static_to_flows_od(od, lflows, ports); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_multicast_lookup_od(od, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_ingress_policy_od(od, lflows, ports); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_arp_resolve_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lrouter_flows_arp_resolve_op(op, lflows, ports); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lrouter_flows_arp_resolve_finalize_od(od, lflows); + } /* Local router ingress table CHK_PKT_LEN: Check packet length. *