From patchwork Thu Jun 14 15:27:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 929519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4166v2303mz9s19 for ; Fri, 15 Jun 2018 01:27:40 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C3784DD8; Thu, 14 Jun 2018 15:27:38 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3136FDD8 for ; Thu, 14 Jun 2018 15:27:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f44.google.com (mail-wm0-f44.google.com [74.125.82.44]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 46183326 for ; Thu, 14 Jun 2018 15:27:36 +0000 (UTC) Received: by mail-wm0-f44.google.com with SMTP id p126-v6so11290568wmb.2 for ; Thu, 14 Jun 2018 08:27:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/24S+0xQbImVSMKFTQrjWPcyVAViUNAjq0dsjoHIRco=; b=Z/WTXR4aW9lbb1YswO4b2AGt91C62YS2pV54VYrW6ZBxuH53ATRM7A2oFrRGCvBEV5 CImQcWsj6/AOUCQ9sKFnNwA0rP60l6nkKYCgruMVXWSp/+bPn3IYHQAtKp/Bnb116SQq kdtwhxt2cKOivzvgngh8eZwMg89Qxruhzy+LsNftxoxdCKok/lFWbK1drHFsic9O5Pal g1W4Rb01JMOxEYXq9gv9XpBhfsc/9mGaRs00oCIGHpmMlgJNakj7i09AynVjHApeSD/L YVGlKDrcqpZBjkaWYG0RnJDY9ji4fLhaiOcVp+jYaDYda3xCg7N5v7u/4ptnZT7SkNJJ 8ZNA== X-Gm-Message-State: APt69E2J6nuO3h5OW0jq5sMBwvoO7nNXZSztyNlHW/8cSP9kgadKcu45 T97eZt2+r2MZbBXrwHtuhAN/fHlvT8U= X-Google-Smtp-Source: ADUXVKLcyIXOn80wokjM+f9tREB9qQ9mZabB3+y3LV+NJI1k1kZnpfVkHqL72oGlb6Ftmo0zRAAa9A== X-Received: by 2002:a1c:206:: with SMTP id 6-v6mr2422969wmc.114.1528990054620; Thu, 14 Jun 2018 08:27:34 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id b190-v6sm8537204wma.24.2018.06.14.08.27.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jun 2018 08:27:34 -0700 (PDT) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Thu, 14 Jun 2018 17:27:18 +0200 Message-Id: <2f13b78874d8cf6637b69ab29182ac77f945301a.1528988813.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2] OVN: add ICMP time exceeded support to OVN logical router X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Using icmp4 action, send an ICMP time exceeded frame whenever an OVN logical router receives an IPv4 packets whose TTL has expired (ip.ttl == {0, 1}) Signed-off-by: Lorenzo Bianconi --- Changes since v1: - use ovn-nbctl --wait=hv sync instead of sleep in automatic test --- ovn/northd/ovn-northd.8.xml | 4 -- ovn/northd/ovn-northd.c | 26 +++++++++++-- tests/ovn.at | 77 +++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 7 deletions(-) diff --git a/ovn/northd/ovn-northd.8.xml b/ovn/northd/ovn-northd.8.xml index 1d68f1aab..759d3dace 100644 --- a/ovn/northd/ovn-northd.8.xml +++ b/ovn/northd/ovn-northd.8.xml @@ -1401,10 +1401,6 @@ icmp4 { next; }; - -

- Not yet implemented. -

  • diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index aa6a18f16..74eefc6ca 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -4858,9 +4858,7 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, ovn_lflow_add(lflows, od, S_ROUTER_IN_IP_INPUT, 50, "eth.bcast", "drop;"); - /* TTL discard. - * - * XXX Need to send ICMP time exceeded if !ip.later_frag. */ + /* TTL discard */ ds_clear(&match); ds_put_cstr(&match, "ip4 && ip.ttl == {0, 1}"); ovn_lflow_add(lflows, od, S_ROUTER_IN_IP_INPUT, 30, @@ -4926,6 +4924,28 @@ build_lrouter_flows(struct hmap *datapaths, struct hmap *ports, ds_cstr(&match), ds_cstr(&actions)); } + /* ICMP time exceeded */ + for (int i = 0; i < op->lrp_networks.n_ipv4_addrs; i++) { + ds_clear(&match); + ds_clear(&actions); + + ds_put_format(&match, + "inport == %s && ip4 && " + "ip.ttl == {0, 1} && !ip.later_frag", op->json_key); + ds_put_format(&actions, + "icmp4 {" + "eth.dst <-> eth.src; " + "icmp4.type = 11; /* Time exceeded */ " + "icmp4.code = 0; /* TTL exceeded in transit */ " + "ip4.dst = ip4.src; " + "ip4.src = %s; " + "ip.ttl = 255; " + "next; };", + op->lrp_networks.ipv4_addrs[i].addr_s); + ovn_lflow_add(lflows, op->od, S_ROUTER_IN_IP_INPUT, 40, + ds_cstr(&match), ds_cstr(&actions)); + } + /* ARP reply. These flows reply to ARP requests for the router's own * IP address. */ for (int i = 0; i < op->lrp_networks.n_ipv4_addrs; i++) { diff --git a/tests/ovn.at b/tests/ovn.at index 155150e02..b586afb4e 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -10267,3 +10267,80 @@ $PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/vif2-tx.pcap > 2.packets AT_CHECK([cat 2.packets], [0], []) AT_CLEANUP + +AT_SETUP([ovn -- TTL exceeded]) +AT_KEYWORDS([ttl-exceeded]) +AT_SKIP_IF([test $HAVE_PYTHON = no]) +ovn_start + +# test_ip_packet INPORT HV ETH_SRC ETH_DST IPV4_SRC IPV4_DST IPV4_ROUTER IP_CHKSUM EXP_IP_CHKSUM EXP_ICMP_CHKSUM +# +# Causes a packet to be received on INPORT of the hypervisor HV. The packet is an IPv4 packet with +# ETH_SRC, ETH_DST, IPV4_SRC, IPV4_DST, IP_CHKSUM as specified and TTL set to 1. +# EXP_IP_CHKSUM and EXP_ICMP_CHKSUM are the ip and icmp checksums of the icmp time exceeded frame +# generated by OVN logical router +# +# INPORT is a lport number, e.g. 11 for vif11. +# HV is a hypervisor number +# ETH_SRC and ETH_DST are each 12 hex digits. +# IPV4_SRC, IPV4_DST and IPV4_ROUTER are each 8 hex digits. +# IP_CHKSUM, EXP_IP_CHSUM and EXP_ICMP_CHKSUM are each 4 hex digits +test_ip_packet() { + local inport=$1 hv=$2 eth_src=$3 eth_dst=$4 ipv4_src=$5 ipv4_dst=$6 ip_router=$7 ip_chksum=$8 + local exp_ip_chksum=$9 exp_icmp_chksum=${10} + shift 10 + + local ip_ttl=01 + local packet=${eth_dst}${eth_src}08004500001400004000${ip_ttl}01${ip_chksum}${ipv4_src}${ipv4_dst} + + local reply_icmp_ttl=fe + local icmp_type_code_response=0b00 + local icmp_data=00000000 + local reply_icmp_payload=${icmp_type_code_response}${exp_icmp_chksum}${icmp_data} + local reply=${eth_src}${eth_dst}08004500001c00004000${reply_icmp_ttl}01${exp_ip_chksum}${ip_router}${ipv4_src}${reply_icmp_payload} + echo $reply >> vif$inport.expected + + as hv$hv ovs-appctl netdev-dummy/receive vif$inport $packet +} + +ip_to_hex() { + printf "%02x%02x%02x%02x" "$@" +} + +for i in 1 2; do + net_add n$i + ovn-nbctl ls-add sw$i + + sim_add hv$i + as hv$i + ovs-vsctl add-br br-phys + ovn_attach n$i br-phys 192.168.$i.1 + + ovn-nbctl lsp-add sw$i sw$i-p${i}0 -- \ + lsp-set-addresses sw$i-p${i}0 "00:00:00:00:00:0$i 192.168.$i.1" + + ovs-vsctl -- add-port br-int vif$i -- \ + set interface vif$i \ + external-ids:iface-id=sw$i-p${i}0 \ + options:tx_pcap=hv$i/vif$i-tx.pcap \ + options:rxq_pcap=hv$i/vif$i-rx.pcap \ + ofport-request=$i +done + +ovn-nbctl lr-add lr0 +for i in 1 2; do + ovn-nbctl lrp-add lr0 lrp$i 00:00:00:00:ff:0$i 192.168.$i.254/24 + ovn-nbctl -- lsp-add sw$i lrp$i-attachment \ + -- set Logical_Switch_Port lrp$i-attachment type=router \ + options:router-port=lrp$i addresses='"00:00:00:00:ff:'0$i'"' +done + +OVN_POPULATE_ARP +# allow some time for ovn-northd and ovn-controller to catch up. +ovn-nbctl --wait=hv sync + +test_ip_packet 1 1 000000000001 00000000ff01 $(ip_to_hex 192 168 1 1) $(ip_to_hex 192 168 2 1) $(ip_to_hex 192 168 1 254) 0000 7dae f4ff +OVN_CHECK_PACKETS([hv1/vif1-tx.pcap], [vif1.expected]) + +OVN_CLEANUP([hv1], [hv2]) +AT_CLEANUP