From patchwork Tue Dec 5 23:10:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 844957 X-Patchwork-Delegate: shemminger@vyatta.com 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="AvvXNU5G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yryCd66CGz9sPm for ; Wed, 6 Dec 2017 10:10:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752842AbdLEXKu (ORCPT ); Tue, 5 Dec 2017 18:10:50 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:46386 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752194AbdLEXKs (ORCPT ); Tue, 5 Dec 2017 18:10:48 -0500 Received: by mail-pg0-f68.google.com with SMTP id b11so1252942pgu.13 for ; Tue, 05 Dec 2017 15:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=mxkExEo/qSmQQhF2J7OsgTul70bZ288F2HqCgNq3wDg=; b=AvvXNU5GpKjBTbUz/XLaSu0eQYrR4Z1nPTiWUc1LRLT52Hwr+DUZovdCBdsMGwg9eY 8WK1AtBiBC9tXPS/IkwCSTn7tBNFAPxJgKIQ6/8O/RZqZ0leloOK7N11bCoxTHxUqZEB AqW7JjcMaSNcyYPpasLf8jieOgZIfYqJOhbzVf7UXizncjw+OgB+zzB0sl04j/R/MkrV Q7xwrRhmIgRVV1AP9dD6BRnpIBXNWFUlSc06EHmR1V+xUSLXCONaExEUAJBBgw50fAH4 En3Wb7mi4XMprUm6tsB35KupL2OoZ8J2v4XsXfUF5LnnCOPwkzqHG+8hhHxklwS+KR5F D9vQ== 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; bh=mxkExEo/qSmQQhF2J7OsgTul70bZ288F2HqCgNq3wDg=; b=gQ1WfjNDrsI5pPuAPk59U7sVHzXMSd/kkgvUKqPiyx1UxxTlAggXVBq31lubH/LY/o J2CnRhAvx5GGJhVWP8JV0zq+dsrm5BHtQJuX+diN+J7aePlz+GESPpf3EB0f68KxWVyy 9N4kuWROdtQPR4Cx2N5YB9RgfGu8IbQrw3n0dAR1o9AwzCvoZfGH2Ul938ut++YzAz1i 2O1O/wzNb5iFniAsIxJ0qr14to7ri1YDgJrxnyvTpfww+48SM3Wxf+MgTy/X6JHjW7gE 8QRfDpE+HnmWXSfl8RP8T6ddwRjsjoJKfNHNm78D2I+KYwRZCg0CEfzYHQ+sCNfJkeZ2 v2FA== X-Gm-Message-State: AKGB3mL+Vs4YiOwCSYsu7u627CK4j3/YBNfl+mEWsVmU+bAtfxP4fpTu ot4+7iZtJHdnvFSzNoT+2tamOuV0 X-Google-Smtp-Source: AGs4zMZ4eSNcwzDtIzWzXmo7TWNbBmoItfUjrJqijNdritezSzAhcgnHip1mUT4gWN6o3E0JCyBkfg== X-Received: by 10.98.17.72 with SMTP id z69mr615067pfi.86.1512515447463; Tue, 05 Dec 2017 15:10:47 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id v64sm1483884pfi.187.2017.12.05.15.10.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Dec 2017 15:10:46 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH v2 iproute2 net-next] gre6: add collect metadata support Date: Tue, 5 Dec 2017 15:10:37 -0800 Message-Id: <1512515437-20922-1-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds 'external' option to support collect metadata gre6 tunnel. Example of L3 and L2 gre device: bash:~# ip link add dev ip6gre123 type ip6gre external bash:~# ip link add dev ip6gretap123 type ip6gretap external Signed-off-by: William Tu --- change in v2: - remove "noexternal" in man page --- ip/link_gre6.c | 55 ++++++++++++++++++++++++++++++++------------------- man/man8/ip-link.8.in | 6 ++++++ 2 files changed, 41 insertions(+), 20 deletions(-) diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 0a82eaecf2cd..2cb46ca116d0 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -105,6 +105,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u16 encapflags = TUNNEL_ENCAP_FLAG_CSUM6; __u16 encapsport = 0; __u16 encapdport = 0; + __u8 metadata = 0; int len; __u32 fwmark = 0; __u32 erspan_idx = 0; @@ -178,6 +179,9 @@ get_failed: if (greinfo[IFLA_GRE_ENCAP_SPORT]) encapsport = rta_getattr_u16(greinfo[IFLA_GRE_ENCAP_SPORT]); + if (greinfo[IFLA_GRE_COLLECT_METADATA]) + metadata = 1; + if (greinfo[IFLA_GRE_ENCAP_DPORT]) encapdport = rta_getattr_u16(greinfo[IFLA_GRE_ENCAP_DPORT]); @@ -355,6 +359,8 @@ get_failed: encapflags |= TUNNEL_ENCAP_FLAG_REMCSUM; } else if (strcmp(*argv, "noencap-remcsum") == 0) { encapflags &= ~TUNNEL_ENCAP_FLAG_REMCSUM; + } else if (strcmp(*argv, "external") == 0) { + metadata = 1; } else if (strcmp(*argv, "fwmark") == 0) { NEXT_ARG(); if (strcmp(*argv, "inherit") == 0) { @@ -388,26 +394,30 @@ get_failed: argc--; argv++; } - addattr32(n, 1024, IFLA_GRE_IKEY, ikey); - addattr32(n, 1024, IFLA_GRE_OKEY, okey); - addattr_l(n, 1024, IFLA_GRE_IFLAGS, &iflags, 2); - addattr_l(n, 1024, IFLA_GRE_OFLAGS, &oflags, 2); - addattr_l(n, 1024, IFLA_GRE_LOCAL, &laddr, sizeof(laddr)); - addattr_l(n, 1024, IFLA_GRE_REMOTE, &raddr, sizeof(raddr)); - if (link) - addattr32(n, 1024, IFLA_GRE_LINK, link); - addattr_l(n, 1024, IFLA_GRE_TTL, &hop_limit, 1); - addattr_l(n, 1024, IFLA_GRE_ENCAP_LIMIT, &encap_limit, 1); - addattr_l(n, 1024, IFLA_GRE_FLOWINFO, &flowinfo, 4); - addattr32(n, 1024, IFLA_GRE_FLAGS, flags); - addattr32(n, 1024, IFLA_GRE_FWMARK, fwmark); - if (erspan_idx != 0) - addattr32(n, 1024, IFLA_GRE_ERSPAN_INDEX, erspan_idx); - - addattr16(n, 1024, IFLA_GRE_ENCAP_TYPE, encaptype); - addattr16(n, 1024, IFLA_GRE_ENCAP_FLAGS, encapflags); - addattr16(n, 1024, IFLA_GRE_ENCAP_SPORT, htons(encapsport)); - addattr16(n, 1024, IFLA_GRE_ENCAP_DPORT, htons(encapdport)); + if (!metadata) { + addattr32(n, 1024, IFLA_GRE_IKEY, ikey); + addattr32(n, 1024, IFLA_GRE_OKEY, okey); + addattr_l(n, 1024, IFLA_GRE_IFLAGS, &iflags, 2); + addattr_l(n, 1024, IFLA_GRE_OFLAGS, &oflags, 2); + addattr_l(n, 1024, IFLA_GRE_LOCAL, &laddr, sizeof(laddr)); + addattr_l(n, 1024, IFLA_GRE_REMOTE, &raddr, sizeof(raddr)); + if (link) + addattr32(n, 1024, IFLA_GRE_LINK, link); + addattr_l(n, 1024, IFLA_GRE_TTL, &hop_limit, 1); + addattr_l(n, 1024, IFLA_GRE_ENCAP_LIMIT, &encap_limit, 1); + addattr_l(n, 1024, IFLA_GRE_FLOWINFO, &flowinfo, 4); + addattr32(n, 1024, IFLA_GRE_FLAGS, flags); + addattr32(n, 1024, IFLA_GRE_FWMARK, fwmark); + if (erspan_idx != 0) + addattr32(n, 1024, IFLA_GRE_ERSPAN_INDEX, erspan_idx); + + addattr16(n, 1024, IFLA_GRE_ENCAP_TYPE, encaptype); + addattr16(n, 1024, IFLA_GRE_ENCAP_FLAGS, encapflags); + addattr16(n, 1024, IFLA_GRE_ENCAP_SPORT, htons(encapsport)); + addattr16(n, 1024, IFLA_GRE_ENCAP_DPORT, htons(encapdport)); + } else { + addattr_l(n, 1024, IFLA_GRE_COLLECT_METADATA, NULL, 0); + } return 0; } @@ -426,6 +436,11 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (!tb) return; + if (tb[IFLA_GRE_COLLECT_METADATA]) { + print_bool(PRINT_ANY, "collect_metadata", "external", true); + return; + } + if (tb[IFLA_GRE_FLAGS]) flags = rta_getattr_u32(tb[IFLA_GRE_FLAGS]); diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index a6a10e577b1f..eb04f887c940 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -755,6 +755,8 @@ the following additional arguments are supported: .BI "dscp inherit" ] [ .BI dev " PHYS_DEV " +] [ +.RB external ] .in +8 @@ -833,6 +835,10 @@ or .IR 00 ".." ff when tunneling non-IP packets. The default value is 00. +.sp +.RB external +- make this tunnel externally controlled (or not, which is the default). + .in -8 .TP