From patchwork Mon Oct 26 05:46:14 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: 1387463 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 4CKP3L0Bxcz9sVS; Mon, 26 Oct 2020 16:46:37 +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 1kWvL0-0008IK-Ot; Mon, 26 Oct 2020 05:46:34 +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 1kWvKx-0008HX-BA for kernel-team@lists.ubuntu.com; Mon, 26 Oct 2020 05:46:31 +0000 Received: from mail-pg1-f198.google.com ([209.85.215.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kWvKw-0000yx-Vj for kernel-team@lists.ubuntu.com; Mon, 26 Oct 2020 05:46:31 +0000 Received: by mail-pg1-f198.google.com with SMTP id s4so4820347pgk.17 for ; Sun, 25 Oct 2020 22:46:30 -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=ujbaG1ms1KOviPe5ht2dUQ4rDp/troD4jNT2WyvbV0U=; b=n9kIAjCDqvS/KJE46DnWyxH3AKChWxl7aojPQIKrSgMWuTxLnhpRkowgyrmqLLp7m8 Sfm9JaLkMzpo6xZZeNUg4bvmUg+5gMErqlWo8cu8l0cg200GEl7Ca/zoOoirKhCPOrH3 ATQClT68SdUeRWHOM5QnnNnJKkTXknjqKvftonTQgxtXS3ZGZYj9X0c2P+LvC+pKK4vM TL82SQjocOEfV4EpythWUv8hX5VjflqxcFwctdwQUawpIGQrQgu+1Lt3EJDs/p0slsB+ ol4Q8KoQUdPnSNOB1+w5SZEqCLcoqD/ARONVJf4ahWPZrsv5YnpenNd1WYF6arUtLvcD Ft7Q== X-Gm-Message-State: AOAM530hg+jXu0wy3bMIfKic16eWbM2syA+hOGnGXSN16MpkBJnEPo/q To/hdW1ihBf7lDFd4FmRgx4ymiXu3U8MF8nwkZvKxPfgtS6MvclB0HyKj+76lqhdM1DHYSHXAXS Z7wRKQcp8/PnJreTSSUbCfG5Qz4JSSbFaRrh/UL0j X-Received: by 2002:a62:1ac3:0:b029:15e:1332:63be with SMTP id a186-20020a621ac30000b029015e133263bemr9503356pfa.72.1603691189313; Sun, 25 Oct 2020 22:46:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGRrx05clOx+GQb6DECAhOnIXzW+woGC47EDdXCqzDpghb3krmrDCbXh2DTGOXiB3s3T2nFQ== X-Received: by 2002:a62:1ac3:0:b029:15e:1332:63be with SMTP id a186-20020a621ac30000b029015e133263bemr9503338pfa.72.1603691188886; Sun, 25 Oct 2020 22:46:28 -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.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2020 22:46:28 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [OEM-B-OSP1][SRU][PATCH 1/1] selftests: rtnetlink: load fou module for kci_test_encap_fou() test Date: Mon, 26 Oct 2020 13:46:14 +0800 Message-Id: <20201026054614.17114-6-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 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index dfecfc8..e3b221f 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -29,3 +29,4 @@ CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV4=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 0fc5484..e57faf7 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh @@ -451,6 +451,12 @@ kci_test_encap_fou() fi ip netns exec "$testns" ip fou add port 7777 ipproto 47 2>/dev/null + if ! /sbin/modprobe -q -n fou; then + echo "SKIP: module fou is not found" + return $ksft_skip + fi + /sbin/modprobe -q fou + ip netns exec "$testns" ip fou add port 7777 ipproto 47 2>/dev/null if [ $? -ne 0 ];then echo "FAIL: can't add fou port 7777, skipping test" return 1