Whamcloud - gitweb
LU-9859 libcfs: rearrange placement of CPU partition management code. 59/32359/3
authorNeilBrown <neilb@suse.com>
Sat, 12 May 2018 13:51:30 +0000 (09:51 -0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 21 May 2018 16:54:05 +0000 (16:54 +0000)
Currently the code for cpu-partition tables lives in various places.
The non-SMP code is partly in libcfs/libcfs_cpu.h as static inlines,
and partly in lnet/libcfs/libcfs_cpu.c - some of the functions are
tiny and could well be inlines.

The SMP code is all in lnet/libcfs/linux/linux-cpu.c.

This patch moves all the trivial non-SMP functions into
libcfs_cpu.h as inlines, and all the SMP functions into libcfs_cpu.c
with the non-trival !SMP code.

Now when you go looking for some function, it is easier to find both
versions together when neither is trivial.

There is no code change here - just code movement.

Linux-commit: 93aa2c2a5091bd47819a3ead4af70fb57fda5065

Change-Id: I5250a52cad576eaeec17de176a3ca45ad076c4b9
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-on: https://review.whamcloud.com/32359
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Doug Oucharek <dougso@me.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
libcfs/include/libcfs/libcfs_cpu.h
libcfs/libcfs/Makefile.in
libcfs/libcfs/libcfs_cpu.c
libcfs/libcfs/linux/Makefile.am
libcfs/libcfs/linux/linux-cpu.c [deleted file]

index a05739d..fb268a8 100644 (file)
@@ -76,6 +76,7 @@
 #include <linux/slab.h>
 #include <linux/topology.h>
 #include <linux/version.h>
+#include <linux/vmalloc.h>
 
 #include <libcfs/linux/linux-cpu.h>
 
index b559cbc..8d3a244 100644 (file)
@@ -1,7 +1,7 @@
 MODULES = libcfs
 
 libcfs-linux-objs := linux-tracefile.o linux-debug.o
-libcfs-linux-objs += linux-prim.o linux-cpu.o
+libcfs-linux-objs += linux-prim.o
 libcfs-linux-objs += linux-curproc.o
 libcfs-linux-objs += linux-module.o
 libcfs-linux-objs += linux-crypto.o linux-crypto-adler.o
index efbe4c9..18c4839 100644 (file)
 
 #define DEBUG_SUBSYSTEM S_LNET
 
-#include <libcfs/linux/linux-cpu.h>
+#include <linux/cpu.h>
+#include <linux/sched.h>
+#include <libcfs/libcfs_cpu.h>
 #include <libcfs/libcfs.h>
 
 /** Global CPU partition table */
 struct cfs_cpt_table *cfs_cpt_table __read_mostly;
 EXPORT_SYMBOL(cfs_cpt_table);
 
-#ifndef CONFIG_SMP
+/**
+ * modparam for setting number of partitions
+ *
+ *  0 : estimate best value based on cores or NUMA nodes
+ *  1 : disable multiple partitions
+ * >1 : specify number of partitions
+ */
+static int cpu_npartitions;
+module_param(cpu_npartitions, int, 0444);
+MODULE_PARM_DESC(cpu_npartitions, "# of CPU partitions");
 
-#define CFS_CPT_DISTANCE       1       /* Arbitrary positive value */
+/**
+ * modparam for setting CPU partitions patterns:
+ *
+ * i.e: "0[0,1,2,3] 1[4,5,6,7]", number before bracket is CPU partition ID,
+ *      number in bracket is processor ID (core or HT)
+ *
+ * i.e: "N 0[0,1] 1[2,3]" the first character 'N' means numbers in bracket
+ *       are NUMA node ID, number before bracket is CPU partition ID.
+ *
+ * i.e: "N", shortcut expression to create CPT from NUMA & CPU topology
+ *
+ * NB: If user specified cpu_pattern, cpu_npartitions will be ignored
+ */
+static char *cpu_pattern = "N";
+module_param(cpu_pattern, charp, 0444);
+MODULE_PARM_DESC(cpu_pattern, "CPU partitions pattern");
 
+#ifdef CONFIG_SMP
 struct cfs_cpt_table *cfs_cpt_table_alloc(int ncpt)
 {
        struct cfs_cpt_table *cptab;
-
-       if (ncpt != 1) {
-               CERROR("Can't support cpu partition number %d\n", ncpt);
-               return NULL;
-       }
+       int i;
 
        LIBCFS_ALLOC(cptab, sizeof(*cptab));
        if (!cptab)
                return NULL;
 
-       cpumask_set_cpu(0, cptab->ctb_cpumask);
-       node_set(0, cptab->ctb_nodemask);
+       cptab->ctb_nparts = ncpt;
+
+       LIBCFS_ALLOC(cptab->ctb_cpumask, cpumask_size());
+       if (!cptab->ctb_cpumask)
+               goto failed_alloc_cpumask;
+
+       LIBCFS_ALLOC(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
+       if (!cptab->ctb_nodemask)
+               goto failed_alloc_nodemask;
+
+       LIBCFS_ALLOC(cptab->ctb_cpu2cpt,
+                    nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
+       if (!cptab->ctb_cpu2cpt)
+               goto failed_alloc_cpu2cpt;
+
+       memset(cptab->ctb_cpu2cpt, -1,
+              nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
+
+       LIBCFS_ALLOC(cptab->ctb_node2cpt,
+                    nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
+       if (!cptab->ctb_node2cpt)
+               goto failed_alloc_node2cpt;
+
+       memset(cptab->ctb_node2cpt, -1,
+              nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
+
+       LIBCFS_ALLOC(cptab->ctb_parts, ncpt * sizeof(cptab->ctb_parts[0]));
+       if (!cptab->ctb_parts)
+               goto failed_alloc_ctb_parts;
+
+       memset(cptab->ctb_parts, -1, ncpt * sizeof(cptab->ctb_parts[0]));
+
+       for (i = 0; i < ncpt; i++) {
+               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
+
+               LIBCFS_ALLOC(part->cpt_cpumask, cpumask_size());
+               if (!part->cpt_cpumask)
+                       goto failed_setting_ctb_parts;
+
+               LIBCFS_ALLOC(part->cpt_nodemask, sizeof(*part->cpt_nodemask));
+               if (!part->cpt_nodemask)
+                       goto failed_setting_ctb_parts;
+
+               LIBCFS_ALLOC(part->cpt_distance,
+                            cptab->ctb_nparts * sizeof(part->cpt_distance[0]));
+               if (!part->cpt_distance)
+                       goto failed_setting_ctb_parts;
+
+               memset(part->cpt_distance, -1,
+                      cptab->ctb_nparts * sizeof(part->cpt_distance[0]));
+       }
 
        return cptab;
+
+failed_setting_ctb_parts:
+       while (i-- >= 0) {
+               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
+
+               if (part->cpt_nodemask) {
+                       LIBCFS_FREE(part->cpt_nodemask,
+                                   sizeof(*part->cpt_nodemask));
+               }
+
+               if (part->cpt_cpumask)
+                       LIBCFS_FREE(part->cpt_cpumask, cpumask_size());
+
+               if (part->cpt_distance) {
+                       LIBCFS_FREE(part->cpt_distance,
+                               cptab->ctb_nparts *
+                                       sizeof(part->cpt_distance[0]));
+               }
+       }
+
+       if (cptab->ctb_parts) {
+               LIBCFS_FREE(cptab->ctb_parts,
+                           cptab->ctb_nparts * sizeof(cptab->ctb_parts[0]));
+       }
+failed_alloc_ctb_parts:
+       if (cptab->ctb_node2cpt) {
+               LIBCFS_FREE(cptab->ctb_node2cpt,
+                           nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
+       }
+failed_alloc_node2cpt:
+       if (cptab->ctb_cpu2cpt) {
+               LIBCFS_FREE(cptab->ctb_cpu2cpt,
+                           nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
+       }
+failed_alloc_cpu2cpt:
+       if (cptab->ctb_nodemask)
+               LIBCFS_FREE(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
+failed_alloc_nodemask:
+       if (cptab->ctb_cpumask)
+               LIBCFS_FREE(cptab->ctb_cpumask, cpumask_size());
+failed_alloc_cpumask:
+       LIBCFS_FREE(cptab, sizeof(*cptab));
+       return NULL;
 }
 EXPORT_SYMBOL(cfs_cpt_table_alloc);
 
 void cfs_cpt_table_free(struct cfs_cpt_table *cptab)
 {
+       int i;
+
+       if (cptab->ctb_cpu2cpt) {
+               LIBCFS_FREE(cptab->ctb_cpu2cpt,
+                           nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
+       }
+
+       if (cptab->ctb_node2cpt) {
+               LIBCFS_FREE(cptab->ctb_node2cpt,
+                           nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
+       }
+
+       for (i = 0; cptab->ctb_parts && i < cptab->ctb_nparts; i++) {
+               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
+
+               if (part->cpt_nodemask) {
+                       LIBCFS_FREE(part->cpt_nodemask,
+                                   sizeof(*part->cpt_nodemask));
+               }
+
+               if (part->cpt_cpumask)
+                       LIBCFS_FREE(part->cpt_cpumask, cpumask_size());
+
+               if (part->cpt_distance) {
+                       LIBCFS_FREE(part->cpt_distance,
+                               cptab->ctb_nparts *
+                                       sizeof(part->cpt_distance[0]));
+               }
+       }
+
+       if (cptab->ctb_parts) {
+               LIBCFS_FREE(cptab->ctb_parts,
+                           cptab->ctb_nparts * sizeof(cptab->ctb_parts[0]));
+       }
+
+       if (cptab->ctb_nodemask)
+               LIBCFS_FREE(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
+       if (cptab->ctb_cpumask)
+               LIBCFS_FREE(cptab->ctb_cpumask, cpumask_size());
+
        LIBCFS_FREE(cptab, sizeof(*cptab));
 }
 EXPORT_SYMBOL(cfs_cpt_table_free);
 
 int cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
 {
+       char *tmp = buf;
        int rc;
+       int i;
+       int j;
 
-       rc = snprintf(buf, len, "%d\t: %d\n", 0, 0);
-       len -= rc;
-       if (len <= 0)
-               return -EFBIG;
+       for (i = 0; i < cptab->ctb_nparts; i++) {
+               if (len <= 0)
+                       goto err;
 
-       return rc;
+               rc = snprintf(tmp, len, "%d\t:", i);
+               len -= rc;
+
+               if (len <= 0)
+                       goto err;
+
+               tmp += rc;
+               for_each_cpu(j, cptab->ctb_parts[i].cpt_cpumask) {
+                       rc = snprintf(tmp, len, " %d", j);
+                       len -= rc;
+                       if (len <= 0)
+                               goto err;
+                       tmp += rc;
+               }
+
+               *tmp = '\n';
+               tmp++;
+               len--;
+       }
+
+       return tmp - buf;
+err:
+       return -E2BIG;
 }
 EXPORT_SYMBOL(cfs_cpt_table_print);
 
 int cfs_cpt_distance_print(struct cfs_cpt_table *cptab, char *buf, int len)
 {
+       char *tmp = buf;
        int rc;
+       int i;
+       int j;
 
-       rc = snprintf(buf, len, "0\t: 0:%d\n", CFS_CPT_DISTANCE);
-       len -= rc;
-       if (len <= 0)
-               return -EFBIG;
+       for (i = 0; i < cptab->ctb_nparts; i++) {
+               if (len <= 0)
+                       goto err;
 
-       return rc;
+               rc = snprintf(tmp, len, "%d\t:", i);
+               len -= rc;
+
+               if (len <= 0)
+                       goto err;
+
+               tmp += rc;
+               for (j = 0; j < cptab->ctb_nparts; j++) {
+                       rc = snprintf(tmp, len, " %d:%d", j,
+                                     cptab->ctb_parts[i].cpt_distance[j]);
+                       len -= rc;
+                       if (len <= 0)
+                               goto err;
+                       tmp += rc;
+               }
+
+               *tmp = '\n';
+               tmp++;
+               len--;
+       }
+
+       return tmp - buf;
+err:
+       return -E2BIG;
 }
 EXPORT_SYMBOL(cfs_cpt_distance_print);
 
 int cfs_cpt_number(struct cfs_cpt_table *cptab)
 {
-       return 1;
+       return cptab->ctb_nparts;
 }
 EXPORT_SYMBOL(cfs_cpt_number);
 
 int cfs_cpt_weight(struct cfs_cpt_table *cptab, int cpt)
 {
-       return 1;
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       return cpt == CFS_CPT_ANY ?
+              cpumask_weight(cptab->ctb_cpumask) :
+              cpumask_weight(cptab->ctb_parts[cpt].cpt_cpumask);
 }
 EXPORT_SYMBOL(cfs_cpt_weight);
 
 int cfs_cpt_online(struct cfs_cpt_table *cptab, int cpt)
 {
-       return 1;
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       return cpt == CFS_CPT_ANY ?
+              cpumask_any_and(cptab->ctb_cpumask,
+                              cpu_online_mask) < nr_cpu_ids :
+              cpumask_any_and(cptab->ctb_parts[cpt].cpt_cpumask,
+                              cpu_online_mask) < nr_cpu_ids;
 }
 EXPORT_SYMBOL(cfs_cpt_online);
 
 cpumask_t *cfs_cpt_cpumask(struct cfs_cpt_table *cptab, int cpt)
 {
-       return &cptab->ctb_cpumask;
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       return cpt == CFS_CPT_ANY ?
+              cptab->ctb_cpumask : cptab->ctb_parts[cpt].cpt_cpumask;
 }
 EXPORT_SYMBOL(cfs_cpt_cpumask);
 
 nodemask_t *cfs_cpt_nodemask(struct cfs_cpt_table *cptab, int cpt)
 {
-       return &cptab->ctb_nodemask;
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       return cpt == CFS_CPT_ANY ?
+              cptab->ctb_nodemask : cptab->ctb_parts[cpt].cpt_nodemask;
 }
 EXPORT_SYMBOL(cfs_cpt_nodemask);
 
 unsigned int cfs_cpt_distance(struct cfs_cpt_table *cptab, int cpt1, int cpt2)
 {
-       return CFS_CPT_DISTANCE;
+       LASSERT(cpt1 == CFS_CPT_ANY || (cpt1 >= 0 && cpt1 < cptab->ctb_nparts));
+       LASSERT(cpt2 == CFS_CPT_ANY || (cpt2 >= 0 && cpt2 < cptab->ctb_nparts));
+
+       if (cpt1 == CFS_CPT_ANY || cpt2 == CFS_CPT_ANY)
+               return cptab->ctb_distance;
+
+       return cptab->ctb_parts[cpt1].cpt_distance[cpt2];
 }
 EXPORT_SYMBOL(cfs_cpt_distance);
 
+/*
+ * Calculate the maximum NUMA distance between all nodes in the
+ * from_mask and all nodes in the to_mask.
+ */
+static unsigned int cfs_cpt_distance_calculate(nodemask_t *from_mask,
+                                              nodemask_t *to_mask)
+{
+       unsigned int maximum;
+       unsigned int distance;
+       int from;
+       int to;
+
+       maximum = 0;
+       for_each_node_mask(from, *from_mask) {
+               for_each_node_mask(to, *to_mask) {
+                       distance = node_distance(from, to);
+                       if (maximum < distance)
+                               maximum = distance;
+               }
+       }
+       return maximum;
+}
+
+static void cfs_cpt_add_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
+{
+       cptab->ctb_cpu2cpt[cpu] = cpt;
+
+       cpumask_set_cpu(cpu, cptab->ctb_cpumask);
+       cpumask_set_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask);
+}
+
+static void cfs_cpt_del_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
+{
+       cpumask_clear_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask);
+       cpumask_clear_cpu(cpu, cptab->ctb_cpumask);
+
+       cptab->ctb_cpu2cpt[cpu] = -1;
+}
+
+static void cfs_cpt_add_node(struct cfs_cpt_table *cptab, int cpt, int node)
+{
+       struct cfs_cpu_partition *part;
+
+       if (!node_isset(node, *cptab->ctb_nodemask)) {
+               unsigned int dist;
+
+               /* first time node is added to the CPT table */
+               node_set(node, *cptab->ctb_nodemask);
+               cptab->ctb_node2cpt[node] = cpt;
+
+               dist = cfs_cpt_distance_calculate(cptab->ctb_nodemask,
+                                                 cptab->ctb_nodemask);
+               cptab->ctb_distance = dist;
+       }
+
+       part = &cptab->ctb_parts[cpt];
+       if (!node_isset(node, *part->cpt_nodemask)) {
+               int cpt2;
+
+               /* first time node is added to this CPT */
+               node_set(node, *part->cpt_nodemask);
+               for (cpt2 = 0; cpt2 < cptab->ctb_nparts; cpt2++) {
+                       struct cfs_cpu_partition *part2;
+                       unsigned int dist;
+
+                       part2 = &cptab->ctb_parts[cpt2];
+                       dist = cfs_cpt_distance_calculate(part->cpt_nodemask,
+                                                         part2->cpt_nodemask);
+                       part->cpt_distance[cpt2] = dist;
+                       dist = cfs_cpt_distance_calculate(part2->cpt_nodemask,
+                                                         part->cpt_nodemask);
+                       part2->cpt_distance[cpt] = dist;
+               }
+       }
+}
+
+static void cfs_cpt_del_node(struct cfs_cpt_table *cptab, int cpt, int node)
+{
+       struct cfs_cpu_partition *part = &cptab->ctb_parts[cpt];
+       int cpu;
+
+       for_each_cpu(cpu, part->cpt_cpumask) {
+               /* this CPT has other CPU belonging to this node? */
+               if (cpu_to_node(cpu) == node)
+                       break;
+       }
+
+       if (cpu >= nr_cpu_ids && node_isset(node,  *part->cpt_nodemask)) {
+               int cpt2;
+
+               /* No more CPUs in the node for this CPT. */
+               node_clear(node, *part->cpt_nodemask);
+               for (cpt2 = 0; cpt2 < cptab->ctb_nparts; cpt2++) {
+                       struct cfs_cpu_partition *part2;
+                       unsigned int dist;
+
+                       part2 = &cptab->ctb_parts[cpt2];
+                       if (node_isset(node, *part2->cpt_nodemask))
+                               cptab->ctb_node2cpt[node] = cpt2;
+
+                       dist = cfs_cpt_distance_calculate(part->cpt_nodemask,
+                                                         part2->cpt_nodemask);
+                       part->cpt_distance[cpt2] = dist;
+                       dist = cfs_cpt_distance_calculate(part2->cpt_nodemask,
+                                                         part->cpt_nodemask);
+                       part2->cpt_distance[cpt] = dist;
+               }
+       }
+
+       for_each_cpu(cpu, cptab->ctb_cpumask) {
+               /* this CPT-table has other CPUs belonging to this node? */
+               if (cpu_to_node(cpu) == node)
+                       break;
+       }
+
+       if (cpu >= nr_cpu_ids && node_isset(node, *cptab->ctb_nodemask)) {
+               /* No more CPUs in the table for this node. */
+               node_clear(node, *cptab->ctb_nodemask);
+               cptab->ctb_node2cpt[node] = -1;
+               cptab->ctb_distance =
+                       cfs_cpt_distance_calculate(cptab->ctb_nodemask,
+                                                  cptab->ctb_nodemask);
+       }
+}
+
 int cfs_cpt_set_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
 {
+       LASSERT(cpt >= 0 && cpt < cptab->ctb_nparts);
+
+       if (cpu < 0 || cpu >= nr_cpu_ids || !cpu_online(cpu)) {
+               CDEBUG(D_INFO, "CPU %d is invalid or it's offline\n", cpu);
+               return 0;
+       }
+
+       if (cptab->ctb_cpu2cpt[cpu] != -1) {
+               CDEBUG(D_INFO, "CPU %d is already in partition %d\n",
+                      cpu, cptab->ctb_cpu2cpt[cpu]);
+               return 0;
+       }
+
+       if (cpumask_test_cpu(cpu, cptab->ctb_cpumask)) {
+               CDEBUG(D_INFO, "CPU %d is already in cpumask\n", cpu);
+               return 0;
+       }
+
+       if (cpumask_test_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask)) {
+               CDEBUG(D_INFO, "CPU %d is already in partition %d cpumask\n",
+                      cpu, cptab->ctb_cpu2cpt[cpu]);
+               return 0;
+       }
+
+       cfs_cpt_add_cpu(cptab, cpt, cpu);
+       cfs_cpt_add_node(cptab, cpt, cpu_to_node(cpu));
+
        return 1;
 }
 EXPORT_SYMBOL(cfs_cpt_set_cpu);
 
 void cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
 {
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       if (cpu < 0 || cpu >= nr_cpu_ids) {
+               CDEBUG(D_INFO, "Invalid CPU id %d\n", cpu);
+               return;
+       }
+
+       if (cpt == CFS_CPT_ANY) {
+               /* caller doesn't know the partition ID */
+               cpt = cptab->ctb_cpu2cpt[cpu];
+               if (cpt < 0) { /* not set in this CPT-table */
+                       CDEBUG(D_INFO,
+                              "Try to unset cpu %d which is not in CPT-table %p\n",
+                              cpt, cptab);
+                       return;
+               }
+
+       } else if (cpt != cptab->ctb_cpu2cpt[cpu]) {
+               CDEBUG(D_INFO,
+                      "CPU %d is not in CPU partition %d\n", cpu, cpt);
+               return;
+       }
+
+       LASSERT(cpumask_test_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask));
+       LASSERT(cpumask_test_cpu(cpu, cptab->ctb_cpumask));
+
+       cfs_cpt_del_cpu(cptab, cpt, cpu);
+       cfs_cpt_del_node(cptab, cpt, cpu_to_node(cpu));
 }
 EXPORT_SYMBOL(cfs_cpt_unset_cpu);
 
 int cfs_cpt_set_cpumask(struct cfs_cpt_table *cptab, int cpt,
                        const cpumask_t *mask)
 {
+       int cpu;
+
+       if (!cpumask_weight(mask) ||
+           cpumask_any_and(mask, cpu_online_mask) >= nr_cpu_ids) {
+               CDEBUG(D_INFO,
+                      "No online CPU is found in the CPU mask for CPU partition %d\n",
+                      cpt);
+               return 0;
+       }
+
+       for_each_cpu(cpu, mask) {
+               cfs_cpt_add_cpu(cptab, cpt, cpu);
+               cfs_cpt_add_node(cptab, cpt, cpu_to_node(cpu));
+       }
+
        return 1;
 }
 EXPORT_SYMBOL(cfs_cpt_set_cpumask);
@@ -150,23 +571,65 @@ EXPORT_SYMBOL(cfs_cpt_set_cpumask);
 void cfs_cpt_unset_cpumask(struct cfs_cpt_table *cptab, int cpt,
                           const cpumask_t *mask)
 {
+       int cpu;
+
+       for_each_cpu(cpu, mask) {
+               cfs_cpt_del_cpu(cptab, cpt, cpu);
+               cfs_cpt_del_node(cptab, cpt, cpu_to_node(cpu));
+       }
 }
 EXPORT_SYMBOL(cfs_cpt_unset_cpumask);
 
 int cfs_cpt_set_node(struct cfs_cpt_table *cptab, int cpt, int node)
 {
+       const cpumask_t *mask;
+       int cpu;
+
+       if (node < 0 || node >= nr_node_ids) {
+               CDEBUG(D_INFO,
+                      "Invalid NUMA id %d for CPU partition %d\n", node, cpt);
+               return 0;
+       }
+
+       mask = cpumask_of_node(node);
+
+       for_each_cpu(cpu, mask)
+               cfs_cpt_add_cpu(cptab, cpt, cpu);
+
+       cfs_cpt_add_node(cptab, cpt, node);
+
        return 1;
 }
 EXPORT_SYMBOL(cfs_cpt_set_node);
 
 void cfs_cpt_unset_node(struct cfs_cpt_table *cptab, int cpt, int node)
 {
+       const cpumask_t *mask;
+       int cpu;
+
+       if (node < 0 || node >= nr_node_ids) {
+               CDEBUG(D_INFO,
+                      "Invalid NUMA id %d for CPU partition %d\n", node, cpt);
+               return;
+       }
+
+       mask = cpumask_of_node(node);
+
+       for_each_cpu(cpu, mask)
+               cfs_cpt_del_cpu(cptab, cpt, cpu);
+
+       cfs_cpt_del_node(cptab, cpt, node);
 }
 EXPORT_SYMBOL(cfs_cpt_unset_node);
 
 int cfs_cpt_set_nodemask(struct cfs_cpt_table *cptab, int cpt,
                         const nodemask_t *mask)
 {
+       int node;
+
+       for_each_node_mask(node, *mask)
+               cfs_cpt_set_node(cptab, cpt, node);
+
        return 1;
 }
 EXPORT_SYMBOL(cfs_cpt_set_nodemask);
@@ -174,39 +637,663 @@ EXPORT_SYMBOL(cfs_cpt_set_nodemask);
 void cfs_cpt_unset_nodemask(struct cfs_cpt_table *cptab, int cpt,
                            const nodemask_t *mask)
 {
+       int node;
+
+       for_each_node_mask(node, *mask)
+               cfs_cpt_unset_node(cptab, cpt, node);
 }
 EXPORT_SYMBOL(cfs_cpt_unset_nodemask);
 
 int cfs_cpt_spread_node(struct cfs_cpt_table *cptab, int cpt)
 {
-       return 0;
+       nodemask_t *mask;
+       int weight;
+       int rotor;
+       int node = 0;
+
+       /* convert CPU partition ID to HW node id */
+
+       if (cpt < 0 || cpt >= cptab->ctb_nparts) {
+               mask = cptab->ctb_nodemask;
+               rotor = cptab->ctb_spread_rotor++;
+       } else {
+               mask = cptab->ctb_parts[cpt].cpt_nodemask;
+               rotor = cptab->ctb_parts[cpt].cpt_spread_rotor++;
+               node  = cptab->ctb_parts[cpt].cpt_node;
+       }
+
+       weight = nodes_weight(*mask);
+       if (weight > 0) {
+               rotor %= weight;
+
+               for_each_node_mask(node, *mask) {
+                       if (!rotor--)
+                               return node;
+               }
+       }
+
+       return node;
 }
 EXPORT_SYMBOL(cfs_cpt_spread_node);
 
 int cfs_cpt_current(struct cfs_cpt_table *cptab, int remap)
 {
-       return 0;
+       int cpu = smp_processor_id();
+       int cpt = cptab->ctb_cpu2cpt[cpu];
+
+       if (cpt < 0) {
+               if (!remap)
+                       return cpt;
+
+               /* don't return negative value for safety of upper layer,
+                * instead we shadow the unknown cpu to a valid partition ID
+                */
+               cpt = cpu % cptab->ctb_nparts;
+       }
+
+       return cpt;
 }
 EXPORT_SYMBOL(cfs_cpt_current);
 
 int cfs_cpt_of_cpu(struct cfs_cpt_table *cptab, int cpu)
 {
-       return 0;
+       LASSERT(cpu >= 0 && cpu < nr_cpu_ids);
+
+       return cptab->ctb_cpu2cpt[cpu];
 }
 EXPORT_SYMBOL(cfs_cpt_of_cpu);
 
 int cfs_cpt_of_node(struct cfs_cpt_table *cptab, int node)
 {
-       return 0;
+       if (node < 0 || node > nr_node_ids)
+               return CFS_CPT_ANY;
+
+       return cptab->ctb_node2cpt[node];
 }
 EXPORT_SYMBOL(cfs_cpt_of_node);
 
 int cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
 {
+       nodemask_t *nodemask;
+       cpumask_t *cpumask;
+       int cpu;
+       int rc;
+
+       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
+
+       if (cpt == CFS_CPT_ANY) {
+               cpumask = cptab->ctb_cpumask;
+               nodemask = cptab->ctb_nodemask;
+       } else {
+               cpumask = cptab->ctb_parts[cpt].cpt_cpumask;
+               nodemask = cptab->ctb_parts[cpt].cpt_nodemask;
+       }
+
+       if (!cpumask_intersects(cpumask, cpu_online_mask)) {
+               CDEBUG(D_INFO,
+                      "No online CPU found in CPU partition %d, did someone do CPU hotplug on system? You might need to reload Lustre modules to keep system working well.\n",
+                       cpt);
+               return -ENODEV;
+       }
+
+       for_each_online_cpu(cpu) {
+               if (cpumask_test_cpu(cpu, cpumask))
+                       continue;
+
+               rc = set_cpus_allowed_ptr(current, cpumask);
+               set_mems_allowed(*nodemask);
+               if (!rc)
+                       schedule(); /* switch to allowed CPU */
+
+               return rc;
+       }
+
+       /* don't need to set affinity because all online CPUs are covered */
        return 0;
 }
 EXPORT_SYMBOL(cfs_cpt_bind);
 
+/**
+ * Choose max to \a number CPUs from \a node and set them in \a cpt.
+ * We always prefer to choose CPU in the same core/socket.
+ */
+static int cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
+                               cpumask_t *node_mask, int number)
+{
+       cpumask_t *socket_mask = NULL;
+       cpumask_t *core_mask = NULL;
+       int rc = 0;
+       int cpu;
+       int i;
+
+       LASSERT(number > 0);
+
+       if (number >= cpumask_weight(node_mask)) {
+               while (!cpumask_empty(node_mask)) {
+                       cpu = cpumask_first(node_mask);
+                       cpumask_clear_cpu(cpu, node_mask);
+
+                       if (!cpu_online(cpu))
+                               continue;
+
+                       rc = cfs_cpt_set_cpu(cptab, cpt, cpu);
+                       if (!rc)
+                               return -EINVAL;
+               }
+               return 0;
+       }
+
+       /* allocate scratch buffer */
+       LIBCFS_ALLOC(socket_mask, cpumask_size());
+       LIBCFS_ALLOC(core_mask, cpumask_size());
+       if (!socket_mask || !core_mask) {
+               rc = -ENOMEM;
+               goto out;
+       }
+
+       while (!cpumask_empty(node_mask)) {
+               cpu = cpumask_first(node_mask);
+
+               /* get cpumask for cores in the same socket */
+               cpumask_and(socket_mask, topology_core_cpumask(cpu), node_mask);
+               while (!cpumask_empty(socket_mask)) {
+                       /* get cpumask for hts in the same core */
+                       cpumask_and(core_mask, topology_sibling_cpumask(cpu),
+                                   node_mask);
+
+                       for_each_cpu(i, core_mask) {
+                               cpumask_clear_cpu(i, socket_mask);
+                               cpumask_clear_cpu(i, node_mask);
+
+                               if (!cpu_online(i))
+                                       continue;
+
+                               rc = cfs_cpt_set_cpu(cptab, cpt, i);
+                               if (!rc) {
+                                       rc = -EINVAL;
+                                       goto out;
+                               }
+
+                               if (!--number)
+                                       goto out;
+                       }
+                       cpu = cpumask_first(socket_mask);
+               }
+       }
+
+out:
+       if (core_mask)
+               LIBCFS_FREE(core_mask, cpumask_size());
+       if (socket_mask)
+               LIBCFS_FREE(socket_mask, cpumask_size());
+       return rc;
+}
+
+#define CPT_WEIGHT_MIN 4
+
+static int cfs_cpt_num_estimate(void)
+{
+       int nthr = cpumask_weight(topology_sibling_cpumask(smp_processor_id()));
+       int ncpu = num_online_cpus();
+       int ncpt = 1;
+
+       if (ncpu > CPT_WEIGHT_MIN)
+               for (ncpt = 2; ncpu > 2 * nthr * ncpt; ncpt++)
+                       ; /* nothing */
+
+#if (BITS_PER_LONG == 32)
+       /* config many CPU partitions on 32-bit system could consume
+        * too much memory
+        */
+       ncpt = min(2, ncpt);
+#endif
+       while (ncpu % ncpt)
+               ncpt--; /* worst case is 1 */
+
+       return ncpt;
+}
+
+static struct cfs_cpt_table *cfs_cpt_table_create(int ncpt)
+{
+       struct cfs_cpt_table *cptab = NULL;
+       cpumask_t *node_mask = NULL;
+       int cpt = 0;
+       int node;
+       int num;
+       int rem;
+       int rc = 0;
+
+       num = cfs_cpt_num_estimate();
+       if (ncpt <= 0)
+               ncpt = num;
+
+       if (ncpt > num_online_cpus() || 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);
+       }
+
+       cptab = cfs_cpt_table_alloc(ncpt);
+       if (!cptab) {
+               CERROR("Failed to allocate CPU map(%d)\n", ncpt);
+               rc = -ENOMEM;
+               goto failed;
+       }
+
+       LIBCFS_ALLOC(node_mask, cpumask_size());
+       if (!node_mask) {
+               CERROR("Failed to allocate scratch cpumask\n");
+               rc = -ENOMEM;
+               goto failed;
+       }
+
+       num = num_online_cpus() / ncpt;
+       rem = num_online_cpus() % ncpt;
+       for_each_online_node(node) {
+               cpumask_copy(node_mask, cpumask_of_node(node));
+
+               while (cpt < ncpt && !cpumask_empty(node_mask)) {
+                       struct cfs_cpu_partition *part = &cptab->ctb_parts[cpt];
+                       int ncpu = cpumask_weight(part->cpt_cpumask);
+
+                       rc = cfs_cpt_choose_ncpus(cptab, cpt, node_mask,
+                                                 num - ncpu);
+                       if (rc < 0) {
+                               rc = -EINVAL;
+                               goto failed_mask;
+                       }
+
+                       ncpu = cpumask_weight(part->cpt_cpumask);
+                       if (ncpu == num + !!(rem > 0)) {
+                               cpt++;
+                               rem--;
+                       }
+               }
+       }
+
+       LIBCFS_FREE(node_mask, cpumask_size());
+
+       return cptab;
+
+failed_mask:
+       if (node_mask)
+               LIBCFS_FREE(node_mask, cpumask_size());
+failed:
+       CERROR("Failed (rc = %d) to setup CPU partition table with %d partitions, online HW NUMA nodes: %d, HW CPU cores: %d.\n",
+              rc, ncpt, num_online_nodes(), num_online_cpus());
+
+       if (cptab)
+               cfs_cpt_table_free(cptab);
+
+       return ERR_PTR(rc);
+}
+
+static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
+{
+       struct cfs_cpt_table *cptab;
+       char *pattern_dup;
+       char *bracket;
+       char *str;
+       int node = 0;
+       int ncpt = 0;
+       int cpt = 0;
+       int high;
+       int rc;
+       int c;
+       int i;
+
+       pattern_dup = kstrdup(pattern, GFP_KERNEL);
+       if (!pattern_dup) {
+               CERROR("Failed to duplicate pattern '%s'\n", pattern);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       str = cfs_trimwhite(pattern_dup);
+       if (*str == 'n' || *str == 'N') {
+               str++; /* skip 'N' char */
+               node = 1; /* NUMA pattern */
+               if (*str == '\0') {
+                       node = -1;
+                       for_each_online_node(i) {
+                               if (!cpumask_empty(cpumask_of_node(i)))
+                                       ncpt++;
+                       }
+                       if (ncpt == 1) { /* single NUMA node */
+                               kfree(pattern_dup);
+                               return cfs_cpt_table_create(cpu_npartitions);
+                       }
+               }
+       }
+
+       if (!ncpt) { /* scanning bracket which is mark of partition */
+               bracket = str;
+               while ((bracket = strchr(bracket, '['))) {
+                       bracket++;
+                       ncpt++;
+               }
+       }
+
+       if (!ncpt ||
+           (node && ncpt > num_online_nodes()) ||
+           (!node && ncpt > num_online_cpus())) {
+               CERROR("Invalid pattern '%s', or too many partitions %d\n",
+                      pattern_dup, ncpt);
+               rc = -EINVAL;
+               goto err_free_str;
+       }
+
+       cptab = cfs_cpt_table_alloc(ncpt);
+       if (!cptab) {
+               CERROR("Failed to allocate CPU partition table\n");
+               rc = -ENOMEM;
+               goto err_free_str;
+       }
+
+       if (node < 0) { /* shortcut to create CPT from NUMA & CPU topology */
+               for_each_online_node(i) {
+                       if (cpumask_empty(cpumask_of_node(i)))
+                               continue;
+
+                       rc = cfs_cpt_set_node(cptab, cpt++, i);
+                       if (!rc) {
+                               rc = -EINVAL;
+                               goto err_free_table;
+                       }
+               }
+               kfree(pattern_dup);
+               return cptab;
+       }
+
+       high = node ? nr_node_ids - 1 : nr_cpu_ids - 1;
+
+       for (str = cfs_trimwhite(str), c = 0; /* until break */; c++) {
+               struct cfs_range_expr *range;
+               struct cfs_expr_list *el;
+               int n;
+
+               bracket = strchr(str, '[');
+               if (!bracket) {
+                       if (*str) {
+                               CERROR("Invalid pattern '%s'\n", str);
+                               rc = -EINVAL;
+                               goto err_free_table;
+                       } else if (c != ncpt) {
+                               CERROR("Expect %d partitions but found %d\n",
+                                      ncpt, c);
+                               rc = -EINVAL;
+                               goto err_free_table;
+                       }
+                       break;
+               }
+
+               if (sscanf(str, "%d%n", &cpt, &n) < 1) {
+                       CERROR("Invalid CPU pattern '%s'\n", str);
+                       rc = -EINVAL;
+                       goto err_free_table;
+               }
+
+               if (cpt < 0 || cpt >= ncpt) {
+                       CERROR("Invalid partition id %d, total partitions %d\n",
+                              cpt, ncpt);
+                       rc = -EINVAL;
+                       goto err_free_table;
+               }
+
+               if (cfs_cpt_weight(cptab, cpt)) {
+                       CERROR("Partition %d has already been set.\n", cpt);
+                       rc = -EPERM;
+                       goto err_free_table;
+               }
+
+               str = cfs_trimwhite(str + n);
+               if (str != bracket) {
+                       CERROR("Invalid pattern '%s'\n", str);
+                       rc = -EINVAL;
+                       goto err_free_table;
+               }
+
+               bracket = strchr(str, ']');
+               if (!bracket) {
+                       CERROR("Missing right bracket for partition %d in '%s'\n",
+                              cpt, str);
+                       rc = -EINVAL;
+                       goto err_free_table;
+               }
+
+               rc = cfs_expr_list_parse(str, (bracket - str) + 1, 0, high,
+                                        &el);
+               if (rc) {
+                       CERROR("Can't parse number range in '%s'\n", str);
+                       rc = -ERANGE;
+                       goto err_free_table;
+               }
+
+               list_for_each_entry(range, &el->el_exprs, re_link) {
+                       for (i = range->re_lo; i <= range->re_hi; i++) {
+                               if ((i - range->re_lo) % range->re_stride)
+                                       continue;
+
+                               rc = node ? cfs_cpt_set_node(cptab, cpt, i)
+                                         : cfs_cpt_set_cpu(cptab, cpt, i);
+                               if (!rc) {
+                                       cfs_expr_list_free(el);
+                                       rc = -EINVAL;
+                                       goto err_free_table;
+                               }
+                       }
+               }
+
+               cfs_expr_list_free(el);
+
+               if (!cfs_cpt_online(cptab, cpt)) {
+                       CERROR("No online CPU is found on partition %d\n", cpt);
+                       rc = -ENODEV;
+                       goto err_free_table;
+               }
+
+               str = cfs_trimwhite(bracket + 1);
+       }
+
+       kfree(pattern_dup);
+       return cptab;
+
+err_free_table:
+       cfs_cpt_table_free(cptab);
+err_free_str:
+       kfree(pattern_dup);
+       return ERR_PTR(rc);
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+#ifdef HAVE_HOTPLUG_STATE_MACHINE
+static enum cpuhp_state lustre_cpu_online;
+
+static int cfs_cpu_online(unsigned int cpu)
+{
+       return 0;
+}
+#endif
+
+static int cfs_cpu_dead(unsigned int cpu)
+{
+       bool warn;
+
+       /* if all HTs in a core are offline, it may break affinity */
+       warn = cpumask_any_and(topology_sibling_cpumask(cpu),
+                              cpu_online_mask) >= nr_cpu_ids;
+       CDEBUG(warn ? D_WARNING : D_INFO,
+              "Lustre: can't support CPU plug-out well now, performance and stability could be impacted [CPU %u]\n",
+              cpu);
+       return 0;
+}
+
+#ifndef HAVE_HOTPLUG_STATE_MACHINE
+static int cfs_cpu_notify(struct notifier_block *self, unsigned long action,
+                         void *hcpu)
+{
+       int cpu = (unsigned long)hcpu;
+
+       switch (action) {
+       case CPU_DEAD:
+       case CPU_DEAD_FROZEN:
+       case CPU_ONLINE:
+       case CPU_ONLINE_FROZEN:
+       default:
+               if (action != CPU_DEAD && action != CPU_DEAD_FROZEN) {
+                       CDEBUG(D_INFO, "CPU changed [cpu %u action %lx]\n",
+                              cpu, action);
+                       break;
+               }
+
+               cfs_cpu_dead(cpu);
+       }
+
+       return NOTIFY_OK;
+}
+
+static struct notifier_block cfs_cpu_notifier = {
+       .notifier_call  = cfs_cpu_notify,
+       .priority       = 0
+};
+#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
+#endif /* CONFIG_HOTPLUG_CPU */
+
+void cfs_cpu_fini(void)
+{
+       if (!IS_ERR_OR_NULL(cfs_cpt_table))
+               cfs_cpt_table_free(cfs_cpt_table);
+
+#ifdef CONFIG_HOTPLUG_CPU
+#ifdef HAVE_HOTPLUG_STATE_MACHINE
+       if (lustre_cpu_online > 0)
+               cpuhp_remove_state_nocalls(lustre_cpu_online);
+       cpuhp_remove_state_nocalls(CPUHP_LUSTRE_CFS_DEAD);
+#else
+       unregister_hotcpu_notifier(&cfs_cpu_notifier);
+#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
+#endif /* CONFIG_HOTPLUG_CPU */
+}
+
+int cfs_cpu_init(void)
+{
+       int ret;
+
+       LASSERT(!cfs_cpt_table);
+
+#ifdef CONFIG_HOTPLUG_CPU
+#ifdef HAVE_HOTPLUG_STATE_MACHINE
+       ret = cpuhp_setup_state_nocalls(CPUHP_LUSTRE_CFS_DEAD,
+                                       "fs/lustre/cfe:dead", NULL,
+                                       cfs_cpu_dead);
+       if (ret < 0)
+               goto failed_cpu_dead;
+
+       ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+                                       "fs/lustre/cfe:online",
+                                       cfs_cpu_online, NULL);
+       if (ret < 0)
+               goto failed_cpu_online;
+
+       lustre_cpu_online = ret;
+#else
+       register_hotcpu_notifier(&cfs_cpu_notifier);
+#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
+#endif /* CONFIG_HOTPLUG_CPU */
+
+       get_online_cpus();
+       if (*cpu_pattern) {
+               cfs_cpt_table = cfs_cpt_table_create_pattern(cpu_pattern);
+               if (IS_ERR(cfs_cpt_table)) {
+                       CERROR("Failed to create cptab from pattern '%s'\n",
+                              cpu_pattern);
+                       ret = PTR_ERR(cfs_cpt_table);
+                       goto failed_alloc_table;
+               }
+
+       } else {
+               cfs_cpt_table = cfs_cpt_table_create(cpu_npartitions);
+               if (IS_ERR(cfs_cpt_table)) {
+                       CERROR("Failed to create cptab with npartitions %d\n",
+                              cpu_npartitions);
+                       ret = PTR_ERR(cfs_cpt_table);
+                       goto failed_alloc_table;
+               }
+       }
+
+       put_online_cpus();
+
+       LCONSOLE(0, "HW NUMA nodes: %d, HW CPU cores: %d, npartitions: %d\n",
+                num_online_nodes(), num_online_cpus(),
+                cfs_cpt_number(cfs_cpt_table));
+       return 0;
+
+failed_alloc_table:
+       put_online_cpus();
+
+       if (cfs_cpt_table)
+               cfs_cpt_table_free(cfs_cpt_table);
+
+#ifdef CONFIG_HOTPLUG_CPU
+#ifdef HAVE_HOTPLUG_STATE_MACHINE
+       if (lustre_cpu_online > 0)
+               cpuhp_remove_state_nocalls(lustre_cpu_online);
+failed_cpu_online:
+       cpuhp_remove_state_nocalls(CPUHP_LUSTRE_CFS_DEAD);
+failed_cpu_dead:
+#else
+       unregister_hotcpu_notifier(&cfs_cpu_notifier);
+#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
+#endif /* CONFIG_HOTPLUG_CPU */
+       return ret;
+}
+
+#else /* ! CONFIG_SMP */
+
+struct cfs_cpt_table *cfs_cpt_table_alloc(int ncpt)
+{
+       struct cfs_cpt_table *cptab;
+
+       if (ncpt != 1) {
+               CERROR("Can't support cpu partition number %d\n", ncpt);
+               return NULL;
+       }
+
+       LIBCFS_ALLOC(cptab, sizeof(*cptab));
+       if (!cptab)
+               return NULL;
+
+       cpumask_set_cpu(0, cptab->ctb_cpumask);
+       node_set(0, cptab->ctb_nodemask);
+
+       return cptab;
+}
+EXPORT_SYMBOL(cfs_cpt_table_alloc);
+
+int cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
+{
+       int rc;
+
+       rc = snprintf(buf, len, "0\t: 0\n");
+       len -= rc;
+       if (len <= 0)
+               return -EFBIG;
+
+       return rc;
+}
+EXPORT_SYMBOL(cfs_cpt_table_print);
+
+int cfs_cpt_distance_print(struct cfs_cpt_table *cptab, char *buf, int len)
+{
+       int rc;
+
+       rc = snprintf(buf, len, "0\t: 0:1\n");
+       len -= rc;
+       if (len <= 0)
+               return -EFBIG;
+
+       return rc;
+}
+EXPORT_SYMBOL(cfs_cpt_distance_print);
+
 void cfs_cpu_fini(void)
 {
        if (cfs_cpt_table) {
index 3e038a2..72a242c 100644 (file)
@@ -1,5 +1,5 @@
 EXTRA_DIST = linux-debug.c linux-prim.c linux-tracefile.c      \
-       linux-curproc.c linux-module.c linux-cpu.c              \
+       linux-curproc.c linux-module.c                          \
        linux-crypto.c linux-crypto-crc32.c linux-crypto-adler.c\
        linux-crypto-crc32pclmul.c linux-crypto-crc32c-pclmul.c \
        crc32-pclmul_asm.S crc32c-pcl-intel-asm_64.S inst.h
diff --git a/libcfs/libcfs/linux/linux-cpu.c b/libcfs/libcfs/linux/linux-cpu.c
deleted file mode 100644 (file)
index 2c6628d..0000000
+++ /dev/null
@@ -1,1242 +0,0 @@
-/*
- * GPL HEADER START
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * GPL HEADER END
- */
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- *
- * Copyright (c) 2012, 2017, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- *
- * Author: liang@whamcloud.com
- */
-
-#define DEBUG_SUBSYSTEM S_LNET
-
-#include <linux/cpu.h>
-#include <linux/sched.h>
-#include <libcfs/libcfs.h>
-
-#ifdef CONFIG_SMP
-
-/**
- * modparam for setting number of partitions
- *
- *  0 : estimate best value based on cores or NUMA nodes
- *  1 : disable multiple partitions
- * >1 : specify number of partitions
- */
-static int cpu_npartitions;
-module_param(cpu_npartitions, int, 0444);
-MODULE_PARM_DESC(cpu_npartitions, "# of CPU partitions");
-
-/**
- * modparam for setting CPU partitions patterns:
- *
- * i.e: "0[0,1,2,3] 1[4,5,6,7]", number before bracket is CPU partition ID,
- *      number in bracket is processor ID (core or HT)
- *
- * i.e: "N 0[0,1] 1[2,3]" the first character 'N' means numbers in bracket
- *       are NUMA node ID, number before bracket is CPU partition ID.
- *
- * i.e: "N", shortcut expression to create CPT from NUMA & CPU topology
- *
- * NB: If user specified cpu_pattern, cpu_npartitions will be ignored
- */
-static char *cpu_pattern = "N";
-module_param(cpu_pattern, charp, 0444);
-MODULE_PARM_DESC(cpu_pattern, "CPU partitions pattern");
-
-void cfs_cpt_table_free(struct cfs_cpt_table *cptab)
-{
-       int i;
-
-       if (cptab->ctb_cpu2cpt) {
-               LIBCFS_FREE(cptab->ctb_cpu2cpt,
-                           nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
-       }
-
-       if (cptab->ctb_node2cpt) {
-               LIBCFS_FREE(cptab->ctb_node2cpt,
-                           nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
-       }
-
-       for (i = 0; cptab->ctb_parts && i < cptab->ctb_nparts; i++) {
-               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
-
-               if (part->cpt_nodemask) {
-                       LIBCFS_FREE(part->cpt_nodemask,
-                                   sizeof(*part->cpt_nodemask));
-               }
-
-               if (part->cpt_cpumask)
-                       LIBCFS_FREE(part->cpt_cpumask, cpumask_size());
-
-               if (part->cpt_distance) {
-                       LIBCFS_FREE(part->cpt_distance,
-                               cptab->ctb_nparts *
-                                       sizeof(part->cpt_distance[0]));
-               }
-       }
-
-       if (cptab->ctb_parts) {
-               LIBCFS_FREE(cptab->ctb_parts,
-                           cptab->ctb_nparts * sizeof(cptab->ctb_parts[0]));
-       }
-
-       if (cptab->ctb_nodemask)
-               LIBCFS_FREE(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
-       if (cptab->ctb_cpumask)
-               LIBCFS_FREE(cptab->ctb_cpumask, cpumask_size());
-
-       LIBCFS_FREE(cptab, sizeof(*cptab));
-}
-EXPORT_SYMBOL(cfs_cpt_table_free);
-
-struct cfs_cpt_table *cfs_cpt_table_alloc(int ncpt)
-{
-       struct cfs_cpt_table *cptab;
-       int i;
-
-       LIBCFS_ALLOC(cptab, sizeof(*cptab));
-       if (!cptab)
-               return NULL;
-
-       cptab->ctb_nparts = ncpt;
-
-       LIBCFS_ALLOC(cptab->ctb_cpumask, cpumask_size());
-       if (!cptab->ctb_cpumask)
-               goto failed_alloc_cpumask;
-
-       LIBCFS_ALLOC(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
-       if (!cptab->ctb_nodemask)
-               goto failed_alloc_nodemask;
-
-       LIBCFS_ALLOC(cptab->ctb_cpu2cpt,
-                    nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
-       if (!cptab->ctb_cpu2cpt)
-               goto failed_alloc_cpu2cpt;
-
-       memset(cptab->ctb_cpu2cpt, -1,
-              nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
-
-       LIBCFS_ALLOC(cptab->ctb_node2cpt,
-                    nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
-       if (!cptab->ctb_node2cpt)
-               goto failed_alloc_node2cpt;
-
-       memset(cptab->ctb_node2cpt, -1,
-              nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
-
-       LIBCFS_ALLOC(cptab->ctb_parts, ncpt * sizeof(cptab->ctb_parts[0]));
-       if (!cptab->ctb_parts)
-               goto failed_alloc_ctb_parts;
-
-       for (i = 0; i < ncpt; i++) {
-               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
-
-               LIBCFS_ALLOC(part->cpt_cpumask, cpumask_size());
-               if (!part->cpt_cpumask)
-                       goto failed_setting_ctb_parts;
-
-               LIBCFS_ALLOC(part->cpt_nodemask, sizeof(*part->cpt_nodemask));
-               if (!part->cpt_nodemask)
-                       goto failed_setting_ctb_parts;
-
-               LIBCFS_ALLOC(part->cpt_distance,
-                            cptab->ctb_nparts * sizeof(part->cpt_distance[0]));
-               if (!part->cpt_distance)
-                       goto failed_setting_ctb_parts;
-       }
-
-       return cptab;
-
-failed_setting_ctb_parts:
-       while (i-- >= 0) {
-               struct cfs_cpu_partition *part = &cptab->ctb_parts[i];
-
-               if (part->cpt_nodemask) {
-                       LIBCFS_FREE(part->cpt_nodemask,
-                                   sizeof(*part->cpt_nodemask));
-               }
-
-               if (part->cpt_cpumask)
-                       LIBCFS_FREE(part->cpt_cpumask, cpumask_size());
-
-               if (part->cpt_distance) {
-                       LIBCFS_FREE(part->cpt_distance,
-                               cptab->ctb_nparts *
-                                       sizeof(part->cpt_distance[0]));
-               }
-       }
-
-       if (cptab->ctb_parts) {
-               LIBCFS_FREE(cptab->ctb_parts,
-                           cptab->ctb_nparts * sizeof(cptab->ctb_parts[0]));
-       }
-failed_alloc_ctb_parts:
-       if (cptab->ctb_node2cpt) {
-               LIBCFS_FREE(cptab->ctb_node2cpt,
-                           nr_node_ids * sizeof(cptab->ctb_node2cpt[0]));
-       }
-failed_alloc_node2cpt:
-       if (cptab->ctb_cpu2cpt) {
-               LIBCFS_FREE(cptab->ctb_cpu2cpt,
-                           nr_cpu_ids * sizeof(cptab->ctb_cpu2cpt[0]));
-       }
-failed_alloc_cpu2cpt:
-       if (cptab->ctb_nodemask)
-               LIBCFS_FREE(cptab->ctb_nodemask, sizeof(*cptab->ctb_nodemask));
-failed_alloc_nodemask:
-       if (cptab->ctb_cpumask)
-               LIBCFS_FREE(cptab->ctb_cpumask, cpumask_size());
-failed_alloc_cpumask:
-       LIBCFS_FREE(cptab, sizeof(*cptab));
-       return NULL;
-}
-EXPORT_SYMBOL(cfs_cpt_table_alloc);
-
-int cfs_cpt_table_print(struct cfs_cpt_table *cptab, char *buf, int len)
-{
-       char *tmp = buf;
-       int rc;
-       int i;
-       int j;
-
-       for (i = 0; i < cptab->ctb_nparts; i++) {
-               if (len <= 0)
-                       goto err;
-
-               rc = snprintf(tmp, len, "%d\t:", i);
-               len -= rc;
-
-               if (len <= 0)
-                       goto err;
-
-               tmp += rc;
-               for_each_cpu(j, cptab->ctb_parts[i].cpt_cpumask) {
-                       rc = snprintf(tmp, len, " %d", j);
-                       len -= rc;
-                       if (len <= 0)
-                               goto err;
-                       tmp += rc;
-               }
-
-               *tmp = '\n';
-               tmp++;
-               len--;
-       }
-
-       return tmp - buf;
-
-err:
-       return -E2BIG;
-}
-EXPORT_SYMBOL(cfs_cpt_table_print);
-
-int cfs_cpt_distance_print(struct cfs_cpt_table *cptab, char *buf, int len)
-{
-       char *tmp = buf;
-       int rc;
-       int i;
-       int j;
-
-       for (i = 0; i < cptab->ctb_nparts; i++) {
-               if (len <= 0)
-                       goto err;
-
-               rc = snprintf(tmp, len, "%d\t:", i);
-               len -= rc;
-
-               if (len <= 0)
-                       goto err;
-
-               tmp += rc;
-               for (j = 0; j < cptab->ctb_nparts; j++) {
-                       rc = snprintf(tmp, len, " %d:%d",
-                                     j, cptab->ctb_parts[i].cpt_distance[j]);
-                       len -= rc;
-                       if (len <= 0)
-                               goto err;
-                       tmp += rc;
-               }
-
-               *tmp = '\n';
-               tmp++;
-               len--;
-       }
-
-       return tmp - buf;
-
-err:
-       return -E2BIG;
-}
-EXPORT_SYMBOL(cfs_cpt_distance_print);
-
-int cfs_cpt_number(struct cfs_cpt_table *cptab)
-{
-       return cptab->ctb_nparts;
-}
-EXPORT_SYMBOL(cfs_cpt_number);
-
-int cfs_cpt_weight(struct cfs_cpt_table *cptab, int cpt)
-{
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       return cpt == CFS_CPT_ANY ?
-              cpumask_weight(cptab->ctb_cpumask) :
-              cpumask_weight(cptab->ctb_parts[cpt].cpt_cpumask);
-}
-EXPORT_SYMBOL(cfs_cpt_weight);
-
-int cfs_cpt_online(struct cfs_cpt_table *cptab, int cpt)
-{
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       return cpt == CFS_CPT_ANY ?
-              cpumask_any_and(cptab->ctb_cpumask,
-                              cpu_online_mask) < nr_cpu_ids :
-              cpumask_any_and(cptab->ctb_parts[cpt].cpt_cpumask,
-                              cpu_online_mask) < nr_cpu_ids;
-}
-EXPORT_SYMBOL(cfs_cpt_online);
-
-cpumask_t *cfs_cpt_cpumask(struct cfs_cpt_table *cptab, int cpt)
-{
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       return cpt == CFS_CPT_ANY ?
-              cptab->ctb_cpumask : cptab->ctb_parts[cpt].cpt_cpumask;
-}
-EXPORT_SYMBOL(cfs_cpt_cpumask);
-
-nodemask_t *cfs_cpt_nodemask(struct cfs_cpt_table *cptab, int cpt)
-{
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       return cpt == CFS_CPT_ANY ?
-              cptab->ctb_nodemask : cptab->ctb_parts[cpt].cpt_nodemask;
-}
-EXPORT_SYMBOL(cfs_cpt_nodemask);
-
-unsigned int cfs_cpt_distance(struct cfs_cpt_table *cptab, int cpt1, int cpt2)
-{
-       LASSERT(cpt1 == CFS_CPT_ANY || (cpt1 >= 0 && cpt1 < cptab->ctb_nparts));
-       LASSERT(cpt2 == CFS_CPT_ANY || (cpt2 >= 0 && cpt2 < cptab->ctb_nparts));
-
-       if (cpt1 == CFS_CPT_ANY || cpt2 == CFS_CPT_ANY)
-               return cptab->ctb_distance;
-
-       return cptab->ctb_parts[cpt1].cpt_distance[cpt2];
-}
-EXPORT_SYMBOL(cfs_cpt_distance);
-
-/*
- * Calculate the maximum NUMA distance between all nodes in the
- * from_mask and all nodes in the to_mask.
- */
-static unsigned int cfs_cpt_distance_calculate(nodemask_t *from_mask,
-                                              nodemask_t *to_mask)
-{
-       unsigned int maximum;
-       unsigned int distance;
-       int from;
-       int to;
-
-       maximum = 0;
-       for_each_node_mask(from, *from_mask) {
-               for_each_node_mask(to, *to_mask) {
-                       distance = node_distance(from, to);
-                       if (maximum < distance)
-                               maximum = distance;
-               }
-       }
-       return maximum;
-}
-
-static void cfs_cpt_add_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
-{
-       cptab->ctb_cpu2cpt[cpu] = cpt;
-
-       cpumask_set_cpu(cpu, cptab->ctb_cpumask);
-       cpumask_set_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask);
-}
-
-static void cfs_cpt_del_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
-{
-       cpumask_clear_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask);
-       cpumask_clear_cpu(cpu, cptab->ctb_cpumask);
-
-       cptab->ctb_cpu2cpt[cpu] = -1;
-}
-
-static void cfs_cpt_add_node(struct cfs_cpt_table *cptab, int cpt, int node)
-{
-       struct cfs_cpu_partition *part;
-
-       if (!node_isset(node, *cptab->ctb_nodemask)) {
-               unsigned int dist;
-
-               /* first time node is added to the CPT table */
-               node_set(node, *cptab->ctb_nodemask);
-               cptab->ctb_node2cpt[node] = cpt;
-
-               dist = cfs_cpt_distance_calculate(cptab->ctb_nodemask,
-                                                 cptab->ctb_nodemask);
-               cptab->ctb_distance = dist;
-       }
-
-       part = &cptab->ctb_parts[cpt];
-       if (!node_isset(node, *part->cpt_nodemask)) {
-               int cpt2;
-
-               /* first time node is added to this CPT */
-               node_set(node, *part->cpt_nodemask);
-               for (cpt2 = 0; cpt2 < cptab->ctb_nparts; cpt2++) {
-                       struct cfs_cpu_partition *part2;
-                       unsigned int dist;
-
-                       part2 = &cptab->ctb_parts[cpt2];
-                       dist = cfs_cpt_distance_calculate(part->cpt_nodemask,
-                                                         part2->cpt_nodemask);
-                       part->cpt_distance[cpt2] = dist;
-                       dist = cfs_cpt_distance_calculate(part2->cpt_nodemask,
-                                                         part->cpt_nodemask);
-                       part2->cpt_distance[cpt] = dist;
-               }
-       }
-}
-
-static void cfs_cpt_del_node(struct cfs_cpt_table *cptab, int cpt, int node)
-{
-       struct cfs_cpu_partition *part = &cptab->ctb_parts[cpt];
-       int cpu;
-
-       for_each_cpu(cpu, part->cpt_cpumask) {
-               /* this CPT has other CPU belonging to this node? */
-               if (cpu_to_node(cpu) == node)
-                       break;
-       }
-
-       if (cpu >= nr_cpu_ids && node_isset(node,  *part->cpt_nodemask)) {
-               int cpt2;
-
-               /* No more CPUs in the node for this CPT. */
-               node_clear(node, *part->cpt_nodemask);
-               for (cpt2 = 0; cpt2 < cptab->ctb_nparts; cpt2++) {
-                       struct cfs_cpu_partition *part2;
-                       unsigned int dist;
-
-                       part2 = &cptab->ctb_parts[cpt2];
-                       if (node_isset(node, *part2->cpt_nodemask))
-                               cptab->ctb_node2cpt[node] = cpt2;
-
-                       dist = cfs_cpt_distance_calculate(part->cpt_nodemask,
-                                                         part2->cpt_nodemask);
-                       part->cpt_distance[cpt2] = dist;
-                       dist = cfs_cpt_distance_calculate(part2->cpt_nodemask,
-                                                         part->cpt_nodemask);
-                       part2->cpt_distance[cpt] = dist;
-               }
-       }
-
-       for_each_cpu(cpu, cptab->ctb_cpumask) {
-               /* this CPT-table has other CPUs belonging to this node? */
-               if (cpu_to_node(cpu) == node)
-                       break;
-       }
-
-       if (cpu >= nr_cpu_ids && node_isset(node, *cptab->ctb_nodemask)) {
-               /* No more CPUs in the table for this node. */
-               node_clear(node, *cptab->ctb_nodemask);
-               cptab->ctb_node2cpt[node] = -1;
-               cptab->ctb_distance =
-                       cfs_cpt_distance_calculate(cptab->ctb_nodemask,
-                                                  cptab->ctb_nodemask);
-       }
-}
-
-int cfs_cpt_set_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
-{
-       LASSERT(cpt >= 0 && cpt < cptab->ctb_nparts);
-
-       if (cpu < 0 || cpu >= nr_cpu_ids || !cpu_online(cpu)) {
-               CDEBUG(D_INFO, "CPU %d is invalid or it's offline\n", cpu);
-               return 0;
-       }
-
-       if (cptab->ctb_cpu2cpt[cpu] != -1) {
-               CDEBUG(D_INFO, "CPU %d is already in partition %d\n",
-                      cpu, cptab->ctb_cpu2cpt[cpu]);
-               return 0;
-       }
-
-       if (cpumask_test_cpu(cpu, cptab->ctb_cpumask)) {
-               CDEBUG(D_INFO, "CPU %d is already in cpumask\n", cpu);
-               return 0;
-       }
-
-       if (cpumask_test_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask)) {
-               CDEBUG(D_INFO, "CPU %d is already in partition %d cpumask\n",
-                      cpu, cptab->ctb_cpu2cpt[cpu]);
-               return 0;
-       }
-
-       cfs_cpt_add_cpu(cptab, cpt, cpu);
-       cfs_cpt_add_node(cptab, cpt, cpu_to_node(cpu));
-
-       return 1;
-}
-EXPORT_SYMBOL(cfs_cpt_set_cpu);
-
-void cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
-{
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       if (cpu < 0 || cpu >= nr_cpu_ids) {
-               CDEBUG(D_INFO, "Invalid CPU id %d\n", cpu);
-               return;
-       }
-
-       if (cpt == CFS_CPT_ANY) {
-               /* caller doesn't know the partition ID */
-               cpt = cptab->ctb_cpu2cpt[cpu];
-               if (cpt < 0) { /* not set in this CPT-table */
-                       CDEBUG(D_INFO,
-                              "Try to unset cpu %d which is not in CPT-table %p\n",
-                              cpt, cptab);
-                       return;
-               }
-
-       } else if (cpt != cptab->ctb_cpu2cpt[cpu]) {
-               CDEBUG(D_INFO,
-                      "CPU %d is not in CPU partition %d\n", cpu, cpt);
-               return;
-       }
-
-       LASSERT(cpumask_test_cpu(cpu, cptab->ctb_parts[cpt].cpt_cpumask));
-       LASSERT(cpumask_test_cpu(cpu, cptab->ctb_cpumask));
-
-       cfs_cpt_del_cpu(cptab, cpt, cpu);
-       cfs_cpt_del_node(cptab, cpt, cpu_to_node(cpu));
-}
-EXPORT_SYMBOL(cfs_cpt_unset_cpu);
-
-int cfs_cpt_set_cpumask(struct cfs_cpt_table *cptab, int cpt,
-                       const cpumask_t *mask)
-{
-       int cpu;
-
-       if (!cpumask_weight(mask) ||
-           cpumask_any_and(mask, cpu_online_mask) >= nr_cpu_ids) {
-               CDEBUG(D_INFO,
-                      "No online CPU is found in the CPU mask for CPU partition %d\n",
-                      cpt);
-               return 0;
-       }
-
-       for_each_cpu(cpu, mask) {
-               cfs_cpt_add_cpu(cptab, cpt, cpu);
-               cfs_cpt_add_node(cptab, cpt, cpu_to_node(cpu));
-       }
-
-       return 1;
-}
-EXPORT_SYMBOL(cfs_cpt_set_cpumask);
-
-void cfs_cpt_unset_cpumask(struct cfs_cpt_table *cptab, int cpt,
-                          const cpumask_t *mask)
-{
-       int cpu;
-
-       for_each_cpu(cpu, mask) {
-               cfs_cpt_del_cpu(cptab, cpt, cpu);
-               cfs_cpt_del_node(cptab, cpt, cpu_to_node(cpu));
-       }
-}
-EXPORT_SYMBOL(cfs_cpt_unset_cpumask);
-
-int cfs_cpt_set_node(struct cfs_cpt_table *cptab, int cpt, int node)
-{
-       const cpumask_t *mask;
-       int cpu;
-
-       if (node < 0 || node >= nr_node_ids) {
-               CDEBUG(D_INFO,
-                      "Invalid NUMA id %d for CPU partition %d\n", node, cpt);
-               return 0;
-       }
-
-       mask = cpumask_of_node(node);
-
-       for_each_cpu(cpu, mask)
-               cfs_cpt_add_cpu(cptab, cpt, cpu);
-
-       cfs_cpt_add_node(cptab, cpt, node);
-
-       return 1;
-}
-EXPORT_SYMBOL(cfs_cpt_set_node);
-
-void cfs_cpt_unset_node(struct cfs_cpt_table *cptab, int cpt, int node)
-{
-       const cpumask_t *mask;
-       int cpu;
-
-       if (node < 0 || node >= nr_node_ids) {
-               CDEBUG(D_INFO,
-                      "Invalid NUMA id %d for CPU partition %d\n", node, cpt);
-               return;
-       }
-
-       mask = cpumask_of_node(node);
-
-       for_each_cpu(cpu, mask)
-               cfs_cpt_del_cpu(cptab, cpt, cpu);
-
-       cfs_cpt_del_node(cptab, cpt, node);
-}
-EXPORT_SYMBOL(cfs_cpt_unset_node);
-
-int cfs_cpt_set_nodemask(struct cfs_cpt_table *cptab, int cpt,
-                        const nodemask_t *mask)
-{
-       int node;
-
-       for_each_node_mask(node, *mask)
-               cfs_cpt_set_node(cptab, cpt, node);
-
-       return 1;
-}
-EXPORT_SYMBOL(cfs_cpt_set_nodemask);
-
-void cfs_cpt_unset_nodemask(struct cfs_cpt_table *cptab, int cpt,
-                           const nodemask_t *mask)
-{
-       int node;
-
-       for_each_node_mask(node, *mask)
-               cfs_cpt_unset_node(cptab, cpt, node);
-}
-EXPORT_SYMBOL(cfs_cpt_unset_nodemask);
-
-int cfs_cpt_spread_node(struct cfs_cpt_table *cptab, int cpt)
-{
-       nodemask_t *mask;
-       int weight;
-       int rotor;
-       int node = 0;
-
-       /* convert CPU partition ID to HW node id */
-
-       if (cpt < 0 || cpt >= cptab->ctb_nparts) {
-               mask = cptab->ctb_nodemask;
-               rotor = cptab->ctb_spread_rotor++;
-       } else {
-               mask = cptab->ctb_parts[cpt].cpt_nodemask;
-               rotor = cptab->ctb_parts[cpt].cpt_spread_rotor++;
-               node  = cptab->ctb_parts[cpt].cpt_node;
-       }
-
-       weight = nodes_weight(*mask);
-       if (weight > 0) {
-               rotor %= weight;
-
-               for_each_node_mask(node, *mask) {
-                       if (!rotor--)
-                               return node;
-               }
-       }
-
-       return node;
-}
-EXPORT_SYMBOL(cfs_cpt_spread_node);
-
-int cfs_cpt_current(struct cfs_cpt_table *cptab, int remap)
-{
-       int cpu = smp_processor_id();
-       int cpt = cptab->ctb_cpu2cpt[cpu];
-
-       if (cpt < 0) {
-               if (!remap)
-                       return cpt;
-
-               /* don't return negative value for safety of upper layer,
-                * instead we shadow the unknown cpu to a valid partition ID
-                */
-               cpt = cpu % cptab->ctb_nparts;
-       }
-
-       return cpt;
-}
-EXPORT_SYMBOL(cfs_cpt_current);
-
-int cfs_cpt_of_cpu(struct cfs_cpt_table *cptab, int cpu)
-{
-       LASSERT(cpu >= 0 && cpu < nr_cpu_ids);
-
-       return cptab->ctb_cpu2cpt[cpu];
-}
-EXPORT_SYMBOL(cfs_cpt_of_cpu);
-
-int cfs_cpt_of_node(struct cfs_cpt_table *cptab, int node)
-{
-       if (node < 0 || node > nr_node_ids)
-               return CFS_CPT_ANY;
-
-       return cptab->ctb_node2cpt[node];
-}
-EXPORT_SYMBOL(cfs_cpt_of_node);
-
-int cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
-{
-       nodemask_t *nodemask;
-       cpumask_t *cpumask;
-       int cpu;
-       int rc;
-
-       LASSERT(cpt == CFS_CPT_ANY || (cpt >= 0 && cpt < cptab->ctb_nparts));
-
-       if (cpt == CFS_CPT_ANY) {
-               cpumask = cptab->ctb_cpumask;
-               nodemask = cptab->ctb_nodemask;
-       } else {
-               cpumask = cptab->ctb_parts[cpt].cpt_cpumask;
-               nodemask = cptab->ctb_parts[cpt].cpt_nodemask;
-       }
-
-       if (!cpumask_intersects(cpumask, cpu_online_mask)) {
-               CDEBUG(D_INFO,
-                      "No online CPU found in CPU partition %d, did someone do CPU hotplug on system? You might need to reload Lustre modules to keep system working well.\n",
-                       cpt);
-               return -ENODEV;
-       }
-
-       for_each_online_cpu(cpu) {
-               if (cpumask_test_cpu(cpu, cpumask))
-                       continue;
-
-               rc = set_cpus_allowed_ptr(current, cpumask);
-               set_mems_allowed(*nodemask);
-               if (!rc)
-                       schedule(); /* switch to allowed CPU */
-
-               return rc;
-       }
-
-       /* don't need to set affinity because all online CPUs are covered */
-       return 0;
-}
-EXPORT_SYMBOL(cfs_cpt_bind);
-
-/**
- * Choose max to \a number CPUs from \a node and set them in \a cpt.
- * We always prefer to choose CPU in the same core/socket.
- */
-static int cfs_cpt_choose_ncpus(struct cfs_cpt_table *cptab, int cpt,
-                               cpumask_t *node_mask, int number)
-{
-       cpumask_t *socket_mask = NULL;
-       cpumask_t *core_mask = NULL;
-       int rc = 0;
-       int cpu;
-       int i;
-
-       LASSERT(number > 0);
-
-       if (number >= cpumask_weight(node_mask)) {
-               while (!cpumask_empty(node_mask)) {
-                       cpu = cpumask_first(node_mask);
-                       cpumask_clear_cpu(cpu, node_mask);
-
-                       if (!cpu_online(cpu))
-                               continue;
-
-                       rc = cfs_cpt_set_cpu(cptab, cpt, cpu);
-                       if (!rc)
-                               return -EINVAL;
-               }
-               return 0;
-       }
-
-       /* allocate scratch buffer */
-       LIBCFS_ALLOC(socket_mask, cpumask_size());
-       LIBCFS_ALLOC(core_mask, cpumask_size());
-       if (!socket_mask || !core_mask) {
-               rc = -ENOMEM;
-               goto out;
-       }
-
-       while (!cpumask_empty(node_mask)) {
-               cpu = cpumask_first(node_mask);
-
-               /* get cpumask for cores in the same socket */
-               cpumask_and(socket_mask, topology_core_cpumask(cpu), node_mask);
-               while (!cpumask_empty(socket_mask)) {
-                       /* get cpumask for hts in the same core */
-                       cpumask_and(core_mask, topology_sibling_cpumask(cpu),
-                                   node_mask);
-
-                       for_each_cpu(i, core_mask) {
-                               cpumask_clear_cpu(i, socket_mask);
-                               cpumask_clear_cpu(i, node_mask);
-
-                               if (!cpu_online(i))
-                                       continue;
-
-                               rc = cfs_cpt_set_cpu(cptab, cpt, i);
-                               if (!rc) {
-                                       rc = -EINVAL;
-                                       goto out;
-                               }
-
-                               if (!--number)
-                                       goto out;
-                       }
-                       cpu = cpumask_first(socket_mask);
-               }
-       }
-
-out:
-       if (core_mask)
-               LIBCFS_FREE(core_mask, cpumask_size());
-       if (socket_mask)
-               LIBCFS_FREE(socket_mask, cpumask_size());
-       return rc;
-}
-
-#define CPT_WEIGHT_MIN 4
-
-static int cfs_cpt_num_estimate(void)
-{
-       int nthr = cpumask_weight(topology_sibling_cpumask(smp_processor_id()));
-       int ncpu = num_online_cpus();
-       int ncpt = 1;
-
-       if (ncpu > CPT_WEIGHT_MIN)
-               for (ncpt = 2; ncpu > 2 * nthr * ncpt; ncpt++)
-                       ; /* nothing */
-
-#if (BITS_PER_LONG == 32)
-       /* config many CPU partitions on 32-bit system could consume
-        * too much memory
-        */
-       ncpt = min(2, ncpt);
-#endif
-       while (ncpu % ncpt)
-               ncpt--; /* worst case is 1 */
-
-       return ncpt;
-}
-
-static struct cfs_cpt_table *cfs_cpt_table_create(int ncpt)
-{
-       struct cfs_cpt_table *cptab = NULL;
-       cpumask_t *node_mask = NULL;
-       int cpt = 0;
-       int node;
-       int num;
-       int rem;
-       int rc = 0;
-
-       num = cfs_cpt_num_estimate();
-       if (ncpt <= 0)
-               ncpt = num;
-
-       if (ncpt > num_online_cpus() || 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);
-       }
-
-       cptab = cfs_cpt_table_alloc(ncpt);
-       if (!cptab) {
-               CERROR("Failed to allocate CPU map(%d)\n", ncpt);
-               rc = -ENOMEM;
-               goto failed;
-       }
-
-       LIBCFS_ALLOC(node_mask, cpumask_size());
-       if (!node_mask) {
-               CERROR("Failed to allocate scratch cpumask\n");
-               rc = -ENOMEM;
-               goto failed;
-       }
-
-       num = num_online_cpus() / ncpt;
-       rem = num_online_cpus() % ncpt;
-       for_each_online_node(node) {
-               cpumask_copy(node_mask, cpumask_of_node(node));
-
-               while (cpt < ncpt && !cpumask_empty(node_mask)) {
-                       struct cfs_cpu_partition *part = &cptab->ctb_parts[cpt];
-                       int ncpu = cpumask_weight(part->cpt_cpumask);
-
-                       rc = cfs_cpt_choose_ncpus(cptab, cpt, node_mask,
-                                                 num - ncpu);
-                       if (rc < 0) {
-                               rc = -EINVAL;
-                               goto failed_mask;
-                       }
-
-                       ncpu = cpumask_weight(part->cpt_cpumask);
-                       if (ncpu == num + !!(rem > 0)) {
-                               cpt++;
-                               rem--;
-                       }
-               }
-       }
-
-       LIBCFS_FREE(node_mask, cpumask_size());
-
-       return cptab;
-
-failed_mask:
-       if (node_mask)
-               LIBCFS_FREE(node_mask, cpumask_size());
-failed:
-       CERROR("Failed (rc = %d) to setup CPU partition table with %d partitions, online HW NUMA nodes: %d, HW CPU cores: %d.\n",
-              rc, ncpt, num_online_nodes(), num_online_cpus());
-
-       if (cptab)
-               cfs_cpt_table_free(cptab);
-
-       return ERR_PTR(rc);
-}
-
-static struct cfs_cpt_table *cfs_cpt_table_create_pattern(const char *pattern)
-{
-       struct cfs_cpt_table *cptab;
-       char *pattern_dup;
-       char *bracket;
-       char *str;
-       int node = 0;
-       int ncpt = 0;
-       int cpt = 0;
-       int high;
-       int rc;
-       int c;
-       int i;
-
-       pattern_dup = kstrdup(pattern, GFP_KERNEL);
-       if (!pattern_dup) {
-               CERROR("Failed to duplicate pattern '%s'\n", pattern);
-               return ERR_PTR(-ENOMEM);
-       }
-
-       str = cfs_trimwhite(pattern_dup);
-       if (*str == 'n' || *str == 'N') {
-               str++; /* skip 'N' char */
-               node = 1; /* NUMA pattern */
-               if (*str == '\0') {
-                       node = -1;
-                       for_each_online_node(i) {
-                               if (!cpumask_empty(cpumask_of_node(i)))
-                                       ncpt++;
-                       }
-                       if (ncpt == 1) { /* single NUMA node */
-                               kfree(pattern_dup);
-                               return cfs_cpt_table_create(cpu_npartitions);
-                       }
-               }
-       }
-
-       if (!ncpt) { /* scanning bracket which is mark of partition */
-               bracket = str;
-               while ((bracket = strchr(bracket, '['))) {
-                       bracket++;
-                       ncpt++;
-               }
-       }
-
-       if (!ncpt ||
-           (node && ncpt > num_online_nodes()) ||
-           (!node && ncpt > num_online_cpus())) {
-               CERROR("Invalid pattern '%s', or too many partitions %d\n",
-                      pattern_dup, ncpt);
-               rc = -EINVAL;
-               goto err_free_str;
-       }
-
-       cptab = cfs_cpt_table_alloc(ncpt);
-       if (!cptab) {
-               CERROR("Failed to allocate CPU partition table\n");
-               rc = -ENOMEM;
-               goto err_free_str;
-       }
-
-       if (node < 0) { /* shortcut to create CPT from NUMA & CPU topology */
-               for_each_online_node(i) {
-                       if (cpumask_empty(cpumask_of_node(i)))
-                               continue;
-
-                       rc = cfs_cpt_set_node(cptab, cpt++, i);
-                       if (!rc) {
-                               rc = -EINVAL;
-                               goto err_free_table;
-                       }
-               }
-               kfree(pattern_dup);
-               return cptab;
-       }
-
-       high = node ? nr_node_ids - 1 : nr_cpu_ids - 1;
-
-       for (str = cfs_trimwhite(str), c = 0; /* until break */; c++) {
-               struct cfs_range_expr *range;
-               struct cfs_expr_list *el;
-               int n;
-
-               bracket = strchr(str, '[');
-               if (!bracket) {
-                       if (*str) {
-                               CERROR("Invalid pattern '%s'\n", str);
-                               rc = -EINVAL;
-                               goto err_free_table;
-                       } else if (c != ncpt) {
-                               CERROR("Expect %d partitions but found %d\n",
-                                      ncpt, c);
-                               rc = -EINVAL;
-                               goto err_free_table;
-                       }
-                       break;
-               }
-
-               if (sscanf(str, "%d%n", &cpt, &n) < 1) {
-                       CERROR("Invalid CPU pattern '%s'\n", str);
-                       rc = -EINVAL;
-                       goto err_free_table;
-               }
-
-               if (cpt < 0 || cpt >= ncpt) {
-                       CERROR("Invalid partition id %d, total partitions %d\n",
-                              cpt, ncpt);
-                       rc = -EINVAL;
-                       goto err_free_table;
-               }
-
-               if (cfs_cpt_weight(cptab, cpt)) {
-                       CERROR("Partition %d has already been set.\n", cpt);
-                       rc = -EPERM;
-                       goto err_free_table;
-               }
-
-               str = cfs_trimwhite(str + n);
-               if (str != bracket) {
-                       CERROR("Invalid pattern '%s'\n", str);
-                       rc = -EINVAL;
-                       goto err_free_table;
-               }
-
-               bracket = strchr(str, ']');
-               if (!bracket) {
-                       CERROR("Missing right bracket for partition %d in '%s'\n",
-                              cpt, str);
-                       rc = -EINVAL;
-                       goto err_free_table;
-               }
-
-               rc = cfs_expr_list_parse(str, (bracket - str) + 1, 0, high,
-                                        &el);
-               if (rc) {
-                       CERROR("Can't parse number range in '%s'\n", str);
-                       rc = -ERANGE;
-                       goto err_free_table;
-               }
-
-               list_for_each_entry(range, &el->el_exprs, re_link) {
-                       for (i = range->re_lo; i <= range->re_hi; i++) {
-                               if ((i - range->re_lo) % range->re_stride)
-                                       continue;
-
-                               rc = node ? cfs_cpt_set_node(cptab, cpt, i)
-                                         : cfs_cpt_set_cpu(cptab, cpt, i);
-                               if (!rc) {
-                                       cfs_expr_list_free(el);
-                                       rc = -EINVAL;
-                                       goto err_free_table;
-                               }
-                       }
-               }
-
-               cfs_expr_list_free(el);
-
-               if (!cfs_cpt_online(cptab, cpt)) {
-                       CERROR("No online CPU is found on partition %d\n", cpt);
-                       rc = -ENODEV;
-                       goto err_free_table;
-               }
-
-               str = cfs_trimwhite(bracket + 1);
-       }
-
-       kfree(pattern_dup);
-       return cptab;
-
-err_free_table:
-       cfs_cpt_table_free(cptab);
-err_free_str:
-       kfree(pattern_dup);
-       return ERR_PTR(rc);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-#ifdef HAVE_HOTPLUG_STATE_MACHINE
-static enum cpuhp_state lustre_cpu_online;
-
-static int cfs_cpu_online(unsigned int cpu)
-{
-       return 0;
-}
-#endif
-
-static int cfs_cpu_dead(unsigned int cpu)
-{
-       bool warn;
-
-       /* if all HTs in a core are offline, it may break affinity */
-       warn = cpumask_any_and(topology_sibling_cpumask(cpu),
-                              cpu_online_mask) >= nr_cpu_ids;
-       CDEBUG(warn ? D_WARNING : D_INFO,
-              "Lustre: can't support CPU plug-out well now, performance and stability could be impacted [CPU %u]\n",
-              cpu);
-       return 0;
-}
-
-#ifndef HAVE_HOTPLUG_STATE_MACHINE
-static int cfs_cpu_notify(struct notifier_block *self, unsigned long action,
-                         void *hcpu)
-{
-       int cpu = (unsigned long)hcpu;
-
-       switch (action) {
-       case CPU_DEAD:
-       case CPU_DEAD_FROZEN:
-       case CPU_ONLINE:
-       case CPU_ONLINE_FROZEN:
-       default:
-               if (action != CPU_DEAD && action != CPU_DEAD_FROZEN) {
-                       CDEBUG(D_INFO, "CPU changed [cpu %u action %lx]\n",
-                              cpu, action);
-                       break;
-               }
-
-               cfs_cpu_dead(cpu);
-       }
-
-       return NOTIFY_OK;
-}
-
-static struct notifier_block cfs_cpu_notifier = {
-       .notifier_call  = cfs_cpu_notify,
-       .priority       = 0
-};
-#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
-#endif /* CONFIG_HOTPLUG_CPU */
-
-void cfs_cpu_fini(void)
-{
-       if (!IS_ERR_OR_NULL(cfs_cpt_table))
-               cfs_cpt_table_free(cfs_cpt_table);
-
-#ifdef CONFIG_HOTPLUG_CPU
-#ifdef HAVE_HOTPLUG_STATE_MACHINE
-       if (lustre_cpu_online > 0)
-               cpuhp_remove_state_nocalls(lustre_cpu_online);
-       cpuhp_remove_state_nocalls(CPUHP_LUSTRE_CFS_DEAD);
-#else
-       unregister_hotcpu_notifier(&cfs_cpu_notifier);
-#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
-#endif /* CONFIG_HOTPLUG_CPU */
-}
-
-int cfs_cpu_init(void)
-{
-       int ret = -EINVAL;
-
-       LASSERT(!cfs_cpt_table);
-
-#ifdef CONFIG_HOTPLUG_CPU
-#ifdef HAVE_HOTPLUG_STATE_MACHINE
-       ret = cpuhp_setup_state_nocalls(CPUHP_LUSTRE_CFS_DEAD,
-                                       "fs/lustre/cfe:dead", NULL,
-                                       cfs_cpu_dead);
-       if (ret < 0)
-               goto failed_cpu_dead;
-
-       ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
-                                       "fs/lustre/cfe:online",
-                                       cfs_cpu_online, NULL);
-       if (ret < 0)
-               goto failed_cpu_online;
-
-       lustre_cpu_online = ret;
-#else
-       register_hotcpu_notifier(&cfs_cpu_notifier);
-#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
-#endif /* CONFIG_HOTPLUG_CPU */
-       ret = -EINVAL;
-
-       get_online_cpus();
-       if (*cpu_pattern) {
-               cfs_cpt_table = cfs_cpt_table_create_pattern(cpu_pattern);
-               if (IS_ERR(cfs_cpt_table)) {
-                       CERROR("Failed to create cptab from pattern '%s'\n",
-                              cpu_pattern);
-                       ret = PTR_ERR(cfs_cpt_table);
-                       goto failed_alloc_table;
-               }
-
-       } else {
-               cfs_cpt_table = cfs_cpt_table_create(cpu_npartitions);
-               if (IS_ERR(cfs_cpt_table)) {
-                       CERROR("Failed to create cptab with npartitions %d\n",
-                              cpu_npartitions);
-                       ret = PTR_ERR(cfs_cpt_table);
-                       goto failed_alloc_table;
-               }
-       }
-
-       put_online_cpus();
-
-       LCONSOLE(0, "HW NUMA nodes: %d, HW CPU cores: %d, npartitions: %d\n",
-                num_online_nodes(), num_online_cpus(),
-                cfs_cpt_number(cfs_cpt_table));
-       return 0;
-
-failed_alloc_table:
-       put_online_cpus();
-
-       if (!IS_ERR_OR_NULL(cfs_cpt_table))
-               cfs_cpt_table_free(cfs_cpt_table);
-
-#ifdef CONFIG_HOTPLUG_CPU
-#ifdef HAVE_HOTPLUG_STATE_MACHINE
-       if (lustre_cpu_online > 0)
-               cpuhp_remove_state_nocalls(lustre_cpu_online);
-failed_cpu_online:
-       cpuhp_remove_state_nocalls(CPUHP_LUSTRE_CFS_DEAD);
-failed_cpu_dead:
-#else
-       unregister_hotcpu_notifier(&cfs_cpu_notifier);
-#endif /* !HAVE_HOTPLUG_STATE_MACHINE */
-#endif /* CONFIG_HOTPLUG_CPU */
-       return ret;
-}
-
-#endif