Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F80BC4360F for ; Fri, 22 Mar 2019 15:15:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 008C120830 for ; Fri, 22 Mar 2019 15:15:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AoEYdRCj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726916AbfCVPPP (ORCPT ); Fri, 22 Mar 2019 11:15:15 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:34247 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726681AbfCVPPM (ORCPT ); Fri, 22 Mar 2019 11:15:12 -0400 Received: by mail-qk1-f194.google.com with SMTP id n68so1432899qka.1 for ; Fri, 22 Mar 2019 08:15:12 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=3IJTOJ3NuE4a4eb2X9ZRlfqVP0NHRFc69ek8Q6qamsc=; b=AoEYdRCjD+LmEf2eatmoyYOoM3l1MwcB7oBghQGs70AYgAxW74VRVi2LBhytd1oBok izFUb+7R9GUr4qMr7jBfTDCWLWO2ORIdtvM7SYC2CZAmDgEBJYFLMtGuwhYKylKrg/ZQ HwOipQrA/qWc9LxlKu44VtlNleXsyZleVVJ0cQnS0RQUyx6OFMJMcC9NeVl0kWwnWVXz 0kLS3z7aa/g/AuYD+Qg5+BpTqX5ZowRqY5ztdfqpDt6N50fio9Kdb4VHDTsGaSaj/rNv F9Hhz6fUCZG2PUH7oi/bHtTkaoJkBaATS7p94h08kDl1VBC6yZ/e7uQBDgIPI8nreepJ PxGw== 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:mime-version:content-transfer-encoding; bh=3IJTOJ3NuE4a4eb2X9ZRlfqVP0NHRFc69ek8Q6qamsc=; b=ZLgZIHFTIgPPoOEE/FsqlMHMuTu4zkcE7QsgCAa/5kcUJG7ZBmWE0e+l+QsKhmxq6c m8Ay0y+oga0d/4Ce6QMRrF5ZGq3NxAiKXVrOWCtaLLmcWxhk3AQnYLUQxeKBpqADwYF7 xuXwZqdv7Qt89BHh8Ecmq3a5DerV9duq5SoYhENzyYCrbFuo+Ek12vG7XOssAF0HVLRj Cu3UMqof4IzRXrBpikEYz8w6/ncX+2VVQdwO/YvK4YqqQ+c6zw6SpdAZ7E69W5Ps+csz rPI6g9abtgbe8V4zJ8p5GjyoJ5nF52psA3YC2RLTmAbzBpFqpPlnOoJJ1h6cc8RGSrR9 wNVg== X-Gm-Message-State: APjAAAXKVD2TBgbeJ6viWL4vQY9pqR4Yn+O1Lwwk2XcmgRLeuL207yAd QzeKfX2Kb3InZU//yOW0Z3l9MNZX X-Google-Smtp-Source: APXvYqyfBmgoe0klDm1Jls7JcH/uUC/2M9tBQnIBi8EjoP4M84wajAKIk4HiXXkqppSNeRfLHsELtg== X-Received: by 2002:a37:d8e:: with SMTP id 136mr7803911qkn.95.1553267711656; Fri, 22 Mar 2019 08:15:11 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id v4sm4631317qtq.94.2019.03.22.08.15.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 08:15:10 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, alan.maguire@oracle.com, Willem de Bruijn Subject: [PATCH bpf-next v2 03/13] selftests/bpf: expand bpf tunnel test with decap Date: Fri, 22 Mar 2019 11:14:54 -0400 Message-Id: <20190322151504.89983-4-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190322151504.89983-1-willemdebruijn.kernel@gmail.com> References: <20190322151504.89983-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn The bpf tunnel test encapsulates using bpf, then decapsulates using a standard tunnel device to verify correctness. Once encap is verified, also test decap, by replacing the tunnel device on decap with another bpf program. Signed-off-by: Willem de Bruijn --- .../selftests/bpf/progs/test_tc_tunnel.c | 31 +++++++++++++++++++ tools/testing/selftests/bpf/test_tc_tunnel.sh | 9 ++++++ 2 files changed, 40 insertions(+) diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c index 8223e4347be8..25db148635ab 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c @@ -80,4 +80,35 @@ int encap_f(struct __sk_buff *skb) return TC_ACT_OK; } +SEC("decap") +int decap_f(struct __sk_buff *skb) +{ + struct iphdr iph_outer, iph_inner; + + if (skb->protocol != __bpf_constant_htons(ETH_P_IP)) + return TC_ACT_OK; + + if (bpf_skb_load_bytes(skb, ETH_HLEN, &iph_outer, + sizeof(iph_outer)) < 0) + return TC_ACT_OK; + + if (iph_outer.ihl != 5 || iph_outer.protocol != IPPROTO_IPIP) + return TC_ACT_OK; + + if (bpf_skb_load_bytes(skb, ETH_HLEN + sizeof(iph_outer), + &iph_inner, sizeof(iph_inner)) < 0) + return TC_ACT_OK; + + if (bpf_skb_adjust_room(skb, -(int)sizeof(iph_outer), + BPF_ADJ_ROOM_NET, 0)) + return TC_ACT_SHOT; + + /* bpf_skb_adjust_room has moved outer over inner header: restore */ + if (bpf_skb_store_bytes(skb, ETH_HLEN, &iph_inner, sizeof(iph_inner), + BPF_F_INVALIDATE_HASH) < 0) + return TC_ACT_SHOT; + + return TC_ACT_OK; +} + char __license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/test_tc_tunnel.sh b/tools/testing/selftests/bpf/test_tc_tunnel.sh index 6ebb288a3afc..91151d91e5a1 100755 --- a/tools/testing/selftests/bpf/test_tc_tunnel.sh +++ b/tools/testing/selftests/bpf/test_tc_tunnel.sh @@ -72,4 +72,13 @@ ip netns exec "${ns2}" ip link set dev testtun0 up echo "test bpf encap with tunnel device decap" client_connect +# serverside, use BPF for decap +ip netns exec "${ns2}" ip link del dev testtun0 +ip netns exec "${ns2}" tc qdisc add dev veth2 clsact +ip netns exec "${ns2}" tc filter add dev veth2 ingress \ + bpf direct-action object-file ./test_tc_tunnel.o section decap +server_listen +echo "test bpf encap with bpf decap" +client_connect + echo OK -- 2.21.0.392.gf8f6787159e-goog