From patchwork Fri Oct 13 14:09:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoshuai Li X-Patchwork-Id: 825491 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=) 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 3yD8kF1NKYz9sNr for ; Sat, 14 Oct 2017 01:10:13 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1842FBCE; Fri, 13 Oct 2017 14:10:10 +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 0855AB00 for ; Fri, 13 Oct 2017 14:10:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp2203-239.mail.aliyun.com (smtp2203-239.mail.aliyun.com [121.197.203.239]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 15F424C7 for ; Fri, 13 Oct 2017 14:10:05 +0000 (UTC) X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07445227|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03296; MF=ligs@dtdream.com; NM=1; PH=DS; RN=2; RT=2; SR=0; TI=SMTPD_---.97a8ZEu_1507903800; Received: from localhost.localdomain(mailfrom:ligs@dtdream.com ip:222.128.6.212) by smtp.aliyun-inc.com(10.147.43.230); Fri, 13 Oct 2017 22:10:01 +0800 From: Guoshuai Li To: dev@openvswitch.org Date: Fri, 13 Oct 2017 22:09:51 +0800 Message-Id: <20171013140951.11232-1-ligs@dtdream.com> X-Mailer: git-send-email 2.13.2.windows.1 X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=disabled 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: Fix remote not receive GARP, when localnet Port has vlan tag. 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 When sending a localnet port with vlan, the GARP packet needs push_vlan. Signed-off-by: Guoshuai Li --- v3: Add garp-vlan test. v2: Add check vlan vaid. Add update localnet vlan tag process. --- ovn/controller/pinctrl.c | 16 +++++++++++++--- tests/ovn.at | 31 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 469a35586..eb9276833 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -1264,6 +1264,7 @@ struct garp_data { long long int announce_time; /* Next announcement in ms. */ int backoff; /* Backoff for the next announcement. */ ofp_port_t ofport; /* ofport used to output this GARP. */ + int64_t tag; /* vlan tag of this GARP packet. */ }; /* Contains GARPs to be sent. */ @@ -1286,7 +1287,7 @@ destroy_send_garps(void) } static void -add_garp(const char *name, ofp_port_t ofport, +add_garp(const char *name, ofp_port_t ofport, int64_t tag, const struct eth_addr ea, ovs_be32 ip) { struct garp_data *garp = xmalloc(sizeof *garp); @@ -1295,6 +1296,7 @@ add_garp(const char *name, ofp_port_t ofport, garp->announce_time = time_msec() + 1000; garp->backoff = 1; garp->ofport = ofport; + garp->tag = tag; shash_add(&send_garp_data, name, garp); } @@ -1313,6 +1315,8 @@ send_garp_update(const struct sbrec_port_binding *binding_rec, } ofp_port_t ofport = u16_to_ofp(simap_get(localnet_ofports, ld->localnet_port->logical_port)); + int64_t tag = ld->localnet_port->n_tag ? + *(ld->localnet_port->tag) : 0xFFFF; volatile struct garp_data *garp = NULL; /* Update GARP for NAT IP if it exists. Consider port bindings with type @@ -1331,8 +1335,9 @@ send_garp_update(const struct sbrec_port_binding *binding_rec, garp = shash_find_data(&send_garp_data, name); if (garp) { garp->ofport = ofport; + garp->tag = tag; } else { - add_garp(name, ofport, laddrs->ea, + add_garp(name, ofport, tag, laddrs->ea, laddrs->ipv4_addrs[i].addr); } free(name); @@ -1359,7 +1364,7 @@ send_garp_update(const struct sbrec_port_binding *binding_rec, continue; } - add_garp(binding_rec->logical_port, ofport, + add_garp(binding_rec->logical_port, ofport, tag, laddrs.ea, laddrs.ipv4_addrs[0].addr); destroy_lport_addresses(&laddrs); @@ -1389,6 +1394,11 @@ send_garp(struct garp_data *garp, long long int current_time) compose_arp(&packet, ARP_OP_REQUEST, garp->ea, eth_addr_zero, true, garp->ipv4, garp->ipv4); + /* Compose a GARP request packet's vlan if exist. */ + if (garp->tag >= 0 && garp->tag <= 4095) { + eth_push_vlan(&packet, htons(ETH_TYPE_VLAN), htons(garp->tag)); + } + /* Compose actions. The garp request is output on localnet ofport. */ uint64_t ofpacts_stub[4096 / 8]; struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub); diff --git a/tests/ovn.at b/tests/ovn.at index 6c38b973f..7ef32f5b1 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -8426,6 +8426,37 @@ $PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros AT_CHECK([grep $garp hv3_br_phys_tx | sort], [0], [expout]) $PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv2_br_phys_tx AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], []) + +# change localnet port tag. +AT_CHECK([ovn-nbctl set Logical_Switch_Port ln_port tag=2014]) + +# wait for earlier changes to take effect +AT_CHECK([ovn-nbctl --timeout=3 --wait=sb sync], [0], [ignore]) + +# update nat-addresses option +ovn-nbctl --wait=sb lsp-set-options lrp0-rp router-port=lrp0 +ovn-nbctl --wait=sb lsp-set-options lrp0-rp router-port=lrp0 nat-addresses="router" + +as hv1 reset_pcap_file snoopvif hv1/snoopvif +as hv2 reset_pcap_file br-phys_n1 hv2/br-phys_n1 +as hv3 reset_pcap_file br-phys_n1 hv3/br-phys_n1 + +# Wait for packets to be received. +OVS_WAIT_UNTIL([test `wc -c < "hv1/snoopvif-tx.pcap"` -ge 100]) +trim_zeros() { + sed 's/\(00\)\{1,\}$//' +} + +garp="fffffffffffff00000000001810007de08060001080006040001f00000000001c0a80064000000000000c0a80064" +echo $garp > expout + +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv1/snoopvif-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv1_snoopvif_tx +AT_CHECK([sort hv1_snoopvif_tx], [0], [expout]) +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv3/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv3_br_phys_tx +AT_CHECK([grep $garp hv3_br_phys_tx | sort], [0], [expout]) +$PYTHON "$top_srcdir/utilities/ovs-pcap.in" hv2/br-phys_n1-tx.pcap | trim_zeros | only_broadcast_from_lrp1 | uniq > hv2_br_phys_tx +AT_CHECK([grep $garp hv2_br_phys_tx | sort], [0], []) + OVN_CLEANUP([hv1],[hv2],[hv3]) AT_CLEANUP