From patchwork Thu Aug 13 04:44:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1344010 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BRvB22rWSz9sTT for ; Thu, 13 Aug 2020 14:44:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726486AbgHMEof (ORCPT ); Thu, 13 Aug 2020 00:44:35 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:46404 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725446AbgHMEof (ORCPT ); Thu, 13 Aug 2020 00:44:35 -0400 Received: from mail-pg1-f199.google.com ([209.85.215.199]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1k656O-0000zZ-Mk for netdev@vger.kernel.org; Thu, 13 Aug 2020 04:44:32 +0000 Received: by mail-pg1-f199.google.com with SMTP id n32so3213751pgb.22 for ; Wed, 12 Aug 2020 21:44:32 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=Tiz4nVgOo68QI5s9WSMXxhSe1AmwRM+pOa2QZ2cOoyM=; b=jIp/e/GIaE5pq3gMIDOHlc8BUJnCZ4N+h85mz8/a72v98qYjQOvSsRjC645krFIIxP jTP4CKWHleve9RkqakJsM6TACORA0/FY4Bo18E6Xu48B3dLFavfkylK1zKWBPF29a/eZ EsrskctzjCEbJVwkjC2ngeClE4dZaUjkOQu82k2Od0piQKhw2k5mKJLoDCvYOm6o94D+ AHJ7jqX+oMjlmQm9O4Vu63+LbncMjjKFeNqAW3WnWyBNmh6+HNYXhd1UHgaZ7kc2LDPG voa32tokDHRYVFlVhq+r6LTsXFGHi59mII9CvtYNvQ7GpS+8QL0mrDK5Bw6fmVojbhyc tZ9Q== X-Gm-Message-State: AOAM5330cnQf2KlN9ZpDOpJaQFcFGGuRQIDFOaLMlcyZCwpfUF5JL19p qiqXthJ0r309Hr9fEx4gA+jIJ50FSs/JwJobgasTGRPRT/fUpevCbfQDhEYVdoclAwZo0xN5p6s w/VBRWUvKbO7IOrw3zmMWsvkctm6rgzM1 X-Received: by 2002:a17:902:c382:: with SMTP id g2mr2231937plg.120.1597293871316; Wed, 12 Aug 2020 21:44:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKeENi2Ukh3RAG5ReF+7QnR8cHk27E89MALm6sVpQMNi0yPoePWGZ4t0AN8I7VgYJQuDtInw== X-Received: by 2002:a17:902:c382:: with SMTP id g2mr2231915plg.120.1597293870861; Wed, 12 Aug 2020 21:44:30 -0700 (PDT) Received: from localhost.localdomain (114-136-120-176.emome-ip.hinet.net. [114.136.120.176]) by smtp.gmail.com with ESMTPSA id n26sm3854956pgl.42.2020.08.12.21.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 21:44:30 -0700 (PDT) From: Po-Hsu Lin To: davem@davemloft.net, kuba@kernel.org, skhan@linuxfoundation.org Cc: po-hsu.lin@canonical.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] selftests: rtnetlink: load fou module for kci_test_encap_fou() Date: Thu, 13 Aug 2020 12:44:22 +0800 Message-Id: <20200813044422.46713-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The kci_test_encap_fou() test from kci_test_encap() in rtnetlink.sh needs the fou module to work. Otherwise it will fail with: $ ip netns exec "$testns" ip fou add port 7777 ipproto 47 RTNETLINK answers: No such file or directory Error talking to the kernel Add the CONFIG_NET_FOU into the config file as well. Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/rtnetlink.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 3b42c06b..96d2763 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -31,3 +31,4 @@ CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_NETEM=y CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_KALLSYMS=y +CONFIG_NET_FOU diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index bdbf4b3..7931b65 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -521,6 +521,11 @@ kci_test_encap_fou() return $ksft_skip fi + if ! /sbin/modprobe -q -n fou; then + echo "SKIP: module fou is not found" + return $ksft_skip + fi + /sbin/modprobe -q fou ip -netns "$testns" fou add port 7777 ipproto 47 2>/dev/null if [ $? -ne 0 ];then echo "FAIL: can't add fou port 7777, skipping test" @@ -541,6 +546,7 @@ kci_test_encap_fou() return 1 fi + /sbin/modprobe -q -r fou echo "PASS: fou" }