tests: only setup cdfe for requested descriptor version

The setUp method was enabling all cross-namespace cdfe bits
(CDF2E | CDF3E = 12) for every test, including format 0 and 1.
Only enable support necessary descriptor version used in the test.

Signed-off-by: Daniel Wagner <wagi@kernel.org>

Author: igaw

tests/nvme_copy_test.py

@@ -39,33 +39,6 @@ def setUp(self):
         self.mcl = to_decimal(self.get_id_ns_field_value("mcl"))
         self.mssrl = to_decimal(self.get_id_ns_field_value("mssrl"))
         self.msrc = to_decimal(self.get_id_ns_field_value("msrc"))
-        cross_namespace_copy = self.ocfs & 0xc
-        if cross_namespace_copy:
-            get_features_cmd = f"{self.nvme_bin} feat host-behavior-support " + \
-                f"{self.ctrl} --output-format=json"
-            result = self.run_cmd(get_features_cmd)
-            self.assertEqual(result.returncode, 0,
-                             "ERROR : nvme feat host-behavior-support failed")
-            data = json.loads(result.stdout)
-            fields = data.get("Feature: 0x16", [{}])[0]
-            # reconstruct cdfe from individual CDF bit fields
-            current_cdfe = (
-                (0x4 if fields.get("Copy Descriptor Format 2h Enable (CDF2E)") == "True" else 0) |
-                (0x8 if fields.get("Copy Descriptor Format 3h Enable (CDF3E)") == "True" else 0) |
-                (0x10 if fields.get("Copy Descriptor Format 4h Enable (CDF4E)") == "True" else 0)
-            )
-            if current_cdfe & cross_namespace_copy:
-                # skip if already enabled
-                print("Cross-namespace copy already enabled, skipping set-features")
-            else:
-                # save original cdfe for restore on teardown
-                self.original_cdfe = current_cdfe
-                new_cdfe = current_cdfe | cross_namespace_copy
-                set_features_cmd = f"{self.nvme_bin} feat host-behavior-support " + \
-                    f"{self.ctrl} --cdfe={new_cdfe}"
-                result = self.run_cmd(set_features_cmd)
-                self.assertEqual(result.returncode, 0,
-                                 "Failed to enable cross-namespace copy formats")
         get_ns_id_cmd = f"{self.nvme_bin} get-ns-id {self.ns1}"
         result = self.run_cmd(get_ns_id_cmd)
         err = result.returncode
@@ -96,6 +69,38 @@ def _check_ns_copy_limits(self):
         if missing:
             self.skipTest(f"{', '.join(missing)} are 0, copy not supported on this namespace")
 
+    def _enable_cdfe_for_format(self, desc_format):
+        """ Enable the host-behavior-support cdfe bit for the given cross-namespace format.
+            Only the bit corresponding to desc_format is enabled; other bits are left unchanged.
+            The original value is saved in self.original_cdfe for tearDown to restore.
+        """
+        cdfe_bit = 1 << desc_format
+        get_features_cmd = f"{self.nvme_bin} feat host-behavior-support " + \
+            f"{self.ctrl} --output-format=json"
+        result = self.run_cmd(get_features_cmd)
+        self.assertEqual(result.returncode, 0,
+                         "ERROR : nvme feat host-behavior-support failed")
+        data = json.loads(result.stdout)
+        fields = data.get("Feature: 0x16", [{}])[0]
+        # reconstruct cdfe from individual CDF bit fields
+        current_cdfe = (
+            (0x4 if fields.get("Copy Descriptor Format 2h Enable (CDF2E)") == "True" else 0) |
+            (0x8 if fields.get("Copy Descriptor Format 3h Enable (CDF3E)") == "True" else 0) |
+            (0x10 if fields.get("Copy Descriptor Format 4h Enable (CDF4E)") == "True" else 0)
+        )
+        if current_cdfe & cdfe_bit:
+            # the required bit is already enabled, nothing to do
+            return
+        # save original cdfe for restore in tearDown (only save once)
+        if self.original_cdfe is None:
+            self.original_cdfe = current_cdfe
+        new_cdfe = current_cdfe | cdfe_bit
+        set_features_cmd = f"{self.nvme_bin} feat host-behavior-support " + \
+            f"{self.ctrl} --cdfe={new_cdfe}"
+        result = self.run_cmd(set_features_cmd)
+        self.assertEqual(result.returncode, 0,
+                         f"Failed to enable cdfe bit {cdfe_bit:#x} for format {desc_format}")
+
     def copy(self, sdlba, blocks, slbs, **kwargs):
         """ Wrapper for nvme copy
             - Args:
@@ -136,22 +141,26 @@ def test_copy_format_2(self):
         """ Test copy with descriptor format 2 """
         self._check_format_supported(2)
         self._check_ns_copy_limits()
+        self._enable_cdfe_for_format(2)
         self.copy(0, 1, 2, descriptor_format=2, snsids=self.ns1_nsid)
 
     def test_copy_format_2_sopts(self):
         """ Test copy with descriptor format 2 and source options """
         self._check_format_supported(2)
         self._check_ns_copy_limits()
+        self._enable_cdfe_for_format(2)
         self.copy(0, 1, 2, descriptor_format=2, snsids=self.ns1_nsid, sopts=0)
 
     def test_copy_format_3(self):
         """ Test copy with descriptor format 3 """
         self._check_format_supported(3)
         self._check_ns_copy_limits()
+        self._enable_cdfe_for_format(3)
         self.copy(0, 1, 2, descriptor_format=3, snsids=self.ns1_nsid)
 
     def test_copy_format_3_sopts(self):
         """ Test copy with descriptor format 3 and source options """
         self._check_format_supported(3)
         self._check_ns_copy_limits()
+        self._enable_cdfe_for_format(3)
         self.copy(0, 1, 2, descriptor_format=3, snsids=self.ns1_nsid, sopts=0)