int cfs_cpt_current(struct cfs_cpt_table *cptab, int remap)
{
- int cpu = smp_processor_id();
- int cpt = cptab->ctb_cpu2cpt[cpu];
+ int cpu;
+ int cpt;
- if (cpt < 0) {
- if (!remap)
- return cpt;
+ preempt_disable();
+ cpu = smp_processor_id();
+ cpt = cptab->ctb_cpu2cpt[cpu];
+ if (cpt < 0 && remap) {
/* 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;
}
-
+ preempt_enable();
return cpt;
}
EXPORT_SYMBOL(cfs_cpt_current);
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);
}
int ncpu = cpumask_weight(part->cpt_cpumask);
rc = cfs_cpt_choose_ncpus(cptab, cpt, node_mask,
- num - ncpu);
+ (rem > 0) + num - ncpu);
if (rc < 0) {
rc = -EINVAL;
goto failed_mask;
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 */
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;
goto err_free_table;
}
- str = cfs_trimwhite(str + n);
+ str = strim(str + n);
if (str != bracket) {
CERROR("Invalid pattern '%s'\n", str);
rc = -EINVAL;
goto err_free_table;
}
- str = cfs_trimwhite(bracket + 1);
+ str = strim(bracket + 1);
}
kfree(pattern_dup);
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