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 5DF13C43381 for ; Fri, 22 Mar 2019 18:33:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2BB8721900 for ; Fri, 22 Mar 2019 18:33:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nHjEXTA9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729265AbfCVSdV (ORCPT ); Fri, 22 Mar 2019 14:33:21 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:46475 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729244AbfCVSdU (ORCPT ); Fri, 22 Mar 2019 14:33:20 -0400 Received: by mail-qk1-f193.google.com with SMTP id s81so1778615qke.13 for ; Fri, 22 Mar 2019 11:33:19 -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=nHjEXTA9/y8UztsicW7GSdghjh8qKwGVtw4uTWN0Xokv0e9wjveN2UnH95UTQjxYa2 xj2zyen+186gn60dL+grt/SrfH7LtEjwNvFMLfRkw3gFGU7Bp4XeKTcA/f9FO20vjskW 4eeTSrdfRz1/gpDc5zchcfaSHji2YpaOevjgK531AI6AMRrQAtj1M9LV0GnB5L0vBigb DBfA+IaBFLUTyX9VqJZBZNmRX54KOUrfvb6Yf8p/mtPXk8XjLGF1sVK9Rqy2pSAsEeGc K1v6OeQ8b4p714ZUJdFFSnH/bGuya8RGLKON/js53PFdZgUGQfVsCbgm9R+Ekn9of3am qMfg== 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=EObG6waXgbj4e8Axiesawzk+QgIUy84e8KAP+G8j1Kx12RpDm4f9mQRY+dIQfCY8Ul gj3t0AxQdHmFt8ccClCqBs8Rh3ncByXIE216e0u6m0WlTUkj1NGvYx4kXim2gUdLue2K 9HpKbQW/0mOyfdNAEH6TqZ4qzNcvEtwrfL5jsIhqe3AHmp9dmutfMNVANsOyC9+COHb4 G0mfDRpczCNykvF2eHo/7qT+6gMTJ9scyjFJP3eUaTkINa58wP+QrfBnRsOAk4X0dcU9 YgRBbuoy2FqLMdOgKyXJlMpNJMQVu3+siWZfyovCDDMmOnCUH/2DFp3Ay8Z66eVSMfXZ 59Bw== X-Gm-Message-State: APjAAAW1dF8d0LMpUOCyad+8lBE8atoQ0dXrEeSHZQvl5nV2hS9Ckk1n r620T+8/sGOkaMO5euU9rbeNAR6j X-Google-Smtp-Source: APXvYqzXv8efMumZW2nuypN+9UjX4nK24NAXmwTzViyAZSgLJrkq0tTV2YihvKTDS9/EBsXjYngAXw== X-Received: by 2002:a05:620a:1194:: with SMTP id b20mr9034998qkk.258.1553279598597; Fri, 22 Mar 2019 11:33:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 11:33:17 -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 11/13] selftests/bpf: convert bpf tunnel test to BPF_ADJ_ROOM_MAC Date: Fri, 22 Mar 2019 14:32:58 -0400 Message-Id: <20190322183300.196277-12-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 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