Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec3f64fc authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm: remove gfp mask from pcpu_get_vm_areas 



pcpu_get_vm_areas() only uses GFP_KERNEL allocations, so remove the gfp_t
formal and use the mask internally.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5a5623b

include/linux/vmalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); 
#ifdef CONFIG_SMP

struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,

				     const size_t *sizes, int nr_vms,

				     size_t align, gfp_t gfp_mask);

				     size_t align);



void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);

#endif

mm/percpu-vm.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static struct pcpu_chunk *pcpu_create_chunk(void) 
		return NULL;



	vms = pcpu_get_vm_areas(pcpu_group_offsets, pcpu_group_sizes,

				pcpu_nr_groups, pcpu_atom_size, GFP_KERNEL);

				pcpu_nr_groups, pcpu_atom_size);

	if (!vms) {

		pcpu_free_chunk(chunk);

		return NULL;

mm/vmalloc.c

+9 −12
Original line number Diff line number Diff line
@@ -2196,17 +2196,16 @@ static unsigned long pvm_determine_end(struct vmap_area **pnext, 
 * @sizes: array containing size of each area

 * @nr_vms: the number of areas to allocate

 * @align: alignment, all entries in @offsets and @sizes must be aligned to this

 * @gfp_mask: allocation mask

 *

 * Returns: kmalloc'd vm_struct pointer array pointing to allocated

 *	    vm_structs on success, %NULL on failure

 *

 * Percpu allocator wants to use congruent vm areas so that it can

 * maintain the offsets among percpu areas.  This function allocates

 * congruent vmalloc areas for it.  These areas tend to be scattered

 * pretty far, distance between two areas easily going up to

 * gigabytes.  To avoid interacting with regular vmallocs, these areas

 * are allocated from top.

 * congruent vmalloc areas for it with GFP_KERNEL.  These areas tend to

 * be scattered pretty far, distance between two areas easily going up

 * to gigabytes.  To avoid interacting with regular vmallocs, these

 * areas are allocated from top.

 *

 * Despite its complicated look, this allocator is rather simple.  It

 * does everything top-down and scans areas from the end looking for
@@ -2217,7 +2216,7 @@ static unsigned long pvm_determine_end(struct vmap_area **pnext, 
 */

struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,

				     const size_t *sizes, int nr_vms,

				     size_t align, gfp_t gfp_mask)

				     size_t align)

{

	const unsigned long vmalloc_start = ALIGN(VMALLOC_START, align);

	const unsigned long vmalloc_end = VMALLOC_END & ~(align - 1);
@@ -2227,8 +2226,6 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, 
	unsigned long base, start, end, last_end;

	bool purged = false;



	gfp_mask &= GFP_RECLAIM_MASK;



	/* verify parameters and allocate data structures */

	BUG_ON(align & ~PAGE_MASK || !is_power_of_2(align));

	for (last_area = 0, area = 0; area < nr_vms; area++) {
@@ -2261,14 +2258,14 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, 
		return NULL;

	}



	vms = kzalloc(sizeof(vms[0]) * nr_vms, gfp_mask);

	vas = kzalloc(sizeof(vas[0]) * nr_vms, gfp_mask);

	vms = kzalloc(sizeof(vms[0]) * nr_vms, GFP_KERNEL);

	vas = kzalloc(sizeof(vas[0]) * nr_vms, GFP_KERNEL);

	if (!vas || !vms)

		goto err_free;



	for (area = 0; area < nr_vms; area++) {

		vas[area] = kzalloc(sizeof(struct vmap_area), gfp_mask);

		vms[area] = kzalloc(sizeof(struct vm_struct), gfp_mask);

		vas[area] = kzalloc(sizeof(struct vmap_area), GFP_KERNEL);

		vms[area] = kzalloc(sizeof(struct vm_struct), GFP_KERNEL);

		if (!vas[area] || !vms[area])

			goto err_free;

	}