On 6/30/19 10:40 PM, Po-Hsu Lin wrote:
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 <po-hsu....@canonical.com>
---
  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 "--------------------"


Looks good to me. Thanks for the patch.

Acked-by: Shuah Khan <sk...@linuxfoundation.org>

thanks,
-- Shuah

Reply via email to