From patchwork Tue Jun 5 15:57:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 925536 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 410bzV6mqgz9s01 for ; Wed, 6 Jun 2018 01:57:25 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8B3B640C; Tue, 5 Jun 2018 15:57:23 +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 B957BE3C for ; Tue, 5 Jun 2018 15:57:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f180.google.com (mail-wr0-f180.google.com [209.85.128.180]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 012C56FE for ; Tue, 5 Jun 2018 15:57:20 +0000 (UTC) Received: by mail-wr0-f180.google.com with SMTP id y15-v6so2981266wrg.11 for ; Tue, 05 Jun 2018 08:57:20 -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=rh3J5ASvYE7N9q2TtuwL+2q2K+V3T0AhKRqtEwnBf24=; b=UnLUJm4Nzyx115NegRouvZyr3ihbrPvQc+NNdpXeCPC186BZ2XFw7BVCKSviqUpTF0 4EcCM7pWgdFbr3eaMQ2tZmO1PjGkH090sdz4n9fWJpyuuWUDRcerVZgHV0N7XMYre6az j0Yw2w+tkZQh80hwXgTbqAzN0YTXXOG9bWopTp1CScvXbsVxFFEbMpPfQecwJ/EXvp2j 7TSu3sjQxHZlh84vU5+lWzb3SpuHDZxMjDPkSQeQhZpeOwXDc30x+kkeexGeLB/qDKEu AjXaunSNEY+ebjb/2ZRWUtVQGrWWygBrIvDcsZc3P42Pjw+FJw06oVhMGvyzneGkDebv sRwg== X-Gm-Message-State: ALKqPwe2U6gz2Cjv6csO9KzWXQFcGAR+bxYVpe4YlJEryYYaLhgcgjcM eMr2p0gNDjy9v+dV5k6PDehnTYqTzKU= X-Google-Smtp-Source: ADUXVKIlC2Xjz89Ct5lYEIeCeeVBhNusZi3qfl99bQyvKQe7OzK8BfL494CUvldI/zhcCi/Rt73NSQ== X-Received: by 2002:adf:c358:: with SMTP id e24-v6mr19322227wrg.257.1528214239325; Tue, 05 Jun 2018 08:57:19 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id m134-v6sm2504351wmg.4.2018.06.05.08.57.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 08:57:18 -0700 (PDT) From: Lorenzo Bianconi To: dev@openvswitch.org Date: Tue, 5 Jun 2018 17:57:06 +0200 Message-Id: X-Mailer: git-send-email 2.14.4 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] 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 --- 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 0e06776ad..60f43e2a6 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -4852,9 +4852,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, @@ -4920,6 +4918,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 f12c24c17..81c834276 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. +sleep 1 + +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