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 85FB3C43381 for ; Wed, 20 Mar 2019 14:50:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AB282146E for ; Wed, 20 Mar 2019 14:50:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vRWB7CES" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728251AbfCTOuV (ORCPT ); Wed, 20 Mar 2019 10:50:21 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:45571 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728222AbfCTOuF (ORCPT ); Wed, 20 Mar 2019 10:50:05 -0400 Received: by mail-qt1-f193.google.com with SMTP id v20so2769881qtv.12 for ; Wed, 20 Mar 2019 07:50:04 -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=0aTdP7Ei7TpLRHJBLYCj2g5MJ9PdP46SilYb0S7ghvY=; b=vRWB7CES0tfeo58pAYk/iPixRnHRL/vAW3NPyM97rzYgH22UKAxA/J3lX85xbuSAsG JmNw2LagSzGHaK1p0nkJQkML4c8pvDeq3he4h4t3HhkDwu1IrZSh9LWuwJfALUUMOakw JQQZoszoSOQCV5tTHmof14WVYQlKkIDDAJkMg25f7mi7sP3g8NfYU5AylCSZEq2jHzX6 +E8xgqQIdNFRbbRuke/8XFhCTbQsnDSZiGxLazJsQu9YfXSqYoXv3XsSv6RFsdrcAQH9 wQaKLqW3HpdhZQfMMFJAVcDRo9pH88fc4/puGMRGECKm0xM8E4qWdxYJaSYstvVTojvd 1QJg== 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=0aTdP7Ei7TpLRHJBLYCj2g5MJ9PdP46SilYb0S7ghvY=; b=JSXjn0MjRv9HaF73WmWs2bi2Gigr2i72QmaVi+0P+MyEAoRuolulfa86gb2TqqkePB hZWyQ2KXNIscS4TsQamVOQ8+51uwI0pRrBFbsKJLZpoJFlmHO6XJIh3wbCPQL46lG4im qxArqaWxLMlHpiKWbzuuvOFEl4UIC0Moupov4Bf7KwM43XwOGSPmofqkR2vBZkW8WsDx sBh6G3i2CIkJ0rxNi4mZg0nNNeQTD3MErsG1XloKNxmuK/55inVZYVqNB7pYYNiS9uT2 DL3uog8GbfcEjZhFdunsy3uRBdJIZLqL8d/LVMF+rMePqsyyo9OdH5n9K0LS7et55yDg zmJg== X-Gm-Message-State: APjAAAUx3Jua35n7sa+nWpA8aDG+I8lzp4QdtRTO6kA9BQQZzKYScUBT tnpwBM/HTpgAauFVI5HuNg4sUwnW X-Google-Smtp-Source: APXvYqyK1HEDoNd8BjYCqst50+pNknZeyrFmuiaNmONbQO765HbuPapDB6rYa8BzehE3J6Pbu38ZJw== X-Received: by 2002:a0c:b78e:: with SMTP id l14mr7061644qve.129.1553093404041; Wed, 20 Mar 2019 07:50:04 -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.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 07:50:03 -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 11/13] selftests/bpf: convert bpf tunnel test to BPF_ADJ_ROOM_MAC Date: Wed, 20 Mar 2019 10:49:42 -0400 Message-Id: <20190320144944.147862-12-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 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 900c5653105fe..f6a16fd23dbd5 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.225.g810b269d1ac-goog