LU-12299 libcfs: fix panic for too large cpu partions

[fs/lustre-release.git] / libcfs / libcfs / libcfs_cpu.c

diff --git a/libcfs/libcfs/libcfs_cpu.c b/libcfs/libcfs/libcfs_cpu.c
index c80f9d4..e183986 100644 (file)
--- a/libcfs/libcfs/libcfs_cpu.c
+++ b/libcfs/libcfs/libcfs_cpu.c
@@ -868,7 +868,14 @@ static struct cfs_cpt_table *cfs_cpt_table_create(int ncpt)
        if (ncpt <= 0)
                ncpt = num;
 
-       if (ncpt > num_online_cpus() || ncpt > 4 * num) {
+       if (ncpt > num_online_cpus()) {
+               rc = -EINVAL;
+               CERROR("libcfs: CPU partition count %d > cores %d: rc = %d\n",
+                      ncpt, num_online_cpus(), rc);
+               goto failed;
+       }
+
+       if (ncpt > 4 * num) {
                CWARN("CPU partition number %d is larger than suggested value (%d), your system may have performance issue or run out of memory while under pressure\n",
                      ncpt, num);
        }
@@ -948,7 +955,7 @@ static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
                return ERR_PTR(-ENOMEM);
        }
 
-       str = cfs_trimwhite(pattern_dup);
+       str = strim(pattern_dup);
        if (*str == 'n' || *str == 'N') {
                str++; /* skip 'N' char */
                node = 1; /* NUMA pattern */
@@ -1006,7 +1013,7 @@ static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
 
        high = node ? nr_node_ids - 1 : nr_cpu_ids - 1;
 
-       for (str = cfs_trimwhite(str), c = 0; /* until break */; c++) {
+       for (str = strim(str), c = 0; /* until break */; c++) {
                struct cfs_range_expr *range;
                struct cfs_expr_list *el;
                int n;
@@ -1045,7 +1052,7 @@ static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
                        goto err_free_table;
                }
 
-               str = cfs_trimwhite(str + n);
+               str = strim(str + n);
                if (str != bracket) {
                        CERROR("Invalid pattern '%s'\n", str);
                        rc = -EINVAL;
@@ -1091,7 +1098,7 @@ static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
                        goto err_free_table;
                }
 
-               str = cfs_trimwhite(bracket + 1);
+               str = strim(bracket + 1);
        }
 
        kfree(pattern_dup);
@@ -1230,7 +1237,7 @@ int cfs_cpu_init(void)
 failed_alloc_table:
        put_online_cpus();
 
-       if (cfs_cpt_table)
+       if (!IS_ERR_OR_NULL(cfs_cpt_table))
                cfs_cpt_table_free(cfs_cpt_table);
 
 #ifdef CONFIG_HOTPLUG_CPU