Merge ~ian-may/+git/autotest-client-tests:ubuntu_nvidia_fs-v2 into ~canonical-kernel-team/+git/autotest-client-tests:master

[Ian May]

Not all DGX systems need 'nvidia-fs' ran. So I'd like to decouple it from the 'nvidia driver load' test. No functional change to the test.

Thanks for the feedback! For v2, I changed the patch to use 'git mv' to move the nvidia-fs test to a newly created 'ubuntu_nvidia_fs' test directory. I also removed the nvidia-fs triggers from the 'ubuntu_nvidia_driver_load' test. Everything should be properly cleaned up now.

I tested both tests on DGX systems and behavior was as expected.

[Po-Hsu Lin (cypressyew)]

Hi Ian,
overall it's looking good. +1 on this.

Some cleanup questions:
 * Do you still want to keep the nvidia-fs/ in ubuntu_nvidia_server_driver?
 * Also, these lines in ubuntu_nvidia_server_driver.py:

22 def run_nvidia_fs_in_lxc(self):
23 cmd = os.path.join(p_dir, "./nvidia-fs/a-c-t-entry.sh")
24 utils.system(cmd)

And the test_name if statement for checking nvidia-fs.

It's rather trivial. So I am ok to keep or not to keep these.

review: Approve

[Francis Ginther (fginther)]

As Sam asked, is there any reason to keep nvidia-fs under ubuntu_nvidia_server_driver. And if not, why not use a 'git mv' on these files to preserve their git history?

Functionally everything looks fine.

review: Needs Information

[Po-Hsu Lin (cypressyew)]

+1, thanks for updating this.

review: Approve

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed. Thanks
https://git.launchpad.net/~canonical-kernel-team/+git/autotest-client-tests/commit/?id=f39e4acf46c84f5fb9644766655103fe12e2266c

diff --git a/ubuntu_nvidia_fs/control b/ubuntu_nvidia_fs/control
new file mode 100644
index 0000000..75d21a4
--- /dev/null
+++ b/ubuntu_nvidia_fs/control
@@ -0,0 +1,12 @@
+AUTHOR = 'Taihsiang Ho <[e-mail]>'
+TIME = 'SHORT'
+NAME = 'nvidia-fs module test'
+TEST_TYPE = 'client'
+TEST_CLASS = 'General'
+TEST_CATEGORY = 'Smoke'
+
+DOC = """
+Perform testing of nvidia-fs module
+"""
+
+job.run_test_detail('ubuntu_nvidia_fs', test_name='nvidia-fs', tag='nvidia-fs', timeout=1500)
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/00-vars b/ubuntu_nvidia_fs/nvidia-fs/00-vars
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/00-vars
rename to ubuntu_nvidia_fs/nvidia-fs/00-vars
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/01-run-test.sh b/ubuntu_nvidia_fs/nvidia-fs/01-run-test.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/01-run-test.sh
rename to ubuntu_nvidia_fs/nvidia-fs/01-run-test.sh
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/02-inside-vm-update-kernel.sh b/ubuntu_nvidia_fs/nvidia-fs/02-inside-vm-update-kernel.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/02-inside-vm-update-kernel.sh
rename to ubuntu_nvidia_fs/nvidia-fs/02-inside-vm-update-kernel.sh
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/03-inside-vm-install-drivers.sh b/ubuntu_nvidia_fs/nvidia-fs/03-inside-vm-install-drivers.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/03-inside-vm-install-drivers.sh
rename to ubuntu_nvidia_fs/nvidia-fs/03-inside-vm-install-drivers.sh
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/04-inside-vm-setup-docker-and-run-test.sh b/ubuntu_nvidia_fs/nvidia-fs/04-inside-vm-setup-docker-and-run-test.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/04-inside-vm-setup-docker-and-run-test.sh
rename to ubuntu_nvidia_fs/nvidia-fs/04-inside-vm-setup-docker-and-run-test.sh
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/05-inside-docker-run-test.sh b/ubuntu_nvidia_fs/nvidia-fs/05-inside-docker-run-test.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/05-inside-docker-run-test.sh
rename to ubuntu_nvidia_fs/nvidia-fs/05-inside-docker-run-test.sh
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/README b/ubuntu_nvidia_fs/nvidia-fs/README
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/README
rename to ubuntu_nvidia_fs/nvidia-fs/README
diff --git a/ubuntu_nvidia_server_driver/nvidia-fs/a-c-t-entry.sh b/ubuntu_nvidia_fs/nvidia-fs/a-c-t-entry.sh
similarity index 100%
rename from ubuntu_nvidia_server_driver/nvidia-fs/a-c-t-entry.sh
rename to ubuntu_nvidia_fs/nvidia-fs/a-c-t-entry.sh
diff --git a/ubuntu_nvidia_fs/nvidia-module-lib b/ubuntu_nvidia_fs/nvidia-module-lib
new file mode 100644
index 0000000..06141bf
--- /dev/null
+++ b/ubuntu_nvidia_fs/nvidia-module-lib
@@ -0,0 +1,96 @@
+# Copyright 2021 Canonical Ltd.
+# Written by:
+#   Dann Frazier <[e-mail]>
+#   Taihsiang Ho <[e-mail]>
+#
+# shellcheck shell=bash
+module_loaded() {
+    module="$1"
+    # Check linux/include/linux/module.h for module_state enumeration
+    # There are the other states like Loading and Unloading besides Live. The
+    # other states usually only take only few microseconds but let's specify
+    # Live explicitly.
+    grep "^${module} " /proc/modules | grep -q Live
+}
+
+get_module_field() {
+    local module="$1"
+    local field="$2"
+    # shellcheck disable=SC2034
+    read -r mod size usecnt deps rest < <(grep "^${module} " /proc/modules)
+    case $field in
+        usecnt)
+            echo "$usecnt"
+            ;;
+        deps)
+            if [ "$deps" = "-" ]; then
+                return 0
+            fi
+            echo "$deps" | tr ',' ' '
+            ;;
+        *)
+            return 1
+    esac
+}
+
+module_in_use() {
+    module="$1"
+
+    usecnt="$(get_module_field "$module" usecnt)"
+
+    if [ "$usecnt" -eq 0 ]; then
+        return 1
+    fi
+    return 0
+}
+
+recursive_remove_module() {
+    local module="$1"
+
+    if ! module_loaded "$module"; then
+        return 0
+    fi
+
+    if ! module_in_use "$module"; then
+        sudo rmmod "$module"
+        return 0
+    fi
+
+    if [ "$(get_module_field "$module" deps)" = "" ]; then
+        echo "ERROR: $module is in use, but has no reverse dependencies"
+        echo "ERROR: Maybe an application is using it."
+        exit 1
+    fi
+    beforecnt="$(get_module_field "$module" usecnt)"
+    for dep in $(get_module_field "$module" deps); do
+        recursive_remove_module "$dep"
+    done
+    aftercnt="$(get_module_field "$module" usecnt)"
+    if [ "$beforecnt" -eq "$aftercnt" ]; then
+        echo "ERROR: Unable to reduce $module use count"
+        exit 1
+    fi
+    recursive_remove_module "$module"
+}
+
+uninstall_all_nvidia_mod_pkgs() {
+    for pkg in $(dpkg-query -f "\${Package}\n" -W 'linux-modules-nvidia-*'); do
+        sudo apt remove --purge "$pkg" -y
+    done
+    if sudo modinfo nvidia; then
+        echo "ERROR: Uninstallation of all nvidia modules failed."
+        exit 1
+    fi
+}
+
+product="$(sudo dmidecode -s baseboard-product-name)"
+pkg_compatible_with_platform() {
+    local pkg="$1"
+    branch="$(echo "$pkg" | cut -d- -f4)"
+
+    if [ "$product" = "DGXA100" ] && [ "$branch" -le "418" ]; then
+        return 1
+    fi
+
+    return 0
+}
diff --git a/ubuntu_nvidia_fs/ubuntu_nvidia_fs.py b/ubuntu_nvidia_fs/ubuntu_nvidia_fs.py
new file mode 100644
index 0000000..77ac0bb
--- /dev/null
+++ b/ubuntu_nvidia_fs/ubuntu_nvidia_fs.py
@@ -0,0 +1,35 @@
+import os
+from autotest.client import test, utils
+
+p_dir = os.path.dirname(os.path.abspath(__file__))
+sh_executable = os.path.join(p_dir, "ubuntu_nvidia_fs.sh")
+
+
+class ubuntu_nvidia_fs(test.test):
+    version = 1
+
+    def initialize(self):
+        pass
+
+    def setup(self):
+        cmd = "{} setup".format(sh_executable)
+        utils.system(cmd)
+
+    def run_nvidia_fs_in_lxc(self):
+        #cmd = os.path.join(p_dir, "./nvidia-fs/a-c-t-entry.sh")
+        #utils.system(cmd)
+        cmd = "{} test".format(sh_executable)
+        utils.system(cmd)
+
+    def run_once(self, test_name):
+        print("HELLO WORLD")
+        if test_name == "nvidia-fs":
+            self.run_nvidia_fs_in_lxc()
+
+            print("")
+            print("{} has run.".format(test_name))
+
+        print("")
+
+    def postprocess_iteration(self):
+        pass
diff --git a/ubuntu_nvidia_fs/ubuntu_nvidia_fs.sh b/ubuntu_nvidia_fs/ubuntu_nvidia_fs.sh
new file mode 100755
index 0000000..62b1a29
--- /dev/null
+++ b/ubuntu_nvidia_fs/ubuntu_nvidia_fs.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#
+# perform Nvidia driver load testing and corresponding pre-setup.
+#
+
+set -eo pipefail
+
+setup() {
+    # pre-setup testing environment and necessary tools
+    # currently there is nothing practically but will be used possibly in the future.
+    echo "begin to pre-setup testing"
+}
+
+run_test() {
+    exe_dir=$(dirname "${BASH_SOURCE[0]}")
+    pushd "${exe_dir}"
+    #./test-each-nvidia-server-driver.sh
+    ./nvidia-fs/a-c-t-entry.sh
+    popd
+}
+
+case $1 in
+    setup)
+        echo ""
+        echo "On setting up necessary test environment..."
+        echo ""
+        setup
+        echo ""
+        echo "Setting up necessary test environment..."
+        echo ""
+        ;;
+    test)
+        echo ""
+        echo "On running test..."
+        echo ""
+        run_test
+        echo ""
+        echo "Running test..."
+        echo ""
+        ;;
+esac
diff --git a/ubuntu_nvidia_server_driver/control b/ubuntu_nvidia_server_driver/control
index a88eff0..3052a3c 100644
--- a/ubuntu_nvidia_server_driver/control
+++ b/ubuntu_nvidia_server_driver/control
@@ -9,5 +9,4 @@ DOC = """
 Perform testing of Nvidia server drivers
 """
 
-job.run_test_detail('ubuntu_nvidia_server_driver', test_name='nvidia-fs', tag='nvidia-fs', timeout=1500)
-job.run_test_detail('ubuntu_nvidia_server_driver', test_name='load', tag='load', timeout=600)
+job.run_test_detail('ubuntu_nvidia_server_driver', test_name='load', tag='load', timeout=1200)
diff --git a/ubuntu_nvidia_server_driver/ubuntu_nvidia_server_driver.py b/ubuntu_nvidia_server_driver/ubuntu_nvidia_server_driver.py
index 6a6f4c5..d0c667a 100644
--- a/ubuntu_nvidia_server_driver/ubuntu_nvidia_server_driver.py
+++ b/ubuntu_nvidia_server_driver/ubuntu_nvidia_server_driver.py
@@ -19,10 +19,6 @@ class ubuntu_nvidia_server_driver(test.test):
         cmd = "{} test".format(sh_executable)
         utils.system(cmd)
 
-    def run_nvidia_fs_in_lxc(self):
-        cmd = os.path.join(p_dir, "./nvidia-fs/a-c-t-entry.sh")
-        utils.system(cmd)
-
     def run_once(self, test_name):
         if test_name == "load":
             self.compare_kernel_modules()
@@ -30,12 +26,6 @@ class ubuntu_nvidia_server_driver(test.test):
             print("")
             print("{} has run.".format(test_name))
 
-        elif test_name == "nvidia-fs":
-            self.run_nvidia_fs_in_lxc()
-
-            print("")
-            print("{} has run.".format(test_name))
-
         print("")
 
     def postprocess_iteration(self):