From patchwork Tue Dec 5 23:15:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 844959 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qInOtp9r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yryKc4PQZz9sPm for ; Wed, 6 Dec 2017 10:16:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752986AbdLEXQC (ORCPT ); Tue, 5 Dec 2017 18:16:02 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33492 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752734AbdLEXP5 (ORCPT ); Tue, 5 Dec 2017 18:15:57 -0500 Received: by mail-pg0-f66.google.com with SMTP id g7so1282092pgs.0 for ; Tue, 05 Dec 2017 15:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=9ZqojPXB4ugRr07ewAl/Mr2jGzswAco17ED7f9yGn+E=; b=qInOtp9r+pmeV3jSFwX/YpguAcMi+CTQNPj5hsMAr6a5i6/viGLhlSNQrPohizuqrJ eSiYYgQo5i+v4NmfMsSP88+P7I2IDDsgpz9sqZLoulmgAdsZhumpqW1NzqbrD8/16Cj+ oZCyIZmsyXlHUI3+Vge8rxoAnnz3Wj1aJTpepLOUc4MuonI4EzptbSQbxZO3UNWNP689 QX+CCJIiFLGBW90j8mBADVWjRblebaN78nu55I0Ei81miFKd5Lwp7wWd7X57CKmyHOz3 R5hbrARLO7PU2JXXj22tS9FLw/Jk2aJb0iGs+59H2FBEBQslS+tX6Jb/AAoBkqC2ILFw 5BVQ== 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=9ZqojPXB4ugRr07ewAl/Mr2jGzswAco17ED7f9yGn+E=; b=et4Tm1qLJMKwNSGV+55Jq4hH6JjQ4tNrSxsJRRA0NgyFUeyaltQ0P/Igz2cKRGqvNg yxaE7fbQGPaWmPq4GIfymR0X4zwtYtWlxD26+pjrrNeL7s9gHDAOAF5+HDVVvyinEf+0 uDtlMr1qS3De1ZZ3oFW7eR1u3Ft9HkFCiSBsxX+qID/MZJ5mvaz1ay0rUqy47PBiJZiH f4U7Duq/HztqkF8Kb3rlQQeYqJ75pMY+3jUAclBnE6E5hhFP4ekObhpzbRWm+5LyluVj FZz2ilhZkajM/21YP7J2TWAt5dO/CqunWKxkXU9hi+UROts0P8jJikx/lZgPrdVen/Kc avzw== X-Gm-Message-State: AJaThX7i3hzfQmiNWUgml8ECBWLWhYunYIw9JbAEhwCpaDtJ2Ugbpaiq hxFzbDnC9g7Is7Ljre7h61h2zkRn X-Google-Smtp-Source: AGs4zMbbOKxWrbqKN9XVW7JhtGYyD8BBVfDR+jS+I3JLtyfLmNPFTTrYnEFjySEODYbtPBlxrGkxfA== X-Received: by 10.101.75.204 with SMTP id p12mr19328412pgr.61.1512515755455; Tue, 05 Dec 2017 15:15:55 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id t202sm1298227pgb.75.2017.12.05.15.15.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Dec 2017 15:15:54 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net-next 1/2] ip6_gre: add ip6 erspan collect_md mode Date: Tue, 5 Dec 2017 15:15:44 -0800 Message-Id: <1512515745-21003-2-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512515745-21003-1-git-send-email-u9012063@gmail.com> References: <1512515745-21003-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Similar to ip6 gretap and ip4 gretap, the patch allows erspan tunnel to operate in collect metadata mode. bpf_skb_[gs]et_tunnel_key() helpers can make use of it right away. Signed-off-by: William Tu --- net/ipv6/ip6_gre.c | 110 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 85 insertions(+), 25 deletions(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 1510ce9a4e4e..4562579797d1 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -524,8 +524,37 @@ static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len, false, false) < 0) return PACKET_REJECT; - tunnel->parms.index = ntohl(index); - ip6_tnl_rcv(tunnel, skb, tpi, NULL, log_ecn_error); + if (tunnel->parms.collect_md) { + struct metadata_dst *tun_dst; + struct ip_tunnel_info *info; + struct erspan_metadata *md; + __be64 tun_id; + __be16 flags; + + tpi->flags |= TUNNEL_KEY; + flags = tpi->flags; + tun_id = key32_to_tunnel_id(tpi->key); + + tun_dst = ipv6_tun_rx_dst(skb, flags, tun_id, + sizeof(*md)); + if (!tun_dst) + return PACKET_REJECT; + + info = &tun_dst->u.tun_info; + md = ip_tunnel_info_opts(info); + if (!md) + return PACKET_REJECT; + + md->index = index; + info->key.tun_flags |= TUNNEL_ERSPAN_OPT; + info->options_len = sizeof(*md); + + ip6_tnl_rcv(tunnel, skb, tpi, tun_dst, log_ecn_error); + + } else { + tunnel->parms.index = ntohl(index); + ip6_tnl_rcv(tunnel, skb, tpi, NULL, log_ecn_error); + } return PACKET_RCVD; } @@ -857,42 +886,73 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, if (gre_handle_offloads(skb, false)) goto tx_err; - switch (skb->protocol) { - case htons(ETH_P_IP): - memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); - prepare_ip6gre_xmit_ipv4(skb, dev, &fl6, - &dsfield, &encap_limit); - break; - case htons(ETH_P_IPV6): - if (ipv6_addr_equal(&t->parms.raddr, &ipv6h->saddr)) - goto tx_err; - if (prepare_ip6gre_xmit_ipv6(skb, dev, &fl6, - &dsfield, &encap_limit)) - goto tx_err; - break; - default: - memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); - break; - } - if (skb->len > dev->mtu + dev->hard_header_len) { pskb_trim(skb, dev->mtu + dev->hard_header_len); truncate = true; } - erspan_build_header(skb, t->parms.o_key, t->parms.index, - truncate, false); t->parms.o_flags &= ~TUNNEL_KEY; - IPCB(skb)->flags = 0; - fl6.daddr = t->parms.raddr; + + /* For collect_md mode, derive fl6 from the tunnel key, + * for native mode, call prepare_ip6gre_xmit_{ipv4,ipv6}. + */ + if (t->parms.collect_md) { + struct ip_tunnel_info *tun_info; + const struct ip_tunnel_key *key; + struct erspan_metadata *md; + + tun_info = skb_tunnel_info(skb); + if (unlikely(!tun_info || + !(tun_info->mode & IP_TUNNEL_INFO_TX) || + ip_tunnel_info_af(tun_info) != AF_INET6)) + return -EINVAL; + + key = &tun_info->key; + memset(&fl6, 0, sizeof(fl6)); + fl6.flowi6_proto = IPPROTO_GRE; + fl6.daddr = key->u.ipv6.dst; + fl6.flowlabel = key->label; + fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); + + dsfield = key->tos; + md = ip_tunnel_info_opts(tun_info); + if (!md) + goto tx_err; + + erspan_build_header(skb, tunnel_id_to_key32(key->tun_id), + ntohl(md->index), truncate, false); + + } else { + switch (skb->protocol) { + case htons(ETH_P_IP): + memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); + prepare_ip6gre_xmit_ipv4(skb, dev, &fl6, + &dsfield, &encap_limit); + break; + case htons(ETH_P_IPV6): + if (ipv6_addr_equal(&t->parms.raddr, &ipv6h->saddr)) + goto tx_err; + if (prepare_ip6gre_xmit_ipv6(skb, dev, &fl6, + &dsfield, &encap_limit)) + goto tx_err; + break; + default: + memcpy(&fl6, &t->fl.u.ip6, sizeof(fl6)); + break; + } + + erspan_build_header(skb, t->parms.o_key, t->parms.index, + truncate, false); + fl6.daddr = t->parms.raddr; + } /* Push GRE header. */ gre_build_header(skb, 8, TUNNEL_SEQ, htons(ETH_P_ERSPAN), 0, htonl(t->o_seqno++)); /* TooBig packet may have updated dst->dev's mtu */ - if (dst && dst_mtu(dst) > dst->dev->mtu) + if (!t->parms.collect_md && dst && dst_mtu(dst) > dst->dev->mtu) dst->ops->update_pmtu(dst, NULL, skb, dst->dev->mtu); err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,