LU-13294 libcfs: incorrect rotor behaviour

[fs/lustre-release.git] / libcfs / include / libcfs / libcfs_cpu.h

diff --git a/libcfs/include/libcfs/libcfs_cpu.h b/libcfs/include/libcfs/libcfs_cpu.h
index fb268a8..404b07a 100644 (file)
--- a/libcfs/include/libcfs/libcfs_cpu.h
+++ b/libcfs/include/libcfs/libcfs_cpu.h
@@ -58,9 +58,9 @@
  *   . NUMA allocators, CPU affinity threads are built over CPU partitions,
  *     instead of HW CPUs or HW nodes.
  *
- *   . By default, Lustre modules should refer to the global cfs_cpt_table,
+ *   . By default, Lustre modules should refer to the global cfs_cpt_tab,
  *     instead of accessing HW CPUs directly, so concurrency of Lustre can be
- *     configured by cpu_npartitions of the global cfs_cpt_table
+ *     configured by cpu_npartitions of the global cfs_cpt_tab
  *
  *   . If cpu_npartitions=1(all CPUs in one pool), lustre should work the
  *     same way as 2.2 or earlier versions
@@ -85,13 +85,13 @@
 /** virtual processing unit */
 struct cfs_cpu_partition {
        /* CPUs mask for this partition */
-       cpumask_t                       *cpt_cpumask;
+       cpumask_var_t                    cpt_cpumask;
        /* nodes mask for this partition */
        nodemask_t                      *cpt_nodemask;
        /* NUMA distance between CPTs */
        unsigned int                    *cpt_distance;
        /* spread rotor for NUMA allocator */
-       int                              cpt_spread_rotor;
+       unsigned int                     cpt_spread_rotor;
        /* NUMA node if cpt_nodemask is empty */
        int                              cpt_node;
 };
@@ -101,7 +101,7 @@ struct cfs_cpu_partition {
 struct cfs_cpt_table {
 #ifdef CONFIG_SMP
        /* spread rotor for NUMA allocator */
-       int                              ctb_spread_rotor;
+       unsigned int                     ctb_spread_rotor;
        /* maximum NUMA distance between all nodes in table */
        unsigned int                     ctb_distance;
        /* partitions tables */
@@ -118,13 +118,13 @@ struct cfs_cpt_table {
        nodemask_t                       ctb_nodemask;
 #endif /* CONFIG_SMP */
        /* all cpus in this partition table */
-       cpumask_t                       *ctb_cpumask;
+       cpumask_var_t                    ctb_cpumask;
 };
 
 /* any CPU partition */
 #define CFS_CPT_ANY            (-1)
 
-extern struct cfs_cpt_table    *cfs_cpt_table;
+extern struct cfs_cpt_table    *cfs_cpt_tab;
 
 /**
  * destroy a CPU partition table
@@ -157,7 +157,7 @@ int cfs_cpt_online(struct cfs_cpt_table *cptab, int cpt);
 /**
  * return cpumask of CPU partition \a cpt
  */
-cpumask_t *cfs_cpt_cpumask(struct cfs_cpt_table *cptab, int cpt);
+cpumask_var_t *cfs_cpt_cpumask(struct cfs_cpt_table *cptab, int cpt);
 /**
  * return nodemask of CPU partition \a cpt
  */