From patchwork Mon Oct 26 05:46:12 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: 1387460 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CKP3J5fnnz9sV0; Mon, 26 Oct 2020 16:46:35 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kWvKw-0008HC-D0; Mon, 26 Oct 2020 05:46:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kWvKu-0008GY-H2 for kernel-team@lists.ubuntu.com; Mon, 26 Oct 2020 05:46:28 +0000 Received: from mail-pf1-f198.google.com ([209.85.210.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kWvKu-0000yC-4O for kernel-team@lists.ubuntu.com; Mon, 26 Oct 2020 05:46:28 +0000 Received: by mail-pf1-f198.google.com with SMTP id a24so425429pfh.20 for ; Sun, 25 Oct 2020 22:46:28 -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:subject:date:message-id:in-reply-to :references; bh=V/5I5pKTN6Nm6uLgSOZMjZx1xDSm/bc48FnNFo+MmPA=; b=tALu1Z2NglIIuVItBJn8OqaegnwjuQNAK5T9Yj3vWLvLQgbWnjDa0xtO4TN+lXu3hq +HHepYMUop/3y5NUzEP50/01jCgetrFOXYf2CUSv+I+9DYsXjQU8UOPKSS6HAw9ltHR/ Yv2uQcq8GByu50ct/NM8FoLXyJY0O5/GdghPifp87f4vyzPQmXdWr42H2QoOZYtDzrEq odk7GXUqtocfY/6PTCz1HjndTodN6O6pGg++hLxoUaQsGaEdcvNow+FPCQVGQvBq8oUT Q43XJO5OX6MKnpJu/ChkmCxhTEbVy51HWBm1zf2kaEScVds6YWWjJKwOYekham4bvLLC IACw== X-Gm-Message-State: AOAM530GWMnIhklXw0mxlIweD1h7kE/5xo0A6u+F775RkqV1cZANBRcJ hijAAHmsTBiFO2hG3OggV9VwSceXNSoUFfH8e+dH7gdDf3eyTzZtYvVD2AjKzRJ5RWEeyeYpjdq SfBozKu0oEIgexV3/2mZpw5cHhHDcohTMf1DPN121 X-Received: by 2002:a17:902:e983:b029:d5:f469:60c0 with SMTP id f3-20020a170902e983b02900d5f46960c0mr12234185plb.61.1603691186351; Sun, 25 Oct 2020 22:46:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVLZqawDX3IyZlh0PIJXqFaPUkgYLXVT8pMMCK1m7jOHhMhcILApUEpxfgcP5Y0YwgN/iOyg== X-Received: by 2002:a17:902:e983:b029:d5:f469:60c0 with SMTP id f3-20020a170902e983b02900d5f46960c0mr12234159plb.61.1603691185988; Sun, 25 Oct 2020 22:46:25 -0700 (PDT) Received: from Leggiero.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id g17sm10368099pfu.130.2020.10.25.22.46.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2020 22:46:25 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [G][Unstable][SRU][PATCH 1/1] selftests: rtnetlink: load fou module for kci_test_encap_fou() test Date: Mon, 26 Oct 2020 13:46:12 +0800 Message-Id: <20201026054614.17114-4-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201026054614.17114-1-po-hsu.lin@canonical.com> References: <20201026054614.17114-1-po-hsu.lin@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1891421 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. Which needs at least to be set as a loadable module. Fixes: 6227efc1a20b ("selftests: rtnetlink.sh: add vxlan and fou test cases") Signed-off-by: Po-Hsu Lin Link: https://lore.kernel.org/r/20201019030928.9859-1-po-hsu.lin@canonical.com Signed-off-by: Jakub Kicinski (backported from commit 26ebd6fed9bb3aa480c7c0f147ac0e7b11000f65) Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/rtnetlink.sh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 3b42c06b..c5e50ab 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=m diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 7c38a90..6f8f159 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -520,6 +520,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"