From patchwork Thu Mar 1 00:11:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 879505 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="H7xFI2OU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zsCYG27WRz9s1B for ; Thu, 1 Mar 2018 11:12:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965257AbeCAAMQ (ORCPT ); Wed, 28 Feb 2018 19:12:16 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:43959 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965166AbeCAAMJ (ORCPT ); Wed, 28 Feb 2018 19:12:09 -0500 Received: by mail-pg0-f65.google.com with SMTP id e9so1595623pgs.10 for ; Wed, 28 Feb 2018 16:12:09 -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=DJddU88zV9AD5cKlzfr5Tp+wEOhddq6Hge23SlWmFns=; b=H7xFI2OUv7doziykGEh07BOV+U9QsvpcrrA+lYKjCC2l6M+qCsRXJhXPBAIEYVcJXg vHgT4HMqeSCmKySNYVE4rNh4plg6+VehVu8j+/utyu5ANlalLAFA83smNANUzqcAQo+u Rax1CyGFfhDI5rQUPNvLowZ/7j5sWZaESH5XHTE1/iswadjCbg5WBeDrmL3kkDWCwVMa FELb0K3Ew7P+9ZpoLPjAa/l4QSSn6q0lwKLjkK5kVIIMuWFmP6dBBYhTYAF+mmUj/FE0 d2EmHELy4aanH1NOwPOgf3t4XOdz4YUq2YvnN6RqaM/lHNhxS8mzdykgxSDO6hwjacPb WKyA== 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=DJddU88zV9AD5cKlzfr5Tp+wEOhddq6Hge23SlWmFns=; b=C67GLmnmlNPPr1Kt0UN5K3QdNnwiu6CJFMsf7knhUafpMLZKv3vIB7I4I1LXY/jvyw jSxpdOmljguFBP5fCs+x6k4ioDLG/aZpz7GZegiFuE3Ow7O9kF1BnL32t8L2vYQZpEI0 aWK5xUbVCXCreq8QDLoiBOfQTDr6th/VYY2f0uHwR1idXSx9JLhbVMg7m+n1g4i7776G BFMn9bPESltrZ3XN5zK5VVwXqWyfTe9zQJR+TIN69fpA0QuIyjhPCq4NmnSXJHuuG7n6 eJ8SNHJymX1GJuVvY8Vf4cOvNaGZJxZz8rOcL7ncsJjk2qriJazAHN/+IKRVanSkRL9D UVoA== X-Gm-Message-State: APf1xPBGE3/J2hFmODwPCWaVEfrRAa1gJM+m+rLcSIGeFp025CwPjWYK 92o52pice8lichdFq/5O1+z8VTxs X-Google-Smtp-Source: AH8x2276HGkImhcBmg+nd0vseaaorHbBvvTZEX+QwddMgvWXqvd0rC9LA7iou8MUEwFyOBqpLlmHeg== X-Received: by 10.98.102.82 with SMTP id a79mr19525095pfc.138.1519863129007; Wed, 28 Feb 2018 16:12:09 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id u133sm4158057pgc.93.2018.02.28.16.12.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Feb 2018 16:12:08 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Cc: daniel@iogearbox.net, ast@kernel.org Subject: [PATCH net-next 2/2] samples/bpf: add gre sequence number test. Date: Wed, 28 Feb 2018 16:11:41 -0800 Message-Id: <1519863101-112083-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519863101-112083-1-git-send-email-u9012063@gmail.com> References: <1519863101-112083-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 --- samples/bpf/tcbpf2_kern.c | 6 ++++-- samples/bpf/test_tunnel_bpf.sh | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/samples/bpf/tcbpf2_kern.c b/samples/bpf/tcbpf2_kern.c index efdc16d195ff..f9d0db2be21b 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_GRE_SEQ); 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_GRE_SEQ); 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..01a07fb9efa9 100755 --- a/samples/bpf/test_tunnel_bpf.sh +++ b/samples/bpf/test_tunnel_bpf.sh @@ -23,7 +23,7 @@ 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 +43,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