Add device brand to the device informations and requirements

3XX0 · 3XX0 · commit ebed710be85a · 2018-09-13T16:47:50.000-07:00
diff --git a/src/cli/configure.c b/src/cli/configure.c
@@ -13,6 +13,7 @@ static error_t configure_parser(int, char *, struct argp_state *);
 static int check_cuda_version(const struct dsl_data *, enum dsl_comparator, const char *);
 static int check_driver_version(const struct dsl_data *, enum dsl_comparator, const char *);
 static int check_device_arch(const struct dsl_data *, enum dsl_comparator, const char *);
+static int check_device_brand(const struct dsl_data *, enum dsl_comparator, const char *);
 
 const struct argp configure_usage = {
         (const struct argp_option[]){
@@ -46,6 +47,7 @@ static const struct dsl_rule rules[] = {
         {"cuda", &check_cuda_version},
         {"driver", &check_driver_version},
         {"arch", &check_device_arch},
+        {"brand", &check_device_brand},
 };
 
 static error_t
@@ -159,6 +161,15 @@ check_device_arch(const struct dsl_data *data, enum dsl_comparator cmp, const ch
         return (dsl_compare_version(data->dev->arch, cmp, arch));
 }
 
+static int
+check_device_brand(const struct dsl_data *data, enum dsl_comparator cmp, const char *brand)
+{
+        /* XXX No device is visible, assume the brand is ok. */
+        if (data->dev == NULL)
+                return (true);
+        return (dsl_compare_string(data->dev->brand, cmp, brand));
+}
+
 int
 configure_command(const struct context *ctx)
 {
diff --git a/src/cli/dsl.c b/src/cli/dsl.c
@@ -76,6 +76,16 @@ dsl_compare_version(const char *v1, enum dsl_comparator cmp, const char *v2)
         return (-1);
 }
 
+int
+dsl_compare_string(const char *s1, enum dsl_comparator cmp, const char *s2)
+{
+        if (cmp == EQUAL)
+                return (str_case_equal(s1, s2));
+        else if (cmp == NOT_EQUAL)
+                return (!str_case_equal(s1, s2));
+        return (-1);
+}
+
 static int
 evaluate_rule(char *buf, char *expr, void *ctx, const struct dsl_rule rules[], size_t size)
 {
diff --git a/src/cli/dsl.h b/src/cli/dsl.h
@@ -29,6 +29,7 @@ struct dsl_rule {
 };
 
 int dsl_compare_version(const char *, enum dsl_comparator, const char *);
+int dsl_compare_string(const char *, enum dsl_comparator, const char *);
 int dsl_evaluate(struct error *, const char *, void *, const struct dsl_rule [], size_t);
 
 #endif /* HEADER_DSL_H */
diff --git a/src/cli/info.c b/src/cli/info.c
@@ -95,16 +95,17 @@ info_command(const struct context *ctx)
 
         if (ctx->csv_output) {
                 printf("NVRM version,CUDA version\n%s,%s\n", drv->nvrm_version, drv->cuda_version);
-                printf("\nDevice Index,Device Minor,Model,GPU UUID,Bus Location,Architecture\n");
+                printf("\nDevice Index,Device Minor,Model,Brand,GPU UUID,Bus Location,Architecture\n");
                 for (size_t i = 0; i < dev->ngpus; ++i)
-                        printf("%zu,%u,%s,%s,%s,%s\n", i, minor(dev->gpus[i].node.id), dev->gpus[i].model, dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch);
+                        printf("%zu,%u,%s,%s,%s,%s,%s\n", i, minor(dev->gpus[i].node.id), dev->gpus[i].model, dev->gpus[i].brand,
+                            dev->gpus[i].uuid, dev->gpus[i].busid, dev->gpus[i].arch);
 
         } else {
                 printf("%-15s %s\n%-15s %s\n", "NVRM version:", drv->nvrm_version, "CUDA version:", drv->cuda_version);
                 for (size_t i = 0; i < dev->ngpus; ++i)
-                        printf("\n%-15s %zu\n%-15s %u\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n",
-                            "Device Index:", i, "Device Minor:", minor(dev->gpus[i].node.id), "Model:", dev->gpus[i].model, "GPU UUID:", dev->gpus[i].uuid,
-                            "Bus Location:", dev->gpus[i].busid, "Architecture:", dev->gpus[i].arch);
+                        printf("\n%-15s %zu\n%-15s %u\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n%-15s %s\n",
+                            "Device Index:", i, "Device Minor:", minor(dev->gpus[i].node.id), "Model:", dev->gpus[i].model, "Brand:",
+                            dev->gpus[i].brand, "GPU UUID:", dev->gpus[i].uuid, "Bus Location:", dev->gpus[i].busid, "Architecture:", dev->gpus[i].arch);
         }
 
         if (run_as_root && perm_set_capabilities(&err, CAP_EFFECTIVE, ecaps[NVC_SHUTDOWN], ecaps_size(NVC_SHUTDOWN)) < 0) {
diff --git a/src/driver.c b/src/driver.c
@@ -633,6 +633,65 @@ driver_get_device_model_1_svc(ptr_t ctxptr, ptr_t dev, driver_get_device_model_r
         return (true);
 }
 
+int
+driver_get_device_brand(struct driver *ctx, struct driver_device *dev, char **brand)
+{
+        struct driver_get_device_brand_res res = {0};
+        int rv = -1;
+
+        if (call_rpc(ctx, &res, driver_get_device_brand_1, (ptr_t)dev) < 0)
+                goto fail;
+        if ((*brand = xstrdup(ctx->err, res.driver_get_device_brand_res_u.brand)) == NULL)
+                goto fail;
+        rv = 0;
+
+ fail:
+        xdr_free((xdrproc_t)xdr_driver_get_device_brand_res, (caddr_t)&res);
+        return (rv);
+}
+
+bool_t
+driver_get_device_brand_1_svc(ptr_t ctxptr, ptr_t dev, driver_get_device_brand_res *res, maybe_unused struct svc_req *req)
+{
+        struct driver *ctx = (struct driver *)ctxptr;
+        struct driver_device *handle = (struct driver_device *)dev;
+        nvmlBrandType_t brand;
+        const char *buf;
+
+        memset(res, 0, sizeof(*res));
+        if (call_nvml(ctx, nvmlDeviceGetBrand, handle->nvml, &brand) < 0)
+                goto fail;
+        switch (brand) {
+        case NVML_BRAND_QUADRO:
+                buf = "Quadro";
+                break;
+        case NVML_BRAND_TESLA:
+                buf = "Tesla";
+                break;
+        case NVML_BRAND_NVS:
+                buf = "NVS";
+                break;
+        case NVML_BRAND_GRID:
+                buf = "GRID";
+                break;
+        case NVML_BRAND_GEFORCE:
+                buf = "GeForce";
+                break;
+        case NVML_BRAND_TITAN:
+                buf = "TITAN";
+                break;
+        default:
+                buf = "Unknown";
+        }
+        if ((res->driver_get_device_brand_res_u.brand = xstrdup(ctx->err, buf)) == NULL)
+                goto fail;
+        return (true);
+
+ fail:
+        error_to_xdr(ctx->err, res);
+        return (true);
+}
+
 int
 driver_get_device_arch(struct driver *ctx, struct driver_device *dev, char **arch)
 {
diff --git a/src/driver.h b/src/driver.h
@@ -46,5 +46,6 @@ int driver_get_device_busid(struct driver *, struct driver_device *, char **);
 int driver_get_device_uuid(struct driver *, struct driver_device *, char **);
 int driver_get_device_arch(struct driver *, struct driver_device *, char **);
 int driver_get_device_model(struct driver *, struct driver_device *, char **);
+int driver_get_device_brand(struct driver *, struct driver_device *, char **);
 
 #endif /* HEADER_DRIVER_H */
diff --git a/src/driver_rpc.x b/src/driver_rpc.x
@@ -95,6 +95,13 @@ union driver_get_device_model_res switch (int errcode) {
                 string errmsg<>;
 };
 
+union driver_get_device_brand_res switch (int errcode) {
+        case 0:
+                string brand<>;
+        default:
+                string errmsg<>;
+};
+
 program DRIVER_PROGRAM {
         version DRIVER_VERSION {
                 driver_init_res DRIVER_INIT(ptr_t) = 1;
@@ -108,5 +115,6 @@ program DRIVER_PROGRAM {
                 driver_get_device_uuid_res DRIVER_GET_DEVICE_UUID(ptr_t, ptr_t) = 9;
                 driver_get_device_arch_res DRIVER_GET_DEVICE_ARCH(ptr_t, ptr_t) = 10;
                 driver_get_device_model_res DRIVER_GET_DEVICE_MODEL(ptr_t, ptr_t) = 11;
+                driver_get_device_brand_res DRIVER_GET_DEVICE_BRAND(ptr_t, ptr_t) = 12;
         } = 1;
 } = 0x1;
diff --git a/src/nvc.h b/src/nvc.h
@@ -62,6 +62,7 @@ struct nvc_device {
         char *uuid;
         char *busid;
         char *arch;
+        char *brand;
         struct nvc_device_node node;
 };
 
diff --git a/src/nvc_info.c b/src/nvc_info.c
@@ -508,6 +508,8 @@ nvc_device_info_new(struct nvc_context *ctx, const char *opts)
                         goto fail;
                 if (driver_get_device_arch(&ctx->drv, dev, &gpu->arch) < 0)
                         goto fail;
+                if (driver_get_device_brand(&ctx->drv, dev, &gpu->brand) < 0)
+                        goto fail;
                 if (driver_get_device_minor(&ctx->drv, dev, &minor) < 0)
                         goto fail;
                 if (xasprintf(&ctx->err, &gpu->node.path, NV_DEVICE_PATH, minor) < 0)
@@ -533,6 +535,7 @@ nvc_device_info_free(struct nvc_device_info *info)
                 free(info->gpus[i].uuid);
                 free(info->gpus[i].busid);
                 free(info->gpus[i].arch);
+                free(info->gpus[i].brand);
                 free(info->gpus[i].node.path);
         }
         free(info->gpus);
