Merge pull request #311 from elezar/bugfix-enroot

Add additional logging

Author: elezar

src/cli/compat_mode.c

@@ -40,7 +40,7 @@ update_compat_libraries(struct nvc_context *ctx, struct nvc_container *cnt, cons
         }
 
         /* For cuda-compat-mode=mount, we also allow compat libraries with a LOWER major versions. */
-        bool allow_lower_major_versions = (cnt-> flags & OPT_CUDA_COMPAT_MODE_MOUNT);
+        bool allow_lower_major_versions = (cnt->flags & OPT_CUDA_COMPAT_MODE_MOUNT);
         filter_by_major_version(allow_lower_major_versions, info, libs, &nlibs);
 
         /* Use the filtered library list. */
@@ -55,6 +55,7 @@ update_compat_libraries(struct nvc_context *ctx, struct nvc_container *cnt, cons
         if (get_compat_library_path(&ctx->err, (const char **)libs, nlibs, &cnt->cuda_compat_dir) < 0) {
                 return (-1);
         }
+        log_infof("setting CUDA Forward Compatibility directory to %s", cnt->cuda_compat_dir);
         return (0);
 }
 

src/nvc_container.c

@@ -241,10 +241,11 @@ nvc_container_new(struct nvc_context *ctx, const struct nvc_container_config *cf
                 return (NULL);
         }
 
-        log_infof("configuring container with '%s'", opts);
+        log_infof("configuring container with '%s' (flags: 0x%08x)", opts, flags);
         if ((cnt = xcalloc(&ctx->err, 1, sizeof(*cnt))) == NULL)
                 return (NULL);
 
+        cnt->cuda_compat_dir = NULL;
         cnt->flags = flags;
         if (copy_config(&ctx->err, cnt, cfg) < 0)
                 goto fail;
@@ -316,6 +317,7 @@ validate_cuda_compat_mode_flags(struct error *err, int32_t *flags) {
                  * If the OPT_CUDA_COMPAT_MODE_DISABLED flag is specified, we
                  * explicitly ignore other OP_CUDA_COMPAT_MODE_* flags.
                  */
+                log_info("disabling CUDA Forward Compatibility");
                 *flags &= ~(OPT_CUDA_COMPAT_MODE_MOUNT | OPT_CUDA_COMPAT_MODE_LDCONFIG);
                 return (0);
         }
@@ -325,6 +327,7 @@ validate_cuda_compat_mode_flags(struct error *err, int32_t *flags) {
                  * default to OPT_CUDA_COMPAT_MODE_MOUNT to maintain
                  * backward compatibility.
                  */
+                log_info("defaulting to cuda-compat-mode=mount");
                 *flags |= OPT_CUDA_COMPAT_MODE_MOUNT;
                 return (0);
         }

src/nvc_ldcache.c

@@ -472,14 +472,15 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt)
         if (validate_args(ctx, cnt != NULL) < 0)
                 return (-1);
 
-        if (cnt->flags & OPT_CUDA_COMPAT_MODE_LDCONFIG && cnt->cuda_compat_dir != NULL) {
+        if ((cnt->flags & OPT_CUDA_COMPAT_MODE_LDCONFIG) && (cnt->cuda_compat_dir != NULL)) {
                 /*
                  * We include the cuda_compat_dir directory on the ldconfig
                  * command line. This ensures that the CUDA Forward compat
                  * libraries take precendence over the user-mode driver
                  * libraries in the standard library paths (libs_dir and
                  * libs32_dir).
                  * */
+                log_info("prefering CUDA Forward Compatibility dir when running ldconfig");
                 argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cuda_compat_dir, cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};
         } else {
                 argv = (char * []){cnt->cfg.ldconfig, "-f", "/etc/ld.so.conf", "-C", "/etc/ld.so.cache", cnt->cfg.libs_dir, cnt->cfg.libs32_dir, NULL};