|
|
@@ -1963,7 +1963,7 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
struct pcpu_alloc_info *ai;
|
|
|
size_t size_sum, areas_size;
|
|
|
unsigned long max_distance;
|
|
|
- int group, i, rc;
|
|
|
+ int group, i, highest_group, rc;
|
|
|
|
|
|
ai = pcpu_build_alloc_info(reserved_size, dyn_size, atom_size,
|
|
|
cpu_distance_fn);
|
|
|
@@ -1979,7 +1979,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
goto out_free;
|
|
|
}
|
|
|
|
|
|
- /* allocate, copy and determine base address */
|
|
|
+ /* allocate, copy and determine base address & max_distance */
|
|
|
+ highest_group = 0;
|
|
|
for (group = 0; group < ai->nr_groups; group++) {
|
|
|
struct pcpu_group_info *gi = &ai->groups[group];
|
|
|
unsigned int cpu = NR_CPUS;
|
|
|
@@ -2000,6 +2001,21 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
areas[group] = ptr;
|
|
|
|
|
|
base = min(ptr, base);
|
|
|
+ if (ptr > areas[highest_group])
|
|
|
+ highest_group = group;
|
|
|
+ }
|
|
|
+ max_distance = areas[highest_group] - base;
|
|
|
+ max_distance += ai->unit_size * ai->groups[highest_group].nr_units;
|
|
|
+
|
|
|
+ /* warn if maximum distance is further than 75% of vmalloc space */
|
|
|
+ if (max_distance > VMALLOC_TOTAL * 3 / 4) {
|
|
|
+ pr_warn("max_distance=0x%lx too large for vmalloc space 0x%lx\n",
|
|
|
+ max_distance, VMALLOC_TOTAL);
|
|
|
+#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
|
|
|
+ /* and fail if we have fallback */
|
|
|
+ rc = -EINVAL;
|
|
|
+ goto out_free_areas;
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
@@ -2024,24 +2040,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
|
|
|
}
|
|
|
|
|
|
/* base address is now known, determine group base offsets */
|
|
|
- i = 0;
|
|
|
for (group = 0; group < ai->nr_groups; group++) {
|
|
|
ai->groups[group].base_offset = areas[group] - base;
|
|
|
- if (areas[group] > areas[i])
|
|
|
- i = group;
|
|
|
- }
|
|
|
- max_distance = ai->groups[i].base_offset +
|
|
|
- ai->unit_size * ai->groups[i].nr_units;
|
|
|
-
|
|
|
- /* warn if maximum distance is further than 75% of vmalloc space */
|
|
|
- if (max_distance > VMALLOC_TOTAL * 3 / 4) {
|
|
|
- pr_warn("max_distance=0x%lx too large for vmalloc space 0x%lx\n",
|
|
|
- max_distance, VMALLOC_TOTAL);
|
|
|
-#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
|
|
|
- /* and fail if we have fallback */
|
|
|
- rc = -EINVAL;
|
|
|
- goto out_free;
|
|
|
-#endif
|
|
|
}
|
|
|
|
|
|
pr_info("Embedded %zu pages/cpu @%p s%zu r%zu d%zu u%zu\n",
|