From patchwork Tue Sep 26 09:22:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amine Kherbouche X-Patchwork-Id: 818502 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=6wind-com.20150623.gappssmtp.com header.i=@6wind-com.20150623.gappssmtp.com header.b="L947GHvT"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y1b983LRQz9t3B for ; Tue, 26 Sep 2017 19:23:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030528AbdIZJXT (ORCPT ); Tue, 26 Sep 2017 05:23:19 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:45987 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968433AbdIZJXM (ORCPT ); Tue, 26 Sep 2017 05:23:12 -0400 Received: by mail-wm0-f41.google.com with SMTP id q124so5601010wmb.0 for ; Tue, 26 Sep 2017 02:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VrfLAMGnfflrJkxr55dWjm2jka7PKqb22x1ofaEZZWA=; b=L947GHvTe5GhkSQHraGRjY9P92KKW6jiXyaoFgS9Yu5Mi/ofd3x2EayEERLZmxmgNV APatEGwjbBHFU20+q2YYHT8EwdbOg+WTAbiGpxhHUBJexyuV1U1pTWAYrlS1IQLs7bY7 9UJpUUUk4Yx3zTH8YRPkDPD0KCcI3RHIKEN8yw4b5rp4ikviAeShZfnHKUaxrxr0aQRr aBJHbJrmnxc0SaH7Ti+ggtHXQNir1dK5UWtz5XtH1NwGuOrofUzQ9mj/GduAf4+3a1MK r2ZqM/znoDNNDneQxTdlRRBKaiO84pi5SH1Mbs/xcNLbPiX2M/hgT35VC8CsLKM23fuS 1ksw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VrfLAMGnfflrJkxr55dWjm2jka7PKqb22x1ofaEZZWA=; b=lqHfrSujo38ZFPgNyO3iVJqe8cNGLfvA7Ei2F1V0BISugtea7ApHBIEgGolXqT7UpO 7QHLSUscwUs64SBQ+f9lZSmMzSPptaW0IhIZDn+ylsybZq5BKjeFlOscaoYss3OSdDaI BAT+4NuOgtpDYCP+P0oA9eZg1SNzQtoZE1FFFq97uPyGJA1Ax/ESQ14RbmPOEpMo/TEk Uk90fFfPao7dqs8emtobZHQz0wygiHC6To+B65TCbu90eZ0lMlVD/qvTKr7cBTybTu/L sEkJ49+tbwu0S37nLfVwTDLGVE042IZFxR1QhEk1Zkra4XEyso7k6iKvRfhTKjv87IPS D/6Q== X-Gm-Message-State: AHPjjUh3YR06nKB9EflJ6+045lFu1FXpR0lF14/SvaCTFesGNxh8UOls 4Rm5E8V//zdAoErcrJGkLNIFFMDJ X-Google-Smtp-Source: AOwi7QA5vm5DKyE0ZvLoSsZB+5GBFp/y/dtPCdYX38UnTzwGkpfOqTU0qGVUBS8oDxV7wWVa2TATRQ== X-Received: by 10.28.113.196 with SMTP id d65mr2354154wmi.105.1506417790464; Tue, 26 Sep 2017 02:23:10 -0700 (PDT) Received: from griffon.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id b66sm754235wmh.25.2017.09.26.02.23.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 02:23:09 -0700 (PDT) From: Amine Kherbouche To: netdev@vger.kernel.org, xeb@mail.ru, roopa@cumulusnetworks.com Cc: amine.kherbouche@6wind.com, equinox@diac24.net Subject: [PATCH v2 2/2] ip_tunnel: add mpls over gre encapsulation Date: Tue, 26 Sep 2017 11:22:51 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit introduces the MPLSoGRE support (RFC 4023), using ip tunnel API. Encap: - Add a new iptunnel type mpls. - Share tx path: gre type mpls loaded from skb->protocol. Decap: - pull gre hdr and call mpls_forward(). Signed-off-by: Amine Kherbouche --- include/net/gre.h | 3 +++ include/uapi/linux/if_tunnel.h | 1 + net/ipv4/gre_demux.c | 22 ++++++++++++++++++++++ net/ipv4/ip_gre.c | 9 +++++++++ net/ipv6/ip6_gre.c | 7 +++++++ net/mpls/af_mpls.c | 40 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 82 insertions(+) diff --git a/include/net/gre.h b/include/net/gre.h index d25d836..88a8343 100644 --- a/include/net/gre.h +++ b/include/net/gre.h @@ -35,6 +35,9 @@ struct net_device *gretap_fb_dev_create(struct net *net, const char *name, u8 name_assign_type); int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, bool *csum_err, __be16 proto, int nhs); +#if IS_ENABLED(CONFIG_MPLS) +int mpls_gre_rcv(struct sk_buff *skb, int gre_hdr_len); +#endif static inline int gre_calc_hlen(__be16 o_flags) { diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h index 2e52088..a2f48c0 100644 --- a/include/uapi/linux/if_tunnel.h +++ b/include/uapi/linux/if_tunnel.h @@ -84,6 +84,7 @@ enum tunnel_encap_types { TUNNEL_ENCAP_NONE, TUNNEL_ENCAP_FOU, TUNNEL_ENCAP_GUE, + TUNNEL_ENCAP_MPLS, }; #define TUNNEL_ENCAP_FLAG_CSUM (1<<0) diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index b798862..a6a937e 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -23,6 +23,9 @@ #include #include #include +#if IS_ENABLED(CONFIG_MPLS) +#include +#endif #include #include @@ -122,6 +125,25 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, } EXPORT_SYMBOL(gre_parse_header); +#if IS_ENABLED(CONFIG_MPLS) +int mpls_gre_rcv(struct sk_buff *skb, int gre_hdr_len) +{ + if (unlikely(!pskb_may_pull(skb, gre_hdr_len))) + goto drop; + + /* Pop GRE hdr and reset the skb */ + skb_pull(skb, gre_hdr_len); + skb_reset_network_header(skb); + + mpls_forward(skb, skb->dev, NULL, NULL); + + return 0; +drop: + return NET_RX_DROP; +} +EXPORT_SYMBOL(mpls_gre_rcv); +#endif + static int gre_rcv(struct sk_buff *skb) { const struct gre_protocol *proto; diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 9cee986..dd4431c 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -412,10 +412,19 @@ static int gre_rcv(struct sk_buff *skb) return 0; } +#if IS_ENABLED(CONFIG_MPLS) + if (unlikely(tpi.proto == htons(ETH_P_MPLS_UC))) { + if (mpls_gre_rcv(skb, hdr_len)) + goto drop; + return 0; + } +#endif + if (ipgre_rcv(skb, &tpi, hdr_len) == PACKET_RCVD) return 0; icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); + drop: kfree_skb(skb); return 0; diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index c82d41e..e52396d 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -476,6 +476,13 @@ static int gre_rcv(struct sk_buff *skb) if (hdr_len < 0) goto drop; +#if IS_ENABLED(CONFIG_MPLS) + if (unlikely(tpi.proto == htons(ETH_P_MPLS_UC))) { + if (mpls_gre_rcv(skb, hdr_len)) + goto drop; + return 0; + } +#endif if (iptunnel_pull_header(skb, hdr_len, tpi.proto, false)) goto drop; diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 36ea2ad..5505074 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #if IS_ENABLED(CONFIG_IPV6) #include @@ -39,6 +40,40 @@ static int one = 1; static int label_limit = (1 << 20) - 1; static int ttl_max = 255; +size_t ipgre_mpls_encap_hlen(struct ip_tunnel_encap *e) +{ + return sizeof(struct mpls_shim_hdr); +} + +int ipgre_mpls_build_header(struct sk_buff *skb, struct ip_tunnel_encap *e, + u8 *protocol, struct flowi4 *fl4) +{ + return 0; +} + +static const struct ip_tunnel_encap_ops mpls_iptun_ops = { + .encap_hlen = ipgre_mpls_encap_hlen, + .build_header = ipgre_mpls_build_header, +}; + +static int ipgre_tunnel_encap_add_mpls_ops(void) +{ + int ret = -1; + +#if IS_ENABLED(CONFIG_NET_IP_TUNNEL) + ret = ip_tunnel_encap_add_ops(&mpls_iptun_ops, TUNNEL_ENCAP_MPLS); +#endif + + return ret; +} + +static void ipgre_tunnel_encap_del_mpls_ops(void) +{ +#if IS_ENABLED(CONFIG_NET_IP_TUNNEL) + ip_tunnel_encap_del_ops(&mpls_iptun_ops, TUNNEL_ENCAP_MPLS); +#endif +} + static void rtmsg_lfib(int event, u32 label, struct mpls_route *rt, struct nlmsghdr *nlh, struct net *net, u32 portid, unsigned int nlm_flags); @@ -2486,6 +2521,10 @@ static int __init mpls_init(void) 0); rtnl_register(PF_MPLS, RTM_GETNETCONF, mpls_netconf_get_devconf, mpls_netconf_dump_devconf, 0); + err = ipgre_tunnel_encap_add_mpls_ops(); + if (err) + pr_err("Can't add mpls over gre tunnel ops\n"); + err = 0; out: return err; @@ -2503,6 +2542,7 @@ static void __exit mpls_exit(void) dev_remove_pack(&mpls_packet_type); unregister_netdevice_notifier(&mpls_dev_notifier); unregister_pernet_subsys(&mpls_net_ops); + ipgre_tunnel_encap_del_mpls_ops(); } module_exit(mpls_exit);