From mboxrd@z Thu Jan 1 00:00:00 1970 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,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 51F4CC43381 for ; Wed, 20 Mar 2019 14:50:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20E622146E for ; Wed, 20 Mar 2019 14:50:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tCniSkUi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728271AbfCTOuH (ORCPT ); Wed, 20 Mar 2019 10:50:07 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:42763 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728257AbfCTOuG (ORCPT ); Wed, 20 Mar 2019 10:50:06 -0400 Received: by mail-qk1-f195.google.com with SMTP id b74so14264925qkg.9 for ; Wed, 20 Mar 2019 07:50:06 -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=OySVBb+REYSfBh6kCLdzkfQ1myemjVa95Pi1LWi2cJc=; b=tCniSkUiQ0ooBwPzM6kFcpqISflFiQ+Zp/3zy+JP1NlyxzYeVQK3mF52DVtkgTO2xy TVVJLDH22ffEo3SRrUSP4gyfvpw2IDqRHz2IjVIHKjS8Fmd8CU8GZQd9XJJlNtTTWhS2 s5cjFGY+FKZA1uWRwbg4SN7W+PDJ7zVaTtFojvWF8uRGQSwaBpHy5DS3bGFvswnPaDqY ujAX1I+tipvRxdMWAjlBxkwbrADsTuqDMO45kZGTb0XA8qmGAioBodrjMBq1HuVamsTp E7BF9p9q01rkvOHC9Z4JfwWQ+cDLdc/+THJhjGZdMw+JbqYshdjDA0ucJXp8p4k27w8g LcVw== 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=OySVBb+REYSfBh6kCLdzkfQ1myemjVa95Pi1LWi2cJc=; b=EhnOO8kTAn4EdzLPgfvIHGPX9WKhPmyvvXhScxGsy1qqEjiCVeTGUzvKGqk8We9KV3 z/qTb/2ZDdOaC5+LIxgVcW/W6JKwaStyH+qam9tdHJQNOUllszziMiVPAWec4Qm+4eZa M0nHqmfOk6Kvr1rpPSg5bymGf0nl3JOC0/K85hfihNFmyaZTNGARSi24SSM2KjxFmxfz p4w53XU8IFiSaeNe0BySgZ0UTWc/Yy12VHLYW/HbOSGoMX+gL37svXziYrVBVuJK4zSy 5yvNKf8WS+PNNqyObGCRIVBVSWcYrqVxxjfalaAtTcO7seLXd8PUBXXtU2CJCBkHt78h uF5A== X-Gm-Message-State: APjAAAV8lS63A6/ZeCio/XNok4YeZ/HpWYxx4E9DHWvIDkjd40yG9otn 3Ub/zLVB+CJlJddSzHccr/qoBEa8 X-Google-Smtp-Source: APXvYqynEFQ+dDnqpbcuWoXtTbdVJOPyB+9T+yZB3RufjQQQAT1CSRNgex+XQybUilYUpF7pi6X29g== X-Received: by 2002:a37:e503:: with SMTP id e3mr6599304qkg.316.1553093405407; Wed, 20 Mar 2019 07:50:05 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id x201sm1142257qkb.92.2019.03.20.07.50.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 07:50:04 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, sdf@google.com, posk@google.com, Willem de Bruijn Subject: [PATCH bpf-next 12/13] selftests/bpf: convert bpf tunnel test to BPF_F_ADJ_ROOM_FIXED_GSO Date: Wed, 20 Mar 2019 10:49:43 -0400 Message-Id: <20190320144944.147862-13-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog In-Reply-To: <20190320144944.147862-1-willemdebruijn.kernel@gmail.com> References: <20190320144944.147862-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 Lower route MTU to ensure packets fit in device MTU after encap, then skip the gso_size changes. Signed-off-by: Willem de Bruijn --- tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 11 ++++++++--- tools/testing/selftests/bpf/test_tc_tunnel.sh | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c index f6a16fd23dbd5..3b79dffb81037 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c @@ -52,6 +52,7 @@ static __always_inline int encap_ipv4(struct __sk_buff *skb, bool with_gre) struct grev4hdr h_outer; struct iphdr iph_inner; struct tcphdr tcph; + __u64 flags; int olen; if (bpf_skb_load_bytes(skb, ETH_HLEN, &iph_inner, @@ -69,10 +70,11 @@ static __always_inline int encap_ipv4(struct __sk_buff *skb, bool with_gre) if (tcph.dest != __bpf_constant_htons(cfg_port)) return TC_ACT_OK; + flags = BPF_F_ADJ_ROOM_FIXED_GSO; olen = with_gre ? sizeof(h_outer) : sizeof(h_outer.ip); /* add room between mac and network header */ - if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, 0)) + if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, flags)) return TC_ACT_SHOT; /* prepare new outer network header */ @@ -102,6 +104,7 @@ static __always_inline int encap_ipv6(struct __sk_buff *skb, bool with_gre) struct ipv6hdr iph_inner; struct grev6hdr h_outer; struct tcphdr tcph; + __u64 flags; int olen; if (bpf_skb_load_bytes(skb, ETH_HLEN, &iph_inner, @@ -116,10 +119,11 @@ static __always_inline int encap_ipv6(struct __sk_buff *skb, bool with_gre) if (tcph.dest != __bpf_constant_htons(cfg_port)) return TC_ACT_OK; + flags = BPF_F_ADJ_ROOM_FIXED_GSO; olen = with_gre ? sizeof(h_outer) : sizeof(h_outer.ip); /* add room between mac and network header */ - if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, 0)) + if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, flags)) return TC_ACT_SHOT; /* prepare new outer network header */ @@ -195,7 +199,8 @@ static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) return TC_ACT_OK; } - if (bpf_skb_adjust_room(skb, -olen, BPF_ADJ_ROOM_MAC, 0)) + if (bpf_skb_adjust_room(skb, -olen, BPF_ADJ_ROOM_MAC, + BPF_F_ADJ_ROOM_FIXED_GSO)) return TC_ACT_SHOT; return TC_ACT_OK; diff --git a/tools/testing/selftests/bpf/test_tc_tunnel.sh b/tools/testing/selftests/bpf/test_tc_tunnel.sh index 5d9d56520c694..3d2111d89315c 100755 --- a/tools/testing/selftests/bpf/test_tc_tunnel.sh +++ b/tools/testing/selftests/bpf/test_tc_tunnel.sh @@ -35,6 +35,12 @@ setup() { ip -netns "${ns1}" -6 addr add "${ns1_v6}/64" dev veth1 nodad ip -netns "${ns2}" -6 addr add "${ns2_v6}/64" dev veth2 nodad + # clamp route to reserve room for tunnel headers + ip -netns "${ns1}" -4 route flush table main + ip -netns "${ns1}" -6 route flush table main + ip -netns "${ns1}" -4 route add "${ns2_v4}" mtu 1476 dev veth1 + ip -netns "${ns1}" -6 route add "${ns2_v6}" mtu 1456 dev veth1 + sleep 1 dd if=/dev/urandom of="${infile}" bs="${datalen}" count=1 status=none -- 2.21.0.225.g810b269d1ac-goog