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 B3354C43381 for ; Fri, 22 Mar 2019 18:33:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 878072175B for ; Fri, 22 Mar 2019 18:33:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CHnyhZgD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729273AbfCVSdV (ORCPT ); Fri, 22 Mar 2019 14:33:21 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:37350 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729263AbfCVSdV (ORCPT ); Fri, 22 Mar 2019 14:33:21 -0400 Received: by mail-qt1-f194.google.com with SMTP id z16so3653254qtn.4 for ; Fri, 22 Mar 2019 11:33:20 -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=V0ZBZC8qVpvNiiYA6J6qbh0v6rRFturbYQg6FWbe7tM=; b=CHnyhZgDwNfKASNaJud2Q6NIBoygLV+VmU6DpVhb0f8ETgstnd8zQY4Uia2vw0suQH 7oIKjt2Qx6ZNVoLsx0rD7ZjPwRfy2VNT6FjT9Jp1RvLUEg3rkTCoHYAjs6Z3ORrDdzGj 5xPS2jQ76lM7krXcKNqQ+odvQdTL2TpHrU0zEfyg9G2PUmyWizA+bCyINGfF/t32FXzy ZGb95iPSH6ghUQvVqeumjhgFyCYhAq126avEAYQvTNN5FZzCxyZRRWVsWV/j/qBQZtS+ JVwUGpnbmFXgMacwhV4IiD95bC1i6pq2wxAR/TFraLsRlGUw35kc6zormiQS2fUGQJvz k92A== 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=V0ZBZC8qVpvNiiYA6J6qbh0v6rRFturbYQg6FWbe7tM=; b=OPyNL6Z+V5C/LZ9RKSAi49vjNRl5bHLjXwZDUiwFKdvvlc1rK7P9ZHf0rlTs6zBVoy W5aTpRWvghJgtH4EgEZEpxD9Ez5wzGeP7LoUvUKyih/Rc+zx8ZB8l6Pe48PRdQRgUCT5 yfVq7MQ+fKiEdkb+3Qk+eAAy9ss7VN1GiIhJWQ/LPuGYJTuzW00NWB9YW9kJv4UTfP0J jJK6QkZNSky9EjIHKYnXDqw2A38KLi6m0vPcM5Repi5a4Qldnt88SKqh+kLxqgRROiBO PTSF0u2zBT6flvNtZf9VxxJadVq3CPjOD9ftIqwczu60J6Icq7WyiGgSQYB4776dmsmo TfYA== X-Gm-Message-State: APjAAAWPkwd43lEBlLR91tE72NLifY+67EATUUPAR4lC/9Y3XBnJuANG zhT5xdzJJUxT4v+lrTmxvOllrGXb X-Google-Smtp-Source: APXvYqxRufr9CZ4vsHr5L5QhBsqGsS9l/wJVyrl7DAaQRJnLa12WuWQG3MSaCNWcQH6JAEhK3qUC6w== X-Received: by 2002:a0c:871a:: with SMTP id 26mr9242294qvh.203.1553279599796; Fri, 22 Mar 2019 11:33:19 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id t49sm5828331qte.86.2019.03.22.11.33.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 11:33:18 -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 v3 12/13] selftests/bpf: convert bpf tunnel test to BPF_F_ADJ_ROOM_FIXED_GSO Date: Fri, 22 Mar 2019 14:32:59 -0400 Message-Id: <20190322183300.196277-13-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190322183300.196277-1-willemdebruijn.kernel@gmail.com> References: <20190322183300.196277-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 f6a16fd23dbd..3b79dffb8103 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 9e18754f2354..cda5317790d2 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.392.gf8f6787159e-goog