From patchwork Wed Sep 9 09:02:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1360443 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 4Bmbdq00VCz9sPB for ; Wed, 9 Sep 2020 19:03:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B439787106; Wed, 9 Sep 2020 09:03:06 +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 UJ1r2IsVItku; Wed, 9 Sep 2020 09:03:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id A3CA0870BB; Wed, 9 Sep 2020 09:03:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 884E5C0859; Wed, 9 Sep 2020 09:03:02 +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 B210FC0051 for ; Wed, 9 Sep 2020 09:03:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 941DE2E150 for ; Wed, 9 Sep 2020 09:03:00 +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 lSoPh1K1AHPu for ; Wed, 9 Sep 2020 09:02:58 +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 BE7DD2E13F for ; Wed, 9 Sep 2020 09:02:58 +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 1kFw0F-0006am-2Z; Wed, 09 Sep 2020 09:02:55 +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 1kFw0C-00087G-Bx; Wed, 09 Sep 2020 10:02:54 +0100 From: anton.ivanov@cambridgegreys.com To: dev@openvswitch.org Date: Wed, 9 Sep 2020 10:02:48 +0100 Message-Id: <20200909090248.31114-1-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: i.maximets@ovn.org, Anton Ivanov Subject: [ovs-dev] [PATCH ovn] Replace ds_put_* evaluating to constant expressions 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 Replaces ds_put_cstr and ds_put_format which evaluate to constant expressions with string constants Signed-off-by: Anton Ivanov Acked-by: Numan Siddique --- northd/ovn-northd.c | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index 3de71612b..c681d5cbf 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -1928,6 +1928,8 @@ update_dynamic_addresses(struct dynamic_address_update *update) struct ds new_addr = DS_EMPTY_INITIALIZER; ds_put_format(&new_addr, ETH_ADDR_FMT, ETH_ADDR_ARGS(mac)); + + ipam_insert_mac(&mac, true); if (ip4) { @@ -6950,24 +6952,24 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports, struct ds action = DS_EMPTY_INITIALIZER; ds_clear(&match); - ds_put_cstr(&match, "udp.dst == 53"); + const char *dns_match = "udp.dst == 53"; ds_put_format(&action, REGBIT_DNS_LOOKUP_RESULT" = dns_lookup(); next;"); ovn_lflow_add(lflows, od, S_SWITCH_IN_DNS_LOOKUP, 100, - ds_cstr(&match), ds_cstr(&action)); + dns_match, ds_cstr(&action)); ds_clear(&action); - ds_put_cstr(&match, " && "REGBIT_DNS_LOOKUP_RESULT); - ds_put_format(&action, "eth.dst <-> eth.src; ip4.src <-> ip4.dst; " + + const char *dns_match2 = "udp.dst == 53 && "REGBIT_DNS_LOOKUP_RESULT; + const char *dns_action = "eth.dst <-> eth.src; ip4.src <-> ip4.dst; " "udp.dst = udp.src; udp.src = 53; outport = inport; " - "flags.loopback = 1; output;"); + "flags.loopback = 1; output;"; ovn_lflow_add(lflows, od, S_SWITCH_IN_DNS_RESPONSE, 100, - ds_cstr(&match), ds_cstr(&action)); - ds_clear(&action); - ds_put_format(&action, "eth.dst <-> eth.src; ip6.src <-> ip6.dst; " + dns_match2, dns_action); + dns_action = "eth.dst <-> eth.src; ip6.src <-> ip6.dst; " "udp.dst = udp.src; udp.src = 53; outport = inport; " - "flags.loopback = 1; output;"); + "flags.loopback = 1; output;"; ovn_lflow_add(lflows, od, S_SWITCH_IN_DNS_RESPONSE, 100, - ds_cstr(&match), ds_cstr(&action)); + dns_match2, dns_action); ds_destroy(&action); } @@ -7839,10 +7841,10 @@ add_ecmp_symmetric_reply_flows(struct hmap *lflows, &st_route->header_); ds_clear(&actions); - ds_put_cstr(&actions, "eth.dst = ct_label.ecmp_reply_eth; next;"); + const char *action = "eth.dst = ct_label.ecmp_reply_eth; next;"; ovn_lflow_add_with_hint(lflows, od, S_ROUTER_IN_ARP_RESOLVE, 200, ds_cstr(&ecmp_reply), - ds_cstr(&actions), &st_route->header_); + action, &st_route->header_); } static void @@ -8734,9 +8736,9 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, /* TTL discard */ ds_clear(&match); - ds_put_cstr(&match, "ip4 && ip.ttl == {0, 1}"); + const char *ttl_match = "ip4 && ip.ttl == {0, 1}"; ovn_lflow_add(lflows, od, S_ROUTER_IN_IP_INPUT, 30, - ds_cstr(&match), "drop;"); + ttl_match, "drop;"); /* Pass other traffic not already handled to the next table for * routing. */ @@ -8778,14 +8780,13 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, ds_put_cstr(&match, " && icmp4.type == 8 && icmp4.code == 0"); ds_clear(&actions); - ds_put_format(&actions, - "ip4.dst <-> ip4.src; " - "ip.ttl = 255; " - "icmp4.type = 0; " - "flags.loopback = 1; " - "next; "); + const char * icmp_actions = "ip4.dst <-> ip4.src; " + "ip.ttl = 255; " + "icmp4.type = 0; " + "flags.loopback = 1; " + "next; "; ovn_lflow_add_with_hint(lflows, op->od, S_ROUTER_IN_IP_INPUT, 90, - ds_cstr(&match), ds_cstr(&actions), + ds_cstr(&match), icmp_actions, &op->nbrp->header_); } @@ -9184,14 +9185,14 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, ds_put_cstr(&match, " && icmp6.type == 128 && icmp6.code == 0"); ds_clear(&actions); - ds_put_cstr(&actions, + const char *lrp_actions = "ip6.dst <-> ip6.src; " "ip.ttl = 255; " "icmp6.type = 129; " "flags.loopback = 1; " - "next; "); + "next; "; ovn_lflow_add_with_hint(lflows, op->od, S_ROUTER_IN_IP_INPUT, 90, - ds_cstr(&match), ds_cstr(&actions), + ds_cstr(&match), lrp_actions, &op->nbrp->header_); } @@ -10449,13 +10450,12 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, REG_NEXT_HOP_IPV4 " == %s", peer->json_key, vip); - ds_clear(&actions); - ds_put_format(&actions, - "eth.dst = 00:00:00:00:00:00; next;"); + const char *arp_actions = + "eth.dst = 00:00:00:00:00:00; next;"; ovn_lflow_add_with_hint(lflows, peer->od, S_ROUTER_IN_ARP_RESOLVE, 100, ds_cstr(&match), - ds_cstr(&actions), + arp_actions, &op->nbsp->header_); break; }