Move cap_device_from_path to a public facing interface

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

Author: klueska

pkg/deb/libnvidia-container@[email protected]

@@ -10,6 +10,7 @@ libnvidia-container.so.1 libnvidia-container1 #MINVER#
  nvc_context_new@NVC_1.0 1.2.0~rc.3
  nvc_device_info_free@NVC_1.0 1.2.0~rc.3
  nvc_device_info_new@NVC_1.0 1.2.0~rc.3
+ nvc_nvcaps_device_from_proc_path@NVC_1.0 1.2.0~rc.3
  nvc_device_mount@NVC_1.0 1.2.0~rc.3
  nvc_mig_device_access_caps_mount@NVC_1.0 1.2.0~rc.3
  nvc_mig_config_global_caps_mount@NVC_1.0 1.2.0~rc.3

src/libnvidia-container.lds

@@ -33,6 +33,7 @@ VERSION {
             nvc_device_info_free;
             nvc_driver_mount;
             nvc_device_mount;
+            nvc_nvcaps_device_from_proc_path;
             nvc_mig_device_access_caps_mount;
             nvc_mig_config_global_caps_mount;
             nvc_mig_monitor_global_caps_mount;

src/nvc.h

@@ -121,6 +121,8 @@ void nvc_driver_info_free(struct nvc_driver_info *);
 struct nvc_device_info *nvc_device_info_new(struct nvc_context *, const char *);
 void nvc_device_info_free(struct nvc_device_info *);
 
+int nvc_nvcaps_device_from_proc_path(struct nvc_context *, const char *, struct nvc_device_node *);
+
 int nvc_driver_mount(struct nvc_context *, const struct nvc_container *, const struct nvc_driver_info *);
 
 int nvc_device_mount(struct nvc_context *, const struct nvc_container *, const struct nvc_device *);

src/nvc_info.c

@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <nvidia-modprobe-utils.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -788,3 +789,29 @@ nvc_device_info_free(struct nvc_device_info *info)
         free(info->gpus);
         free(info);
 }
+
+int
+nvc_nvcaps_device_from_proc_path(struct nvc_context *ctx, const char *cap_path, struct nvc_device_node *node)
+{
+        char abs_cap_path[PATH_MAX];
+        char dev_name[PATH_MAX];
+        int major, minor;
+        int rv = -1;
+
+        if (path_join(&ctx->err, abs_cap_path, ctx->cfg.root, cap_path) < 0)
+                goto fail;
+
+        if (nvidia_cap_get_device_file_attrs(abs_cap_path, &major, &minor, dev_name) == 0) {
+                error_set(&ctx->err, "unable to get cap device attributes: %s", cap_path);
+                goto fail;
+        }
+
+        if ((node->path = xstrdup(&ctx->err, dev_name)) == NULL)
+                goto fail;
+        node->id = makedev((unsigned int)major, (unsigned int)minor);
+
+        rv = 0;
+
+fail:
+        return (rv);
+}

src/nvc_mount.c

@@ -40,7 +40,6 @@ static int  symlink_libraries(struct error *, const struct nvc_container *, cons
 static void filter_libraries(const struct nvc_driver_info *, char * [], size_t *);
 static int  device_mount_dxcore(struct nvc_context *, const struct nvc_container *);
 static int  device_mount_native(struct nvc_context *, const struct nvc_container *, const struct nvc_device *);
-static int  cap_device_from_path(struct nvc_context *, const char *, struct nvc_device_node *);
 static int  cap_device_mount(struct nvc_context *, const struct nvc_container *, const char *);
 static int  setup_mig_minor_cgroups(struct error *, const struct nvc_container *, int, const struct nvc_device_node *);
 
@@ -643,40 +642,14 @@ device_mount_native(struct nvc_context *ctx, const struct nvc_container *cnt, co
         return (rv);
 }
 
-static int
-cap_device_from_path(struct nvc_context *ctx, const char *cap_path, struct nvc_device_node *node)
-{
-        char abs_cap_path[PATH_MAX];
-        char dev_name[PATH_MAX];
-        int major, minor;
-        int rv = -1;
-
-        if (path_join(&ctx->err, abs_cap_path, ctx->cfg.root, cap_path) < 0)
-                goto fail;
-
-        if (nvidia_cap_get_device_file_attrs(abs_cap_path, &major, &minor, dev_name) == 0) {
-                error_set(&ctx->err, "unable to get cap device attributes: %s", cap_path);
-                goto fail;
-        }
-
-        if ((node->path = xstrdup(&ctx->err, dev_name)) == NULL)
-                goto fail;
-        node->id = makedev((unsigned int)major, (unsigned int)minor);
-
-        rv = 0;
-
-fail:
-        return (rv);
-}
-
 static int
 cap_device_mount(struct nvc_context *ctx, const struct nvc_container *cnt, const char *cap_path)
 {
         char *dev_mnt = NULL;
         struct nvc_device_node node = {0};
         int rv = -1;
 
-        if (cap_device_from_path(ctx, cap_path, &node) < 0)
+        if (nvc_nvcaps_device_from_proc_path(ctx, cap_path, &node) < 0)
                 goto fail;
 
         if (!(cnt->flags & OPT_NO_DEVBIND)) {
@@ -978,7 +951,7 @@ nvc_mig_config_global_caps_mount(struct nvc_context *ctx, const struct nvc_conta
                 if ((dev_mnt = mount_directory(&ctx->err, ctx->cfg.root, cnt, NV_CAPS_DEVICE_DIR)) == NULL)
                     goto fail;
 
-                if (cap_device_from_path(ctx, config, &node) < 0)
+                if (nvc_nvcaps_device_from_proc_path(ctx, config, &node) < 0)
                         goto fail;
 
                 if (!(cnt->flags & OPT_NO_CGROUPS))
@@ -1041,7 +1014,7 @@ nvc_mig_monitor_global_caps_mount(struct nvc_context *ctx, const struct nvc_cont
                 if ((dev_mnt = mount_directory(&ctx->err, ctx->cfg.root, cnt, NV_CAPS_DEVICE_DIR)) == NULL)
                         goto fail;
 
-                if (cap_device_from_path(ctx, monitor, &node) < 0)
+                if (nvc_nvcaps_device_from_proc_path(ctx, monitor, &node) < 0)
                         goto fail;
 
                 if (!(cnt->flags & OPT_NO_CGROUPS))