mm/percpu.c: correct max_distance calculation for pcpu_embed_first_chunk() (93c76b6b) · Commits · 戴 / test

pcpu_embed_first_chunk() calculates the range a percpu chunk spans into @max_distance and uses it to ensure that a chunk is not too big compared to the total vmalloc area. However, during calculation, it used incorrect top address by adding a unit size to the highest group's base address. This can make the calculated max_distance slightly smaller than the actual distance although given the scale of values involved the error is very unlikely to have an actual impact. Fix this issue by adding the group's size instead of a unit size. BTW, The type of variable max_distance is changed from size_t to unsigned long too based on below consideration: - type unsigned long usually have same width with IP core registers and can be applied at here very well - make @max_distance type consistent with the operand calculated against it such as @ai->groups[i].base_offset and macro VMALLOC_TOTAL - type unsigned long is more universal then size_t, size_t is type defined to unsigned int or unsigned long among various ARCHs usually Signed-off-by:

zijun_hu <zijun_hu@htc.com> Signed-off-by:

Tejun Heo <tj@kernel.org>

mm/percpu.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -1961,7 +1961,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
		void base = (void )ULONG_MAX;
		void **areas = NULL;
		struct pcpu_alloc_info *ai;
		size_t size_sum, areas_size, max_distance;
		size_t size_sum, areas_size;
		unsigned long max_distance;
		int group, i, rc;

		ai = pcpu_build_alloc_info(reserved_size, dyn_size, atom_size,
		@@ -2023,17 +2024,18 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
		}

		/* base address is now known, determine group base offsets */
		max_distance = 0;
		i = 0;
		for (group = 0; group < ai->nr_groups; group++) {
		ai->groups[group].base_offset = areas[group] - base;
		max_distance = max_t(size_t, max_distance,
		ai->groups[group].base_offset);
		if (areas[group] > areas[i])
		i = group;
		}
		max_distance += ai->unit_size;
		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%zx too large for vmalloc space 0x%lx\n",
		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 */

Admin message