From patchwork Thu Mar 1 21:49:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 880141 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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cAWIbbYd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zsmMc2xnyz9s4v for ; Fri, 2 Mar 2018 08:50:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162347AbeCAVuu (ORCPT ); Thu, 1 Mar 2018 16:50:50 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:43798 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162201AbeCAVu2 (ORCPT ); Thu, 1 Mar 2018 16:50:28 -0500 Received: by mail-pg0-f65.google.com with SMTP id e9so2876173pgs.10 for ; Thu, 01 Mar 2018 13:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZONcUrykjJiydKh0Gx3ZRgGMd1F2DR1MvgOy1RbnDNA=; b=cAWIbbYdukMijO3vRn7YZMAW8qDnlFBNFN+tYyFly5JoIi0K5goGfeBNZPc/dGFySp uxr9XzGwzXRmirnz8dDlo0yiON3+1YDczLX5eMOKN1rQAEEKcdbcGnQ/pvM9KsYh4Vnb u/6PtN+ZZQ7oDwWa1F8u2qDWzw1TGGgmkEyV7MXC5Lf8YELnEDR9KAShJ+53yOHZZuIY pU/JBG1M4YzdMM9NiFU1ZVUGUtacB23FXDLNO07JCPNaA5XZMfFcbe6D4Z2SKWs3HQxv iDAzLXgT6EwFJlXidM2IMPZqIugNmqc3OfSdQJLqZ08e8W8CG4eeapAJA/TkUPiJTryp BXJg== 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=ZONcUrykjJiydKh0Gx3ZRgGMd1F2DR1MvgOy1RbnDNA=; b=t2ObNe26iPKpR9VTkxeyKYYCwU//KrmKgRs7T9AmdPLwijeKCb6B3FGP75p+fU+tlp +GdEXznNF+16jKjU9EE31nPrr8VGVxjRP7VtFR22npmkTAEpIZKGIOTYlB8DpkgeGsvm ZTiQUFt+4nFg+J0DaEU3NY3EifjyVRSaTat3avXIRM+Ez6OEjDv6A9Vhkxaq/rKZzmgn enY+r2lKmQqx52+vMsVWoE+N8cYEBkYh7PhOhM84qR8K1VYPYAHtyQtfBEysotgvoBft djdBRzoZtER2T/0kwTezbsjQp2XXkcFpeLy72fbrwj+XyQnAfEPjJc2HJgDUsuahNGUw ojSA== X-Gm-Message-State: APf1xPB75zPiX0pVobgS3o7KGo7cNigVMS4mko9SITkTm8tmTmrUeLhQ XFeCQtNBBfuVEuHn5H/Zs2ucvFoG X-Google-Smtp-Source: AG47ELvoKySzI3Fc0urdWDwe7wxYTBE8WHjz6s3abay1oOz2voKz2byqB1TXBWRlATLELIW2dWh+qA== X-Received: by 10.99.114.86 with SMTP id c22mr2653003pgn.162.1519941027331; Thu, 01 Mar 2018 13:50:27 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id l26sm10447074pfj.112.2018.03.01.13.50.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Mar 2018 13:50:26 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: daniel@iogearbox.net, ast@kernel.org Subject: [PATCHv2 net-next 2/2] samples/bpf: add gre sequence number test. Date: Thu, 1 Mar 2018 13:49:58 -0800 Message-Id: <1519940998-3885-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519940998-3885-1-git-send-email-u9012063@gmail.com> References: <1519940998-3885-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds tests for GRE sequence number support for metadata mode tunnel. Signed-off-by: William Tu Acked-by: Daniel Borkmann --- samples/bpf/tcbpf2_kern.c | 6 ++++-- samples/bpf/test_tunnel_bpf.sh | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/samples/bpf/tcbpf2_kern.c b/samples/bpf/tcbpf2_kern.c index efdc16d195ff..9a8db7bd6db4 100644 --- a/samples/bpf/tcbpf2_kern.c +++ b/samples/bpf/tcbpf2_kern.c @@ -52,7 +52,8 @@ int _gre_set_tunnel(struct __sk_buff *skb) key.tunnel_tos = 0; key.tunnel_ttl = 64; - ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), BPF_F_ZERO_CSUM_TX); + ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), + BPF_F_ZERO_CSUM_TX | BPF_F_SEQ_NUMBER); if (ret < 0) { ERROR(ret); return TC_ACT_SHOT; @@ -92,7 +93,8 @@ int _ip6gretap_set_tunnel(struct __sk_buff *skb) key.tunnel_label = 0xabcde; ret = bpf_skb_set_tunnel_key(skb, &key, sizeof(key), - BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX); + BPF_F_TUNINFO_IPV6 | BPF_F_ZERO_CSUM_TX | + BPF_F_SEQ_NUMBER); if (ret < 0) { ERROR(ret); return TC_ACT_SHOT; diff --git a/samples/bpf/test_tunnel_bpf.sh b/samples/bpf/test_tunnel_bpf.sh index 43ce049996ee..c265863ccdf9 100755 --- a/samples/bpf/test_tunnel_bpf.sh +++ b/samples/bpf/test_tunnel_bpf.sh @@ -23,7 +23,8 @@ function config_device { function add_gre_tunnel { # in namespace ip netns exec at_ns0 \ - ip link add dev $DEV_NS type $TYPE key 2 local 172.16.1.100 remote 172.16.1.200 + ip link add dev $DEV_NS type $TYPE seq key 2 \ + local 172.16.1.100 remote 172.16.1.200 ip netns exec at_ns0 ip link set dev $DEV_NS up ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24 @@ -43,7 +44,7 @@ function add_ip6gretap_tunnel { # in namespace ip netns exec at_ns0 \ - ip link add dev $DEV_NS type $TYPE flowlabel 0xbcdef key 2 \ + ip link add dev $DEV_NS type $TYPE seq flowlabel 0xbcdef key 2 \ local ::11 remote ::22 ip netns exec at_ns0 ip addr add dev $DEV_NS 10.1.1.100/24