From patchwork Fri Mar 22 15:15:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 1061308 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E4Yu8N0u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44QnKG04n5z9sRk for ; Sat, 23 Mar 2019 02:15:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727134AbfCVPP2 (ORCPT ); Fri, 22 Mar 2019 11:15:28 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:38279 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727102AbfCVPPZ (ORCPT ); Fri, 22 Mar 2019 11:15:25 -0400 Received: by mail-qt1-f194.google.com with SMTP id s1so2887849qte.5 for ; Fri, 22 Mar 2019 08:15:25 -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=7UWFSxcw2QlWgfFUBLbBz67vjVubFjwYhkLBx4l4Mkc=; b=E4Yu8N0uxNGwd+wZvJr0w20vSVVo4Oe+U4k7J+vwMptcHtbxTspza6YtSU1uKnnipR 5WxaFThp+b6H8FqWWz+mqP2IND2Y9Xl4J1xIGK0emUegZ7Y9sFboFZxXBglFjcYNguCO p6IvrFU4Bkb7ts+e1N5cATTsh6FHlbT8fizLhHwbzZNDFoOnFo4byHWcMgAPCkdqh0Ce +jL4K9Mf9n+jdjHjdnG8Y5KjqZh90QZAyBsK7UDxlUXfnE5+Ki30B6n2jiP/Qzr9nxaW hIdD/yBtQ1OJ2RZTySXrZCZb+zXP1m91U+SkTpJg46IJSyMg7vD2YvnhbCCJ7WAZpvfy cE7w== 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=7UWFSxcw2QlWgfFUBLbBz67vjVubFjwYhkLBx4l4Mkc=; b=gbcS9dq5+yojwBqx4D7exctG3c3G9Ehk/ZF8wnoC8wjWZNb4bbZhfzuvx2znmJoMUP O5h4r9ol69/PqZZfPER08pbGIqE7YUe3R/k64rCQQIPRw04fFP4wRp+nQ1LUOjR0vgFp RtOi81H6R7mYUpcbszCTnttMwcAeVOdU2FWe9rJNJQ2KCJ+eCwkvnt2mFux5wFd2e71N IWvsPHZt6TatdxDs/aqP0HWWLwQYGiL0XYgdw6pITa5D44FPHPh3v2VASx+GSEBRRyX7 Y+YJv6ueLe0a6KNX4gSrHG1Cen1LB6fobW2VtvwWuGj03B34VkKveCMK+KE01L1eHfwI worA== X-Gm-Message-State: APjAAAWtDtZfXE77yz+n6Wv8IIQ32C2m8Lvo4W8XZG3XDfwk/qvjhfU5 JJLd6z8/jwqw0igZEs6B5NAvxTOh X-Google-Smtp-Source: APXvYqwMaxSczHULyy9h53hM39PNs0hQPvAustR9PKLUHWr5Y79WTJo6sJO7PBHAGmwONsXaGBIOlw== X-Received: by 2002:a0c:b711:: with SMTP id t17mr8464983qvd.56.1553267724360; Fri, 22 Mar 2019 08:15:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 08:15:23 -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 13/13] selftests/bpf: convert bpf tunnel test to encap modes Date: Fri, 22 Mar 2019 11:15:04 -0400 Message-Id: <20190322151504.89983-14-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Make the tests correctly annotate skbs with tunnel metadata. This makes the gso tests succeed. Enable them. Signed-off-by: Willem de Bruijn --- .../selftests/bpf/progs/test_tc_tunnel.c | 19 +++++++++++++++---- tools/testing/selftests/bpf/test_tc_tunnel.sh | 10 ++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c index 3b79dffb8103..f541c2de947d 100644 --- a/tools/testing/selftests/bpf/progs/test_tc_tunnel.c +++ b/tools/testing/selftests/bpf/progs/test_tc_tunnel.c @@ -70,8 +70,13 @@ 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); + flags = BPF_F_ADJ_ROOM_FIXED_GSO | BPF_F_ADJ_ROOM_ENCAP_L3_IPV4; + if (with_gre) { + flags |= BPF_F_ADJ_ROOM_ENCAP_L4_GRE; + olen = sizeof(h_outer); + } else { + olen = sizeof(h_outer.ip); + } /* add room between mac and network header */ if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, flags)) @@ -119,8 +124,14 @@ 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); + flags = BPF_F_ADJ_ROOM_FIXED_GSO | BPF_F_ADJ_ROOM_ENCAP_L3_IPV6; + if (with_gre) { + flags |= BPF_F_ADJ_ROOM_ENCAP_L4_GRE; + olen = sizeof(h_outer); + } else { + olen = sizeof(h_outer.ip); + } + /* add room between mac and network header */ if (bpf_skb_adjust_room(skb, olen, BPF_ADJ_ROOM_MAC, flags)) diff --git a/tools/testing/selftests/bpf/test_tc_tunnel.sh b/tools/testing/selftests/bpf/test_tc_tunnel.sh index cda5317790d2..dcf320626931 100755 --- a/tools/testing/selftests/bpf/test_tc_tunnel.sh +++ b/tools/testing/selftests/bpf/test_tc_tunnel.sh @@ -97,13 +97,11 @@ if [[ "$#" -eq "0" ]]; then echo "ip6 gre" $0 ipv6 ip6gre 100 - # disabled until passes SKB_GSO_DODGY checks - # echo "ip gre gso" - # $0 ipv4 gre 2000 + echo "ip gre gso" + $0 ipv4 gre 2000 - # disabled until passes SKB_GSO_DODGY checks - # echo "ip6 gre gso" - # $0 ipv6 ip6gre 2000 + echo "ip6 gre gso" + $0 ipv6 ip6gre 2000 echo "OK. All tests passed" exit 0