From patchwork Mon Jul 1 04:40:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1125054 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=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=fail (p=none dis=none) header.from=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45cZSq70d4z9s4V for ; Mon, 1 Jul 2019 14:41:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727296AbfGAEkr (ORCPT ); Mon, 1 Jul 2019 00:40:47 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:33986 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727050AbfGAEkr (ORCPT ); Mon, 1 Jul 2019 00:40:47 -0400 Received: from mail-pl1-f200.google.com ([209.85.214.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hho7R-0001hm-7k for netdev@vger.kernel.org; Mon, 01 Jul 2019 04:40:45 +0000 Received: by mail-pl1-f200.google.com with SMTP id u10so6613676plq.21 for ; Sun, 30 Jun 2019 21:40: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:from:to:cc:subject:date:message-id; bh=9vifoJSKcoFZv9bK756pSy0guphf7tbgTB5siI2JqwU=; b=cowUAxvUOyWiSIHD5HTdtHC4jhp33bAEP+9eMWmE9FUMIrNHc1AnPYLrP9m8hcmp1k zGX2+XP2H6UaplfX6cdhmo92Lj/Yk96F203/afG5/kMa6XhWGVkSeiamCYJLoJgBPoti 8L3ztyzkMKaj5ZiCuDKlHkDWbA+QSof7mDxrUdTurWloTE7pifl7N53QiCLpUhP2NnZL fZBPZ6Fx9t90tvpA5HEQb9d5LDobv/WO71Ayf8Iu4B9SVt2pXoKxLYIstE5mIvgLvv1g y1KdzHR1MIyf5YbY6XDE6tfygeO+6JtBsRbBH6ANpJ91c6wfpIp/gwfanFJGZzWHxQaZ jjjA== X-Gm-Message-State: APjAAAW2cXVaaZZ/FKZWq3lbTJbqbX0rSTFgAKfscfaTpBK+hSTCaH8x VyrGb2KJsw/6cBqdg2OT1vwD4AD1PlvZ0eiVvRLSnnii/o9hItPr/ggrbjh+cxoZDcCzAFpq2DR IHypdTkTDOEc0BzRYB5apJzyzsWsvCA1P X-Received: by 2002:a17:902:324:: with SMTP id 33mr370880pld.340.1561956043686; Sun, 30 Jun 2019 21:40:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyrjpjZ50ynx/B04ND0r1L7o7s7teiIgeCRvr0C5WzfvIZjiG3+mRjQfq4G+knSH+kt+kLTVA== X-Received: by 2002:a17:902:324:: with SMTP id 33mr370862pld.340.1561956043442; Sun, 30 Jun 2019 21:40:43 -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 h1sm7823505pgv.93.2019.06.30.21.40.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 30 Jun 2019 21:40:42 -0700 (PDT) From: Po-Hsu Lin To: davem@davemloft.net, shuah@kernel.org, linux-kselftest@vger.kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCHv2] selftests/net: skip psock_tpacket test if KALLSYMS was not enabled Date: Mon, 1 Jul 2019 12:40:31 +0800 Message-Id: <20190701044031.19451-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The psock_tpacket test will need to access /proc/kallsyms, this would require the kernel config CONFIG_KALLSYMS to be enabled first. Apart from adding CONFIG_KALLSYMS to the net/config file here, check the file existence to determine if we can run this test will be helpful to avoid a false-positive test result when testing it directly with the following commad against a kernel that have CONFIG_KALLSYMS disabled: make -C tools/testing/selftests TARGETS=net run_tests Signed-off-by: Po-Hsu Lin Acked-by: Shuah Khan --- tools/testing/selftests/net/config | 1 + tools/testing/selftests/net/run_afpackettests | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 4740404..3dea2cb 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -25,3 +25,4 @@ CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_KALLSYMS=y diff --git a/tools/testing/selftests/net/run_afpackettests b/tools/testing/selftests/net/run_afpackettests index ea5938e..8b42e8b 100755 --- a/tools/testing/selftests/net/run_afpackettests +++ b/tools/testing/selftests/net/run_afpackettests @@ -21,12 +21,16 @@ fi echo "--------------------" echo "running psock_tpacket test" echo "--------------------" -./in_netns.sh ./psock_tpacket -if [ $? -ne 0 ]; then - echo "[FAIL]" - ret=1 +if [ -f /proc/kallsyms ]; then + ./in_netns.sh ./psock_tpacket + if [ $? -ne 0 ]; then + echo "[FAIL]" + ret=1 + else + echo "[PASS]" + fi else - echo "[PASS]" + echo "[SKIP] CONFIG_KALLSYMS not enabled" fi echo "--------------------"