From patchwork Wed Jun 30 12:51:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guillaume Nault X-Patchwork-Id: 12351919 X-Patchwork-Delegate: kuba@kernel.org 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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 B7BE5C11F6A for ; Wed, 30 Jun 2021 12:51:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3FCC6144B for ; Wed, 30 Jun 2021 12:51:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234801AbhF3MyR (ORCPT ); Wed, 30 Jun 2021 08:54:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51648 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234779AbhF3MyP (ORCPT ); Wed, 30 Jun 2021 08:54:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1625057506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sn7TKI5Mx5TAJsiknVFxBxXEEbE3nLFgAMZhZMxyZAE=; b=UsEhDqhIh65LqRGAgfDLj8+WgwNKWOc7mNzhOa1rc1wsxw1naj7gSHNLH6L7xTudiG7Tq+ trbebWSrC0XYstkAcmZOBfM5OPfpD0mgmHH9TyHBZlKIQlInsr5LNx1Wd34zKMsOWtV3Ou kTTmmgl9L+KyU4ChfPxku5pax/EzFts= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-42-iZF8e1iiPbWYC-N7B21PVA-1; Wed, 30 Jun 2021 08:51:45 -0400 X-MC-Unique: iZF8e1iiPbWYC-N7B21PVA-1 Received: by mail-wm1-f69.google.com with SMTP id j2-20020a05600c1c02b02901cecbe55d49so464719wms.3 for ; Wed, 30 Jun 2021 05:51:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=sn7TKI5Mx5TAJsiknVFxBxXEEbE3nLFgAMZhZMxyZAE=; b=MrzwGuj7Q/s/VCqvOT7OwxuWx6XiSKJcuu0OczUX/GQSDGadIH6SiMffzg4Jm1DGXu 6ulj8ukXNoVfKV5qRjbC2Aad3lQJKac4vs0pzqM1Mrj7x7QetdxrKnVQr/P//JRMbcHX PAr5XsFRuzh2s8Jxh4VMzel6PsyKds/MzuQiUFFYs8Ju0Vb/nSm4MHqBUcuexXvMThW7 +ujwJBlId4Tx9VwopCSX0z5KkDvWPU1qDlteBDUW4qapslwz4LfrPwV/Czb+I0glgJ3o W7h3mwB3DxEij9raqF5Hw9ChaCYJQ+a4ATe2ITEF6tNcKiMWGAU/TRODGlwOEXEmBB29 Wodg== X-Gm-Message-State: AOAM5303M4IrKPtZoe/Sv9KzQOkoXMXXQ17VCw0ACWq+XQeT1FoBbFOo QfNlJQLjF34h5GbFxdZMQCFxnSqQOob5OcRAmF8MuBg7CQsxZnn9XTwsjQ7/j8sCkjDENFjNHki QaeHhUS9dycKsbYML X-Received: by 2002:adf:fc82:: with SMTP id g2mr38708270wrr.323.1625057504136; Wed, 30 Jun 2021 05:51:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaXcOOTEBKJdcSkD486sAmCbe/C0JMrtnBBw42wyuGW4g/AxS2h0I+O1iSJoiNAwMlUWJGEw== X-Received: by 2002:adf:fc82:: with SMTP id g2mr38708257wrr.323.1625057504014; Wed, 30 Jun 2021 05:51:44 -0700 (PDT) Received: from pc-23.home (2a01cb058d44a7001b6d03f4d258668b.ipv6.abo.wanadoo.fr. [2a01:cb05:8d44:a700:1b6d:3f4:d258:668b]) by smtp.gmail.com with ESMTPSA id h10sm6412159wmq.0.2021.06.30.05.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Jun 2021 05:51:43 -0700 (PDT) Date: Wed, 30 Jun 2021 14:51:41 +0200 From: Guillaume Nault To: David Miller , Jakub Kicinski Cc: netdev@vger.kernel.org, David Ahern , Shuah Khan , linux-kselftest@vger.kernel.org Subject: [PATCH net-next 2/4] selftests: forwarding: Test redirecting sit packets to Ethernet Message-ID: <7c2846f575b3477a12022b30dde5bb05dab9b065.1625056665.git.gnault@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add selftests for the following commit: * 730eed2772e7 ("sit: allow redirecting ip6ip, ipip and mplsip packets to eth devices"). In collect_md mode, if a fallback sit tunnel is already created, the script can't create its own sit device (EEXIST). Therefore, we have to skip this test when such fallback tunnels are created automatically in new network namespaces. Also, sit devices in ip6ip mode don't work in collect_md mode. Skip the test for the moment. Signed-off-by: Guillaume Nault --- tools/testing/selftests/net/forwarding/config | 1 + .../net/forwarding/tc_redirect_l2l3.sh | 60 +++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/tools/testing/selftests/net/forwarding/config b/tools/testing/selftests/net/forwarding/config index 9d28f801866f..c543b441a8b5 100644 --- a/tools/testing/selftests/net/forwarding/config +++ b/tools/testing/selftests/net/forwarding/config @@ -18,3 +18,4 @@ CONFIG_NAMESPACES=y CONFIG_NET_NS=y CONFIG_NET_IPGRE=m CONFIG_NET_IPIP=m +CONFIG_IPV6_SIT=m diff --git a/tools/testing/selftests/net/forwarding/tc_redirect_l2l3.sh b/tools/testing/selftests/net/forwarding/tc_redirect_l2l3.sh index 3e69b5deb608..fd9e15a6417b 100755 --- a/tools/testing/selftests/net/forwarding/tc_redirect_l2l3.sh +++ b/tools/testing/selftests/net/forwarding/tc_redirect_l2l3.sh @@ -24,6 +24,7 @@ ALL_TESTS=" redir_gre redir_ipip + redir_sit " NUM_NETIFS=0 @@ -226,6 +227,39 @@ ping_test() set -e } +# Inform the user and the kselftest infrastructure that a test has been +# skipped. +# +# Parameters: +# +# $1: Description of the reason why the test was skipped. +# +skip_test() +{ + echo "SKIP: $1" + + # Do not override KSFT_FAIL + if [ "${KSFT_RET}" -eq "${KSFT_PASS}" ]; then + KSFT_RET="${KSFT_SKIP}" + fi +} + +# Check that no fallback tunnels are automatically created in new network +# namespaces. +# +has_fb_tunnels() +{ + local FB_TUNNELS + + FB_TUNNELS=$(sysctl -n net.core.fb_tunnels_only_for_init_net 2>/dev/null || echo 0); + + if [ "${FB_TUNNELS}" -ne 0 ]; then + return 1 + else + return 0 + fi +} + redir_gre() { setup_tunnel "ipv4" "classical" "gre" @@ -258,6 +292,32 @@ redir_ipip() cleanup_tunnel } +redir_sit() +{ + setup_tunnel "ipv4" "classical" "sit" "mode any" + ping_test ipv4 "SIT, classical mode: IPv4 / IPv4" + ping_test ipv6 "SIT, classical mode: IPv4 / IPv6" + ping_test ipv4-mpls "SIT, classical mode: IPv4 / MPLS / IPv4" + ping_test ipv6-mpls "SIT, classical mode: IPv4 / MPLS / IPv6" + cleanup_tunnel + + if has_fb_tunnels; then + skip_test "SIT, can't test the external mode, fallback tunnels are enabled: try \"sysctl -wq net.core.fb_tunnels_only_for_init_net=2\"" + return 0 + fi + + setup_tunnel "ipv4" "collect_md" "sit" "mode any external" + ping_test ipv4 "SIT, external mode: IPv4 / IPv4" + + # ip6ip currently doesn' work in collect_md mode + skip_test "SIT, ip6ip is known to fail in external mode (at least on Linux 5.13 and earlier versions)" + #ping_test ipv6 "SIT, external mode: IPv4 / IPv6" + + ping_test ipv4-mpls "SIT, external mode: IPv4 / MPLS / IPv4" + ping_test ipv6-mpls "SIT, external mode: IPv4 / MPLS / IPv6" + cleanup_tunnel +} + exit_cleanup() { if [ "${TESTS_COMPLETED}" = "no" ]; then