From c7229f149aa4e13557bf80d00317bff957e90a9f Mon Sep 17 00:00:00 2001
From: Daniel Wagner <wagi@kernel.org>
Date: Mon, 8 Dec 2025 15:09:59 +0100
Subject: [PATCH 1/2] tests: don't enforce NS management support for local
 testing

The tests framework added supported and dependency on NS management for
clean setups. Though this prevents to run part of the tests suites on
devices which do no support NS management.

Add feature detection and skip the setup/tear down code for the NS
setup if the device doesn't support this.

Signed-off-by: Daniel Wagner <wagi@kernel.org>
---
 tests/nvme_test.py | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/tests/nvme_test.py b/tests/nvme_test.py
index 0c66be88a8..b34d720243 100644
--- a/tests/nvme_test.py
+++ b/tests/nvme_test.py
@@ -43,7 +43,12 @@ def to_decimal(value):
         - Returns:
             - Decimal integer
     """
-    return int(str(value), 0)
+    val = 0
+    try:
+        val = int(str(value), 0)
+    except (TypeError, ValueError):
+        raise ValueError(f"Invalid value: {value!r}")
+    return val
 
 
 class TestNVMe(unittest.TestCase):
@@ -77,14 +82,17 @@ def setUp(self):
         self.load_config()
         if self.do_validate_pci_device:
             self.validate_pci_device()
-        self.create_and_attach_default_ns()
+        self.ns_mgmt_supported = self.get_ns_mgmt_support()
+        if self.ns_mgmt_supported:
+            self.create_and_attach_default_ns()
         print(f"\nsetup: ctrl: {self.ctrl}, ns1: {self.ns1}, default_nsid: {self.default_nsid}, flbas: {self.flbas}\n")
 
     def tearDown(self):
         """ Post Section for TestNVMe. """
         if self.clear_log_dir is True:
             shutil.rmtree(self.log_dir, ignore_errors=True)
-        self.create_and_attach_default_ns()
+        if self.ns_mgmt_supported:
+            self.create_and_attach_default_ns()
         print(f"\nteardown: ctrl: {self.ctrl}, ns1: {self.ns1}, default_nsid: {self.default_nsid}, flbas: {self.flbas}\n")
 
     @classmethod
@@ -209,6 +217,30 @@ def get_ctrl_id(self):
                         "ERROR : nvme list-ctrl could not find ctrl")
         return str(json_output['ctrl_list'][0]['ctrl_id'])
 
+    def get_ns_mgmt_support(self):
+        """
+        Determine whether Namespace Management and Namespace Attachment
+        operations are supported by the controller.
+
+        This method reads the Optional Admin Command Support (OACS) field
+        from the Identify Controller data structure and evaluates specific
+        bits that indicate support for:
+          - Namespace Management (bit 3)
+          - Namespace Attachment (bit 4)
+
+        Both features must be supported for this function to return True.
+
+        Returns:
+            bool: True if both Namespace Management and Namespace Attachment
+            are supported, False otherwise.
+        """
+        oacs = to_decimal(self.get_id_ctrl_field_value("oacs"))
+
+        ns_mgmt_supported = bool(oacs & (1 << 3))
+        ns_attach_supported = bool(oacs & (1 << 4))
+
+        return ns_mgmt_supported and ns_attach_supported
+
     def get_nsid_list(self):
         """ Wrapper for extracting the namespace list.
             - Args:

From 108eb52276a1fb68482a13b029243ab382fbe364 Mon Sep 17 00:00:00 2001
From: Daniel Wagner <wagi@kernel.org>
Date: Thu, 2 Apr 2026 09:56:22 +0200
Subject: [PATCH 2/2] tests: skip tests which rely on namespace management

These tests will fail if the controller does not support namespace
management, thus skip them.

Signed-off-by: Daniel Wagner <wagi@kernel.org>
---
 tests/nvme_attach_detach_ns_test.py | 4 ++++
 tests/nvme_create_max_ns_test.py    | 4 ++++
 tests/nvme_format_test.py           | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/nvme_attach_detach_ns_test.py b/tests/nvme_attach_detach_ns_test.py
index f23630087a..afb1eafe20 100644
--- a/tests/nvme_attach_detach_ns_test.py
+++ b/tests/nvme_attach_detach_ns_test.py
@@ -48,6 +48,10 @@ class TestNVMeAttachDetachNSCmd(TestNVMe):
     def setUp(self):
         """ Pre Section for TestNVMeAttachDetachNSCmd """
         super().setUp()
+
+        if not self.ns_mgmt_supported:
+            self.skipTest("Namespace Management / Attach not supported by controller")
+
         self.dps = 0
         self.flbas = 0
         (ds, ms) = self.get_lba_format_size()
diff --git a/tests/nvme_create_max_ns_test.py b/tests/nvme_create_max_ns_test.py
index 41e7a8d3c8..d8620a78b1 100644
--- a/tests/nvme_create_max_ns_test.py
+++ b/tests/nvme_create_max_ns_test.py
@@ -48,6 +48,10 @@ class TestNVMeCreateMaxNS(TestNVMe):
     def setUp(self):
         """ Pre Section for TestNVMeAttachDetachNSCmd """
         super().setUp()
+
+        if not self.ns_mgmt_supported:
+            self.skipTest("Namespace Management / Attach not supported by controller")
+
         self.dps = 0
         self.flbas = 0
         (ds, ms) = self.get_lba_format_size()
diff --git a/tests/nvme_format_test.py b/tests/nvme_format_test.py
index 68445ac843..7cdd72df94 100644
--- a/tests/nvme_format_test.py
+++ b/tests/nvme_format_test.py
@@ -62,6 +62,10 @@ class TestNVMeFormatCmd(TestNVMe):
     def setUp(self):
         """ Pre Section for TestNVMeFormatCmd """
         super().setUp()
+
+        if not self.ns_mgmt_supported:
+            self.skipTest("Namespace Management / Attach not supported by controller")
+
         self.dps = 0
         self.flbas = 0
         # Assuming run_ns_io with 4KiB * 10 writes.