Add support to "list" command to print /dev based capabilities

Signed-off-by: Kevin Klues <[email protected]>

Author: klueska

src/cli/cli.h

@@ -69,6 +69,9 @@ struct devices {
 int new_devices(struct error *err, const struct nvc_device_info *dev, struct devices *d);
 void free_devices(struct devices *d);
 
+int print_nvcaps_device_from_proc_file(struct nvc_context *, const char*, const char*);
+int print_all_mig_minor_devices(const struct nvc_device_node *);
+
 int select_devices(
     struct error *err,
     char *devs,

src/cli/common.c

@@ -2,6 +2,8 @@
  * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved.
  */
 
+#include <sys/sysmacros.h>
+
 #include <inttypes.h>
 #include <string.h>
 
@@ -464,3 +466,50 @@ free_devices(struct devices *d)
         free(d->migs);
         memset(d, 0, sizeof(*d));
 }
+
+int
+print_nvcaps_device_from_proc_file(struct nvc_context *ctx, const char* cap_dir, const char* cap_file)
+{
+        char cap_path[PATH_MAX];
+        struct nvc_device_node node;
+
+        if (path_join(NULL, cap_path, cap_dir, cap_file) < 0)
+                return (-1);
+        if (nvc_nvcaps_device_from_proc_path(ctx, cap_path, &node) < 0)
+                return (-1);
+
+        printf("%s\n", node.path);
+        free(node.path);
+
+        return (0);
+}
+
+int
+print_all_mig_minor_devices(const struct nvc_device_node *node)
+{
+        unsigned int gpu_minor = 0;
+        unsigned int mig_minor = 0;
+        char line[PATH_MAX];
+        char dummy[PATH_MAX];
+        FILE *fp;
+        int rv = -1;
+
+        if ((fp = fopen(NV_CAPS_MIG_MINORS_PATH, "r")) == NULL) {
+            goto fail;
+        }
+
+        line[PATH_MAX - 1] = '\0';
+        while (fgets(line, PATH_MAX - 1, fp)) {
+                if (sscanf(line, "gpu%u%s %u", &gpu_minor, dummy, &mig_minor) != 3)
+                        continue;
+                if (gpu_minor != minor(node->id))
+                        continue;
+                printf(NV_CAPS_DEVICE_PATH "\n", mig_minor);
+        }
+
+        rv = 0;
+
+fail:
+        fclose(fp);
+        return (rv);
+}

src/cli/list.c

@@ -188,22 +188,38 @@ list_command(const struct context *ctx)
                         for (size_t i = 0; i < devices.nmigs; ++i) {
                                 printf("%s/%s\n", devices.migs[i]->gi_caps_path, NV_MIG_ACCESS_FILE);
                                 printf("%s/%s\n", devices.migs[i]->ci_caps_path, NV_MIG_ACCESS_FILE);
+                                if (nvc_nvcaps_style() == NVC_NVCAPS_STYLE_DEV) {
+                                        print_nvcaps_device_from_proc_file(nvc, devices.migs[i]->gi_caps_path, NV_MIG_ACCESS_FILE);
+                                        print_nvcaps_device_from_proc_file(nvc, devices.migs[i]->ci_caps_path, NV_MIG_ACCESS_FILE);
+                                }
                         }
                 }
         }
 
         /* List the files required for MIG configuration of the visible devices */
         if (mig_config_devices.all && mig_config_devices.ngpus) {
                 printf("%s/%s\n", NV_MIG_CAPS_PATH, NV_MIG_CONFIG_FILE);
+                if (nvc_nvcaps_style() == NVC_NVCAPS_STYLE_DEV)
+                        print_nvcaps_device_from_proc_file(nvc, NV_MIG_CAPS_PATH, NV_MIG_CONFIG_FILE);
                 for (size_t i = 0; i < mig_config_devices.ngpus; ++i) {
                         printf("%s\n", mig_config_devices.gpus[i]->mig_caps_path);
+                        if (nvc_nvcaps_style() == NVC_NVCAPS_STYLE_DEV) {
+                                printf("%s\n", NV_CAPS_DEVICE_DIR);
+                                print_all_mig_minor_devices(&mig_config_devices.gpus[i]->node);
+                        }
                 }
         }
         /* List the files required for MIG monitoring of the visible devices */
         if (mig_monitor_devices.all && mig_monitor_devices.ngpus) {
                 printf("%s/%s\n", NV_MIG_CAPS_PATH, NV_MIG_MONITOR_FILE);
+                if (nvc_nvcaps_style() == NVC_NVCAPS_STYLE_DEV)
+                        print_nvcaps_device_from_proc_file(nvc, NV_MIG_CAPS_PATH, NV_MIG_MONITOR_FILE);
                 for (size_t i = 0; i < mig_monitor_devices.ngpus; ++i) {
                         printf("%s\n", mig_monitor_devices.gpus[i]->mig_caps_path);
+                        if (nvc_nvcaps_style() == NVC_NVCAPS_STYLE_DEV) {
+                                printf("%s\n", NV_CAPS_DEVICE_DIR);
+                                print_all_mig_minor_devices(&mig_monitor_devices.gpus[i]->node);
+                        }
                 }
         }