Commit 53f06cc3 authored by Uladzislau Rezki (Sony)'s avatar Uladzislau Rezki (Sony) Committed by Peng Zhang
Browse files

mm: vmalloc: move vmap_init_free_space() down in vmalloc.c 

mainline inclusion
from mainline-v6.9-rc1
commit 7fa8cee003166ef6db0bba70d610dbf173543811
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9CHG1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7fa8cee003166ef6db0bba70d610dbf173543811

-------------------------------------------------

A vmap_init_free_space() is a function that setups a vmap space and is
considered as part of initialization phase.  Since a main entry which is
vmalloc_init(), has been moved down in vmalloc.c it makes sense to follow
the pattern.

There is no a functional change as a result of this patch.

Link: https://lkml.kernel.org/r/20240102184633.748113-4-urezki@gmail.com


Signed-off-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLorenzo Stoakes <lstoakes@gmail.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Cc: Kazuhito Hagio <k-hagio-ab@nec.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sony.com>
Cc: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 7fa8cee003166ef6db0bba70d610dbf173543811)
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent bf24196d

mm/vmalloc.c

+41 −41
Original line number Diff line number Diff line
@@ -2584,47 +2584,6 @@ void __init vm_area_register_early(struct vm_struct *vm, size_t align) 
	kasan_populate_early_vm_area_shadow(vm->addr, vm->size);

}



static void vmap_init_free_space(void)

{

	unsigned long vmap_start = 1;

	const unsigned long vmap_end = ULONG_MAX;

	struct vmap_area *busy, *free;



	/*

	 *     B     F     B     B     B     F

	 * -|-----|.....|-----|-----|-----|.....|-

	 *  |           The KVA space           |

	 *  |<--------------------------------->|

	 */

	list_for_each_entry(busy, &vmap_area_list, list) {

		if (busy->va_start - vmap_start > 0) {

			free = kmem_cache_zalloc(vmap_area_cachep, GFP_NOWAIT);

			if (!WARN_ON_ONCE(!free)) {

				free->va_start = vmap_start;

				free->va_end = busy->va_start;



				insert_vmap_area_augment(free, NULL,

					&free_vmap_area_root,

						&free_vmap_area_list);

			}

		}



		vmap_start = busy->va_end;

	}



	if (vmap_end - vmap_start > 0) {

		free = kmem_cache_zalloc(vmap_area_cachep, GFP_NOWAIT);

		if (!WARN_ON_ONCE(!free)) {

			free->va_start = vmap_start;

			free->va_end = vmap_end;



			insert_vmap_area_augment(free, NULL,

				&free_vmap_area_root,

					&free_vmap_area_list);

		}

	}

}



static inline void setup_vmalloc_vm_locked(struct vm_struct *vm,

	struct vmap_area *va, unsigned long flags, const void *caller)

{
@@ -4743,6 +4702,47 @@ module_init(proc_vmalloc_init); 


#endif



static void vmap_init_free_space(void)

{

	unsigned long vmap_start = 1;

	const unsigned long vmap_end = ULONG_MAX;

	struct vmap_area *busy, *free;



	/*

	 *     B     F     B     B     B     F

	 * -|-----|.....|-----|-----|-----|.....|-

	 *  |           The KVA space           |

	 *  |<--------------------------------->|

	 */

	list_for_each_entry(busy, &vmap_area_list, list) {

		if (busy->va_start - vmap_start > 0) {

			free = kmem_cache_zalloc(vmap_area_cachep, GFP_NOWAIT);

			if (!WARN_ON_ONCE(!free)) {

				free->va_start = vmap_start;

				free->va_end = busy->va_start;



				insert_vmap_area_augment(free, NULL,

					&free_vmap_area_root,

						&free_vmap_area_list);

			}

		}



		vmap_start = busy->va_end;

	}



	if (vmap_end - vmap_start > 0) {

		free = kmem_cache_zalloc(vmap_area_cachep, GFP_NOWAIT);

		if (!WARN_ON_ONCE(!free)) {

			free->va_start = vmap_start;

			free->va_end = vmap_end;



			insert_vmap_area_augment(free, NULL,

				&free_vmap_area_root,

					&free_vmap_area_list);

		}

	}

}



void __init vmalloc_init(void)

{

	struct vmap_area *va;