contest: hw: make sure we collect device info

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Author: kuba-moo

contest/hw/hw_worker.py

@@ -127,6 +127,37 @@ def _ensure_addr(ifname, addr, **kwargs):
     _ip(f'addr add {addr} dev {ifname}', **kwargs)
 
 
+def _collect_device_info(ifname):
+    """Collect devlink device info for the test interface.
+
+    Returns a dict matching ``devlink -j dev info $dev | jq '.[][]'``
+    or None if the info cannot be obtained.
+    """
+    # Find PCI address via ip link
+    ret = subprocess.run(['ip', '-d', '-j', 'link', 'show', 'dev', ifname],
+                         capture_output=True, timeout=10, check=False)
+    if ret.returncode != 0:
+        return None
+    try:
+        pci_addr = json.loads(ret.stdout)[0].get('parentdev')
+    except (json.JSONDecodeError, IndexError):
+        return None
+    if not pci_addr:
+        return None
+
+    devlink_dev = f'pci/{pci_addr}'
+    ret = subprocess.run(['devlink', '-j', 'dev', 'info', devlink_dev],
+                         capture_output=True, timeout=10, check=False)
+    if ret.returncode != 0:
+        return None
+    try:
+        data = json.loads(ret.stdout)
+        # Strip outer nests: {"info":{"pci/...": {actual data}}}
+        return data['info'][devlink_dev]
+    except (json.JSONDecodeError, KeyError):
+        return None
+
+
 def setup_test_interfaces(test_dir):
     """Configure test NICs and write net.config from nic-test.env.
 
@@ -252,6 +283,19 @@ def main():
     results_dir = os.path.join(results_base, reservation_id)
     os.makedirs(results_dir, exist_ok=True)
 
+    # Collect devlink device info for the test NIC
+    env = _parse_env_file(os.path.join(test_dir, 'nic-test.env'))
+    netif = env.get('NETIF')
+    if netif:
+        dev_info = _collect_device_info(netif)
+        if dev_info:
+            with open(os.path.join(results_dir, 'device-info.json'), 'w',
+                      encoding='utf-8') as fp:
+                json.dump(dev_info, fp)
+            print(f"Collected device info for {netif}")
+        else:
+            print(f"Warning: could not collect device info for {netif}")
+
     crashed = run_tests(test_dir, results_dir)
 
     print(f"Completed, results in {results_dir}")

contest/hw/hwksft.py

@@ -23,6 +23,7 @@
                           parse_results, process_crashes, set_log_file,
                           WaitResult, grab_hw_worker_journal, grab_sol_logs,
                           reboot_machine, check_healthy_ssh,
+                          read_device_info,
                           CRASH_SENTINEL, _journal_has_crash_sentinel)
 
 # Config:
@@ -272,7 +273,12 @@ def test(binfo, rinfo, cbarg):  # pylint: disable=unused-argument
         # 11. Copy back results
         fetch_results(machine_ips, reservation_id, results_path)
 
-        # 11. Parse results
+        # Populate device info from hw_worker's devlink collection
+        dev_info = read_device_info(results_path)
+        if dev_info:
+            rinfo['device'] = dev_info
+
+        # 12. Parse results
         cases = parse_results(results_path, link)
 
         # 12. Post-process crashes: decode stack traces, extract fingerprints

contest/hw/lib/deployer.py

@@ -437,6 +437,15 @@ def fetch_results(machine_ips, reservation_id, results_path):
               check=False)
 
 
+def read_device_info(results_path):
+    """Read device-info.json written by hw_worker, or return None."""
+    path = os.path.join(results_path, 'test-outputs', 'device-info.json')
+    if not os.path.exists(path):
+        return None
+    with open(path, encoding='utf-8') as fp:
+        return json.load(fp)
+
+
 def parse_results(results_path, link):
     """Parse fetched test output into a vmksft-p-style result list.