From patchwork Thu Jul 16 13:19:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1330295 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6wRj38Jlz9sTR for ; Thu, 16 Jul 2020 23:42:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E0D16271B3; Thu, 16 Jul 2020 13:42:38 +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 d84slAfPq-6i; Thu, 16 Jul 2020 13:42:24 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 255D8234BD; Thu, 16 Jul 2020 13:41:24 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 02486C0895; Thu, 16 Jul 2020 13:41:24 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 55AE2C18D3 for ; Thu, 16 Jul 2020 13:41:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4B6078B0FE for ; Thu, 16 Jul 2020 13:41:23 +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 rXL2Wkv5NX8b for ; Thu, 16 Jul 2020 13:41:19 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 84A068B16D for ; Thu, 16 Jul 2020 13:41:19 +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 1jw48T-0002Ck-Vs for dev@openvswitch.org; Thu, 16 Jul 2020 13:41:18 +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 1jw3ns-0001Hz-DF; Thu, 16 Jul 2020 14:20:02 +0100 From: anton.ivanov@cambridgegreys.com To: dev@openvswitch.org Date: Thu, 16 Jul 2020 14:19:15 +0100 Message-Id: <20200716131927.3943-18-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200716131927.3943-1-anton.ivanov@cambridgegreys.com> References: <20200716131927.3943-1-anton.ivanov@cambridgegreys.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: Anton Ivanov Subject: [ovs-dev] [PATCH ovn RFC v3 17/29] 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 | 196 +++++++++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 84 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 13b3793fc..2226f5882 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -6530,52 +6530,14 @@ build_lswitch_flows_step_40_op(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_step_50_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_step_0_od( - od, lflows, meter_groups, lbs, port_groups); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_step_10_od(od, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_step_20_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lswitch_flows_step_30_op(op, lflows); - } - - HMAP_FOR_EACH (od, key_node, datapaths) { - build_lswitch_flows_step_30_od(od, lflows); - } - - HMAP_FOR_EACH (op, key_node, ports) { - build_lswitch_flows_step_40_op(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) { + struct ds match = DS_EMPTY_INITIALIZER; + struct ds actions = DS_EMPTY_INITIALIZER; if (!strcmp(op->nbsp->type, "virtual")) { /* Handle @@ -6592,7 +6554,7 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, "virtual-parents"); if (!virtual_ip || !virtual_parents || !ip_parse(virtual_ip, &ip)) { - continue; + return; } char *tokstr = xstrdup(virtual_parents); @@ -6635,11 +6597,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; + return; } if (lsp_is_external(op->nbsp) || op->has_unknown) { - continue; + return; } for (size_t i = 0; i < op->n_lsp_addrs; i++) { @@ -6730,58 +6692,124 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, } } } + ds_destroy(&actions); + ds_destroy(&match); } +} +static void +build_lswitch_flows_step_50_od( + struct ovn_datapath *od, struct hmap *lflows) +{ /* Ingress table 13: ARP/ND responder, by default goto next. * (priority 0)*/ - HMAP_FOR_EACH (od, key_node, datapaths) { - if (!od->nbs) { - continue; - } - + if (od->nbs) { ovn_lflow_add(lflows, od, S_SWITCH_IN_ARP_ND_RSP, 0, "1", "next;"); } +} + +static void +build_lswitch_flows_step_50_lb( + struct ovn_lb *lb, struct hmap *lflows) +{ + struct ds match = DS_EMPTY_INITIALIZER; + struct ds actions = DS_EMPTY_INITIALIZER; /* Ingress table 13: ARP/ND responder for service monitor source ip. * (priority 110)*/ - struct ovn_lb *lb; - HMAP_FOR_EACH (lb, hmap_node, lbs) { - for (size_t i = 0; i < lb->n_vips; i++) { - if (!lb->vips[i].health_check) { - continue; - } - for (size_t j = 0; j < lb->vips[i].n_backends; j++) { - if (!lb->vips[i].backends[j].op || - !lb->vips[i].backends[j].svc_mon_src_ip) { - continue; - } + for (size_t i = 0; i < lb->n_vips; i++) { + if (!lb->vips[i].health_check) { + continue; + } - ds_clear(&match); - ds_put_format(&match, "arp.tpa == %s && arp.op == 1", - lb->vips[i].backends[j].svc_mon_src_ip); - ds_clear(&actions); - ds_put_format(&actions, - "eth.dst = eth.src; " - "eth.src = %s; " - "arp.op = 2; /* ARP reply */ " - "arp.tha = arp.sha; " - "arp.sha = %s; " - "arp.tpa = arp.spa; " - "arp.spa = %s; " - "outport = inport; " - "flags.loopback = 1; " - "output;", - svc_monitor_mac, svc_monitor_mac, - lb->vips[i].backends[j].svc_mon_src_ip); - ovn_lflow_add_with_hint(lflows, - lb->vips[i].backends[j].op->od, - S_SWITCH_IN_ARP_ND_RSP, 110, - ds_cstr(&match), ds_cstr(&actions), - &lb->nlb->header_); + for (size_t j = 0; j < lb->vips[i].n_backends; j++) { + if (!lb->vips[i].backends[j].op || + !lb->vips[i].backends[j].svc_mon_src_ip) { + continue; } + + ds_clear(&match); + ds_put_format(&match, "arp.tpa == %s && arp.op == 1", + lb->vips[i].backends[j].svc_mon_src_ip); + ds_clear(&actions); + ds_put_format(&actions, + "eth.dst = eth.src; " + "eth.src = %s; " + "arp.op = 2; /* ARP reply */ " + "arp.tha = arp.sha; " + "arp.sha = %s; " + "arp.tpa = arp.spa; " + "arp.spa = %s; " + "outport = inport; " + "flags.loopback = 1; " + "output;", + svc_monitor_mac, svc_monitor_mac, + lb->vips[i].backends[j].svc_mon_src_ip); + ovn_lflow_add_with_hint(lflows, + lb->vips[i].backends[j].op->od, + S_SWITCH_IN_ARP_ND_RSP, 110, + ds_cstr(&match), ds_cstr(&actions), + &lb->nlb->header_); } } + ds_destroy(&match); + ds_destroy(&actions); +} + +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; + struct ovn_lb *lb; + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_step_0_od( + od, lflows, meter_groups, lbs, port_groups); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_step_10_od(od, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_step_20_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_flows_step_30_op(op, lflows); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_step_30_od(od, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_flows_step_40_op(op, lflows); + } + + HMAP_FOR_EACH (op, key_node, ports) { + build_lswitch_flows_step_50_op(op, lflows, ports); + } + + HMAP_FOR_EACH (od, key_node, datapaths) { + build_lswitch_flows_step_50_od(od, lflows); + } + + HMAP_FOR_EACH (lb, hmap_node, lbs) { + build_lswitch_flows_step_50_lb(lb, lflows); + } /* Logical switch ingress table 14 and 15: DHCP options and response