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 0C21AC4360F for ; Fri, 22 Mar 2019 15:15:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF7D920830 for ; Fri, 22 Mar 2019 15:15:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h/Dywkcb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727117AbfCVPP0 (ORCPT ); Fri, 22 Mar 2019 11:15:26 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:46619 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726995AbfCVPPX (ORCPT ); Fri, 22 Mar 2019 11:15:23 -0400 Received: by mail-qt1-f194.google.com with SMTP id z17so2834593qts.13 for ; Fri, 22 Mar 2019 08:15:22 -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=faDCZq3vDUIzfEdmy9yh7udpg6/rvRbGMCfeuiQ/5UI=; b=h/DywkcbMh1aRHO/pK9/3RO03tUSrjJZ/MCLqgRKsX3JHuif0aY9/St/FFt2bXK6H1 5yuKiQDB5Gt8I7ilK+nCrwbX3ymg1VfTbKQDuu74yPN4X5+zC0IwOhXtQgj5MSzQskLS n4Mf0JhVjOxeFRlym/UDW2+PIYvmG66XaH1aaM6oF95NMDUmxp596byF+XlG1GyH0hIS JD2zCWRE7uNMM3bBTPYKXozJbekKWF9zUBH1KT2prgkDAMxWWxC7qK1ojnO17c4JH4w2 YS3UjJTesP9y5ArLkSKorLDoSVHJacuDMIk4VKJJnAOpwMlfIzIaobsQcj9PsTC2JOTf tvjA== 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=faDCZq3vDUIzfEdmy9yh7udpg6/rvRbGMCfeuiQ/5UI=; b=cAM4we5M0/MLh3Sdb/788Xx4SM86L4uvCJKH0qcuzoI3dZkIhJjDX+vEvp2s1Fvf4E Wz6ZTlQRMaDhCrL9Mzd3VsX2AVdCFc7QiIZmY9f2/4mknNQOPHfaTsTWohwo/4ZRgV8f THr3wcw/An8r+UMVJcKjHrWozHsJAJSCrcd7SmmP/I0osDUVMFAO7iavAjmdHO6Ck5mB kZ8WZeZwBctv16xxa3ETfOnMAxiiHHtjsHRHbAl//QXny/XSp65mN6LPgZC7SNMZZ9+g 502e4bA0yxxWsCJF3SXC711wwQf9CDDOjeqjFTMNvUgBue2Jf4XOFim0lm8S3gr/UVGU pzZg== X-Gm-Message-State: APjAAAXwI7q6Y/xZxLrPsOFXdMcetUlBRzkrnwuVahuiPQ0Npk87D7qz X0zCwldejA3e0HgWWK9oxQvkPDAR X-Google-Smtp-Source: APXvYqw/4onATUMVP5FtMlGZLYq8Tm2GuMd6BTg6WWuhaEHGSDQjlmoZHVwHcxBtbNYex+9nyfyBXg== X-Received: by 2002:ac8:21ad:: with SMTP id 42mr8390959qty.219.1553267721875; Fri, 22 Mar 2019 08:15:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 08:15:21 -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 11/13] selftests/bpf: convert bpf tunnel test to BPF_ADJ_ROOM_MAC Date: Fri, 22 Mar 2019 11:15:02 -0400 Message-Id: <20190322151504.89983-12-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 Avoid moving the network layer header when prefixing tunnel headers. This avoids an explicit call to bpf_skb_store_bytes and an implicit move of the network header bytes in bpf_skb_adjust_room. Signed-off-by: Willem de Bruijn --- .../selftests/bpf/progs/test_tc_tunnel.c | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c index 900c5653105f..f6a16fd23dbd 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c @@ -72,7 +72,7 @@ static __always_inline int encap_ipv4(struct __sk_buff *skb, bool with_gre) 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_NET, 0)) + if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, 0)) return TC_ACT_SHOT; /* prepare new outer network header */ @@ -94,12 +94,6 @@ static __always_inline int encap_ipv4(struct __sk_buff *skb, bool with_gre) BPF_F_INVALIDATE_HASH) < 0) return TC_ACT_SHOT; - /* bpf_skb_adjust_room has moved header to start of room: restore */ - if (bpf_skb_store_bytes(skb, ETH_HLEN + olen, - &iph_inner, sizeof(iph_inner), - BPF_F_INVALIDATE_HASH) < 0) - return TC_ACT_SHOT; - return TC_ACT_OK; } @@ -125,7 +119,7 @@ static __always_inline int encap_ipv6(struct __sk_buff *skb, bool with_gre) 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_NET, 0)) + if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, 0)) return TC_ACT_SHOT; /* prepare new outer network header */ @@ -145,12 +139,6 @@ static __always_inline int encap_ipv6(struct __sk_buff *skb, bool with_gre) BPF_F_INVALIDATE_HASH) < 0) return TC_ACT_SHOT; - /* bpf_skb_adjust_room has moved header to start of room: restore */ - if (bpf_skb_store_bytes(skb, ETH_HLEN + olen, - &iph_inner, sizeof(iph_inner), - BPF_F_INVALIDATE_HASH) < 0) - return TC_ACT_SHOT; - return TC_ACT_OK; } @@ -207,14 +195,7 @@ static int decap_internal(struct __sk_buff *skb, int off, int len, char proto) return TC_ACT_OK; } - if (bpf_skb_load_bytes(skb, off + olen, &buf, olen) < 0) - return TC_ACT_OK; - - if (bpf_skb_adjust_room(skb, -olen, 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, off, buf, len, BPF_F_INVALIDATE_HASH) < 0) + if (bpf_skb_adjust_room(skb, -olen, BPF_ADJ_ROOM_MAC, 0)) return TC_ACT_SHOT; return TC_ACT_OK; -- 2.21.0.392.gf8f6787159e-goog