Merge branch 'upstream-add-fabricmanager-as-ipc' into 'master'

Add fabricmanager as a valid IPC to inject into a container

See merge request nvidia/container-toolkit/libnvidia-container!60

Author: klueska

src/nvc_info.c

@@ -60,6 +60,7 @@ static const char * const utility_bins[] = {
         "nvidia-smi",                       /* System management interface */
         "nvidia-debugdump",                 /* GPU coredump utility */
         "nvidia-persistenced",              /* Persistence mode utility */
+        "nv-fabricmanager",                 /* NVSwitch fabrimanager utility */
         //"nvidia-modprobe",                /* Kernel module loader */
         //"nvidia-settings",                /* X server settings */
         //"nvidia-xconfig",                 /* X xorg.conf editor */
@@ -444,7 +445,7 @@ lookup_ipcs(struct error *err, struct nvc_driver_info *info, const char *root, i
         char **ptr;
         const char *mps;
 
-        info->nipcs = 2;
+        info->nipcs = 3;
         info->ipcs = ptr = array_new(err, info->nipcs);
         if (info->ipcs == NULL)
                 return (-1);
@@ -453,6 +454,10 @@ lookup_ipcs(struct error *err, struct nvc_driver_info *info, const char *root, i
                 if (find_ipc_path(err, root, NV_PERSISTENCED_SOCKET, ptr++) < 0)
                         return (-1);
         }
+        if (!(flags & OPT_NO_FABRICMANAGER)) {
+                if (find_ipc_path(err, root, NV_FABRICMANAGER_SOCKET, ptr++) < 0)
+                        return (-1);
+        }
         if (!(flags & OPT_NO_MPS)) {
                 if ((mps = secure_getenv("CUDA_MPS_PIPE_DIRECTORY")) == NULL)
                         mps = NV_MPS_PIPE_DIR;

src/nvc_internal.h

@@ -34,6 +34,7 @@
 #define NV_CAPS_DEVICE_DIR       _PATH_DEV "nvidia-caps"
 #define NV_CAPS_DEVICE_PATH      NV_CAPS_DEVICE_DIR "/nvidia-cap%d"
 #define NV_PERSISTENCED_SOCKET   _PATH_VARRUN "nvidia-persistenced/socket"
+#define NV_FABRICMANAGER_SOCKET  _PATH_VARRUN "nvidia-fabricmanager/socket"
 #define NV_MPS_PIPE_DIR          _PATH_TMP "nvidia-mps"
 #define NV_PROC_DRIVER           "/proc/driver/nvidia"
 #define NV_CAPS_PROC_DRIVER      "/proc/driver/nvidia-caps"

src/nvc_mount.c

@@ -780,8 +780,8 @@ nvc_driver_mount(struct nvc_context *ctx, const struct nvc_container *cnt, const
 
         /* IPC mounts */
         for (size_t i = 0; i < info->nipcs; ++i) {
-                /* XXX Only utility libraries require persistenced IPC, everything else is compute only. */
-                if (str_has_suffix(NV_PERSISTENCED_SOCKET, info->ipcs[i])) {
+                /* XXX Only utility libraries require persistenced or fabricmanager IPC, everything else is compute only. */
+                if (str_has_suffix(NV_PERSISTENCED_SOCKET, info->ipcs[i]) || str_has_suffix(NV_FABRICMANAGER_SOCKET, info->ipcs[i])) {
                         if (!(cnt->flags & OPT_UTILITY_LIBS))
                                 continue;
                 } else if (!(cnt->flags & OPT_COMPUTE_LIBS))

src/options.h

@@ -27,11 +27,12 @@ static const char * const default_library_opts = "";
 
 /* Driver options */
 enum {
-        OPT_NO_GLVND        = 1 << 0,
-        OPT_NO_UVM          = 1 << 1,
-        OPT_NO_MODESET      = 1 << 2,
-        OPT_NO_MPS          = 1 << 3,
-        OPT_NO_PERSISTENCED = 1 << 4,
+        OPT_NO_GLVND         = 1 << 0,
+        OPT_NO_UVM           = 1 << 1,
+        OPT_NO_MODESET       = 1 << 2,
+        OPT_NO_MPS           = 1 << 3,
+        OPT_NO_PERSISTENCED  = 1 << 4,
+        OPT_NO_FABRICMANAGER = 1 << 5,
 };
 
 static const struct option driver_opts[] = {
@@ -40,6 +41,7 @@ static const struct option driver_opts[] = {
         {"no-modeset", OPT_NO_MODESET},
         {"no-mps", OPT_NO_MPS},
         {"no-persistenced", OPT_NO_PERSISTENCED},
+        {"no-fabricmanager", OPT_NO_FABRICMANAGER},
 };
 
 static const char * const default_driver_opts = "";