mm: vmalloc: Remove a global vmap_blocks xarray
Subsystems (3)
Uladzislau Rezki (Sony)
maintainerPATCH v4 1/2 mm: vmalloc: Remove a global vmap_blocks xarray
A global vmap_blocks-xarray array can be contented under heavy usage of the vm_map_ram()/vm_unmap_ram() APIs. The lock_stat shows that a "vmap_blocks.xa_lock" lock is a second in a top-list when it comes to contentions:
<snip>
----------------------------------------
class name con-bounces contentions ...
----------------------------------------vmap_area_lock: 2554079 2554276 ...
--------------
vmap_area_lock 1297948 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 vmap_area_lock 1256330 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 vmap_area_lock 1 [<00000000c95c05a7>] find_vm_area+0x16/0x70 -------------- vmap_area_lock 1738590 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 vmap_area_lock 815688 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 vmap_area_lock 1 [<00000000c1d619d7>] __get_vm_area_node+0xd2/0x170
vmap_blocks.xa_lock: 862689 862698 ...
-------------------
vmap_blocks.xa_lock 378418 [<00000000625a5626>] vm_map_ram+0x359/0x4a0 vmap_blocks.xa_lock 484280 [<00000000caa2ef03>] xa_erase+0xe/0x30 ------------------- vmap_blocks.xa_lock 576226 [<00000000caa2ef03>] xa_erase+0xe/0x30 vmap_blocks.xa_lock 286472 [<00000000625a5626>] vm_map_ram+0x359/0x4a0
...
<snip>
that is a result of running vm_map_ram()/vm_unmap_ram() in a loop. The test creates 64(on 64 CPUs system) threads and each one maps/unmaps 1 page.
After this change the "xa_lock" can be considered as a noise in the same test condition:
<snip>
...
&xa->xa_lock#1: 10333 10394 ...
--------------
&xa->xa_lock#1 5349 [<00000000bbbc9751>] xa_erase+0xe/0x30 &xa->xa_lock#1 5045 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 -------------- &xa->xa_lock#1 7326 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 &xa->xa_lock#1 3068 [<00000000bbbc9751>] xa_erase+0xe/0x30
...
<snip>
Running the test_vmalloc.sh run_test_mask=1024 nr_threads=64 nr_pages=5 shows around ~8 percent of throughput improvement of vm_map_ram() and vm_unmap_ram() APIs.
This patch does not fix vmap_area_lock/free_vmap_area_lock and purge_vmap_area_lock bottle-necks, it is rather a separate rework.
v1 - v2:
- Add more comments(Andrew Morton req.)
- Switch to WARN_ON_ONCE(Lorenzo Stoakes req.)
v2 -> v3:
- Fix a kernel-doc complain(Matthew Wilcox)
v3 -> v4:
- Improve comments about hashing logic(Lorenzo Stoakes)
- Improve code design(Lorenzo Stoakes)
- Keep the addr_to_vb_idx() func. to cut index length(Baoquan He)
--- mm/vmalloc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 8 deletions(-)
mm/vmalloc.c +63 -8
@@ -1911,6 +1911,13 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr)struct vmap_block_queue {spinlock_t lock;struct list_head free; + +/* +* An xarray requires an extra memory dynamically to +* be allocated. If it is an issue, we can use rb-tree +* instead. +*/ +struct xarray vmap_blocks; };struct vmap_block {
@@ -1928,11 +1935,48 @@ struct vmap_block { static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue);/* -* XArray of vmap blocks, indexed by address, to quickly find a vmap block -* in the free path. Could get rid of this if we change the API to return a -* "cookie" from alloc, to be passed to free. But no big deal yet. +* In order to fast access to any "vmap_block" associated with a +* specific address, we use a hash. +* +* A per-cpu vmap_block_queue is used in both ways, to serialize +* an access to free block chains among CPUs(alloc path) and it +* also acts as a vmap_block hash(alloc/free paths). It means we +* overload it, since we already have the per-cpu array which is +* used as a hash table. When used as a hash a 'cpu' passed to +* per_cpu() is not actually a CPU but rather a hash index. +* +* A hash function is addr_to_vb_xarray() which hashes any address +* to a specific index(in a hash) it belongs to. This then uses a +* per_cpu() macro to access an array with generated index. +* +* An example: +* +* CPU_1 CPU_2 CPU_0 +* | | | +* V V V +* 0 10 20 30 40 50 60 +* |------|------|------|------|------|------|...<vmap address space> +* CPU0 CPU1 CPU2 CPU0 CPU1 CPU2 +* +* - CPU_1 invokes vm_unmap_ram(6), 6 belongs to CPU0 zone, thus +* it access: CPU0/INDEX0 -> vmap_blocks -> xa_lock; +* +* - CPU_2 invokes vm_unmap_ram(11), 11 belongs to CPU1 zone, thus +* it access: CPU1/INDEX1 -> vmap_blocks -> xa_lock; +* +* - CPU_0 invokes vm_unmap_ram(20), 20 belongs to CPU2 zone, thus +* it access: CPU2/INDEX2 -> vmap_blocks -> xa_lock. +* +* This technique almost always avoids lock contention on insert/remove, +* however xarray spinlocks protect against any contention that remains. */ -static DEFINE_XARRAY (vmap_blocks); +static struct xarray * +addr_to_vb_xarray (unsigned long addr) +{ +int index = (addr /VMAP_BLOCK_SIZE ) %num_possible_cpus (); + +return &per_cpu (vmap_block_queue, index).vmap_blocks; +}/* * We should probably have a fallback mechanism to allocate virtual memory
@@ -1970,6 +2014,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)struct vmap_block_queue *vbq;struct vmap_block *vb;struct vmap_area *va; +struct xarray *xa;unsigned long vb_idx;int node, err;void *vaddr;
@@ -2003,8 +2048,9 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)bitmap_set (vb->used_map,0 , (1UL << order));INIT_LIST_HEAD (&vb->free_list); + xa =addr_to_vb_xarray (va->va_start); vb_idx =addr_to_vb_idx (va->va_start); - err =xa_insert (&vmap_blocks, vb_idx, vb, gfp_mask); + err =xa_insert (xa, vb_idx, vb, gfp_mask);if (err) {kfree (vb);free_vmap_area (va);
@@ -2022,8 +2068,10 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)static void free_vmap_block (struct vmap_block *vb) {struct vmap_block *tmp; +struct xarray *xa; - tmp =xa_erase (&vmap_blocks,addr_to_vb_idx (vb->va->va_start)); + xa =addr_to_vb_xarray (vb->va->va_start); + tmp =xa_erase (xa,addr_to_vb_idx (vb->va->va_start));BUG_ON (tmp != vb);spin_lock (&vmap_area_lock);
@@ -2135,6 +2183,7 @@ static void vb_free(unsigned long addr, unsigned long size)unsigned long offset;unsigned int order;struct vmap_block *vb; +struct xarray *xa;BUG_ON (offset_in_page (size));BUG_ON (size >PAGE_SIZE *VMAP_MAX_ALLOC );
@@ -2143,7 +2192,10 @@ static void vb_free(unsigned long addr, unsigned long size) order =get_order (size); offset = (addr & (VMAP_BLOCK_SIZE -1 )) >>PAGE_SHIFT ; - vb =xa_load (&vmap_blocks,addr_to_vb_idx (addr)); + + xa =addr_to_vb_xarray (addr); + vb =xa_load (xa,addr_to_vb_idx (addr)); +spin_lock (&vb->lock);bitmap_clear (vb->used_map, offset, (1UL << order));spin_unlock (&vb->lock);
@@ -3486,6 +3538,7 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags {char *start;struct vmap_block *vb; +struct xarray *xa;unsigned long offset;unsigned int rs, re, n;
@@ -3503,7 +3556,8 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags* Area is split into regions and tracked with vmap_block, read out * each region and zero fill the hole between regions. */ - vb =xa_load (&vmap_blocks,addr_to_vb_idx ((unsigned long )addr)); + xa =addr_to_vb_xarray ((unsigned long ) addr); + vb =xa_load (xa,addr_to_vb_idx ((unsigned long )addr));if (!vb) goto finished;
@@ -4272,6 +4326,7 @@ void __init vmalloc_init(void) p = &per_cpu (vfree_deferred, i);init_llist_head (&p->list);INIT_WORK (&p->wq, delayed_vfree_work); +xa_init (&vbq->vmap_blocks); }/* Import existing vmlist entries. */
Signature · 1 line
2.30.2
Uladzislau Rezki (Sony)
maintainerPATCH v4 2/2 lib/test_vmalloc.c: Add vm_map_ram()/vm_unmap_ram() test case
Add vm_map_ram()/vm_unmap_ram() test case to our stress test-suite.
--- lib/test_vmalloc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
lib/test_vmalloc.c +37 -0
@@ -53,6 +53,7 @@ __param(int, run_test_mask, INT_MAX,"\t\tid: 128, name: pcpu_alloc_test\n" "\t\tid: 256, name: kvfree_rcu_1_arg_vmalloc_test\n" "\t\tid: 512, name: kvfree_rcu_2_arg_vmalloc_test\n" +"\t\tid: 1024, name: vm_map_ram_test\n" /* Add a new test case description here. */ );
@@ -358,6 +359,41 @@ kvfree_rcu_2_arg_vmalloc_test(void)return 0 ; } +static int +vm_map_ram_test (void ) +{ +unsigned long nr_allocated; +unsigned int map_nr_pages; +unsigned char *v_ptr; +struct page **pages; +int i; + + map_nr_pages = nr_pages >0 ? nr_pages:1 ; + pages =kmalloc (map_nr_pages *sizeof (struct page ),GFP_KERNEL ); +if (!pages) +return -1 ; + + nr_allocated =alloc_pages_bulk_array (GFP_KERNEL , map_nr_pages, pages); +if (nr_allocated != map_nr_pages) + goto cleanup; + +/* Run the test loop. */ +for (i =0 ; i < test_loop_count; i++) { + v_ptr =vm_map_ram (pages, map_nr_pages,NUMA_NO_NODE ); + *v_ptr ='a' ; +vm_unmap_ram (v_ptr, map_nr_pages); + } + +cleanup: +for (i =0 ; i < nr_allocated; i++) +__free_page (pages[i]); + +kfree (pages); + +/* 0 indicates success. */ +return nr_allocated != map_nr_pages; +} +struct test_case_desc {const char *test_name;int (*test_func)(void );
@@ -374,6 +410,7 @@ static struct test_case_desc test_case_array[] = { { "pcpu_alloc_test", pcpu_alloc_test }, { "kvfree_rcu_1_arg_vmalloc_test", kvfree_rcu_1_arg_vmalloc_test }, { "kvfree_rcu_2_arg_vmalloc_test", kvfree_rcu_2_arg_vmalloc_test }, + { "vm_map_ram_test", vm_map_ram_test }, /* Add a new test case here. */ };
Signature · 1 line
2.30.2
Re: [PATCH v4 2/2] lib/test_vmalloc.c: Add vm_map_ram()/vm_unmap_ram() test case
Quoted 30 lines · Uladzislau Rezki (Sony)
Add vm_map_ram()/vm_unmap_ram() test case to our stress test-suite.
Signed-off-by Uladzislau Rezki (Sony) <[email protected]>--- lib/test_vmalloc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)lib/test_vmalloc.c +8
-0@@ -53,6 +53,7 @@ __param(int, run_test_mask, INT_MAX,"\t\tid: 128, name: pcpu_alloc_test\n" "\t\tid: 256, name: kvfree_rcu_1_arg_vmalloc_test\n" "\t\tid: 512, name: kvfree_rcu_2_arg_vmalloc_test\n" +"\t\tid: 1024, name: vm_map_ram_test\n" /* Add a new test case description here. */ );@@ -358,6 +359,41 @@ kvfree_rcu_2_arg_vmalloc_test(void)return 0 ; } +static int +vm_map_ram_test (void ) +{ +unsigned long nr_allocated; +unsigned int map_nr_pages; +unsigned char *v_ptr; +struct page **pages;
lib/test_vmalloc.c kvfree_rcu_2_arg_vmalloc_test(void) · line 378
Quoted 10 lines
lib/test_vmalloc.c +10
-0+int i; + + map_nr_pages = nr_pages >0 ? nr_pages:1 ; + pages =kmalloc (map_nr_pages *sizeof (struct page ),GFP_KERNEL ); +if (!pages) +return -1 ; + + nr_allocated =alloc_pages_bulk_array (GFP_KERNEL , map_nr_pages, pages); +if (nr_allocated != map_nr_pages) + goto cleanup;
Nitty, but there's a whitespace error here, need to convert to tabs :)
Quoted 30 lines
lib/test_vmalloc.c +19
-1+ +/* Run the test loop. */ +for (i =0 ; i < test_loop_count; i++) { + v_ptr =vm_map_ram (pages, map_nr_pages,NUMA_NO_NODE ); + *v_ptr ='a' ; +vm_unmap_ram (v_ptr, map_nr_pages); + } + +cleanup: +for (i =0 ; i < nr_allocated; i++) +__free_page (pages[i]); + +kfree (pages); + +/* 0 indicates success. */ +return nr_allocated != map_nr_pages; +} +struct test_case_desc {const char *test_name;int (*test_func)(void );@@ -374,6 +410,7 @@ static struct test_case_desc test_case_array[] = { { "pcpu_alloc_test", pcpu_alloc_test }, { "kvfree_rcu_1_arg_vmalloc_test", kvfree_rcu_1_arg_vmalloc_test }, { "kvfree_rcu_2_arg_vmalloc_test", kvfree_rcu_2_arg_vmalloc_test }, + { "vm_map_ram_test", vm_map_ram_test }, /* Add a new test case here. */ }; --
Quoted 2 lines
2.30.2
Other than the nit,
Re: [PATCH v4 2/2] lib/test_vmalloc.c: Add vm_map_ram()/vm_unmap_ram() test case
In reply to Uladzislau Rezki (Sony)Quoted 62 lines · Uladzislau Rezki (Sony)
Add vm_map_ram()/vm_unmap_ram() test case to our stress test-suite.
Signed-off-by Uladzislau Rezki (Sony) <[email protected]>--- lib/test_vmalloc.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)lib/test_vmalloc.c +36
-0@@ -53,6 +53,7 @@ __param(int, run_test_mask, INT_MAX,"\t\tid: 128, name: pcpu_alloc_test\n" "\t\tid: 256, name: kvfree_rcu_1_arg_vmalloc_test\n" "\t\tid: 512, name: kvfree_rcu_2_arg_vmalloc_test\n" +"\t\tid: 1024, name: vm_map_ram_test\n" /* Add a new test case description here. */ );@@ -358,6 +359,41 @@ kvfree_rcu_2_arg_vmalloc_test(void)return 0 ; } +static int +vm_map_ram_test (void ) +{ +unsigned long nr_allocated; +unsigned int map_nr_pages; +unsigned char *v_ptr; +struct page **pages; +int i; + + map_nr_pages = nr_pages >0 ? nr_pages:1 ; + pages =kmalloc (map_nr_pages *sizeof (struct page ),GFP_KERNEL ); +if (!pages) +return -1 ; + + nr_allocated =alloc_pages_bulk_array (GFP_KERNEL , map_nr_pages, pages); +if (nr_allocated != map_nr_pages) + goto cleanup; + +/* Run the test loop. */ +for (i =0 ; i < test_loop_count; i++) { + v_ptr =vm_map_ram (pages, map_nr_pages,NUMA_NO_NODE ); + *v_ptr ='a' ; +vm_unmap_ram (v_ptr, map_nr_pages); + } + +cleanup: +for (i =0 ; i < nr_allocated; i++) +__free_page (pages[i]); + +kfree (pages); + +/* 0 indicates success. */ +return nr_allocated != map_nr_pages; +} +struct test_case_desc {const char *test_name;int (*test_func)(void );
lib/test_vmalloc.c static struct test_case_desc test_case_array[] = { · line 415
Quoted 6 lines
lib/test_vmalloc.c +1
-0@@ -374,6 +410,7 @@ static struct test_case_desc test_case_array[] = { { "pcpu_alloc_test", pcpu_alloc_test }, { "kvfree_rcu_1_arg_vmalloc_test", kvfree_rcu_1_arg_vmalloc_test }, { "kvfree_rcu_2_arg_vmalloc_test", kvfree_rcu_2_arg_vmalloc_test }, + { "vm_map_ram_test", vm_map_ram_test }, /* Add a new test case here. */ };
Quoted 221 lines · Uladzislau Rezki (Sony)
A global vmap_blocks-xarray array can be contented under heavy usage of the vm_map_ram()/vm_unmap_ram() APIs. The
lock_statshows that a "vmap_blocks.xa_lock" lock is a second in a top-list when it comes to contentions:<snip>
----------------------------------------
class name con-bounces contentions ...
----------------------------------------vmap_area_lock: 2554079 2554276 ...
--------------vmap_area_lock 1297948 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 vmap_area_lock 1256330 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 vmap_area_lock 1 [<00000000c95c05a7>] find_vm_area+0x16/0x70 -------------- vmap_area_lock 1738590 [<00000000dd41cbaa>] alloc_vmap_area+0x1c7/0x910 vmap_area_lock 815688 [<000000009d927bf3>] free_vmap_block+0x4a/0xe0 vmap_area_lock 1 [<00000000c1d619d7>] __get_vm_area_node+0xd2/0x170vmap_blocks.xa_lock: 862689 862698 ...
-------------------vmap_blocks.xa_lock 378418 [<00000000625a5626>] vm_map_ram+0x359/0x4a0 vmap_blocks.xa_lock 484280 [<00000000caa2ef03>] xa_erase+0xe/0x30 ------------------- vmap_blocks.xa_lock 576226 [<00000000caa2ef03>] xa_erase+0xe/0x30 vmap_blocks.xa_lock 286472 [<00000000625a5626>] vm_map_ram+0x359/0x4a0...
<snip>that is a result of running vm_map_ram()/vm_unmap_ram() in a loop. The test creates 64(on 64 CPUs system) threads and each one maps/unmaps 1 page.
After this change the "
xa_lock" can be considered as a noise in the same test condition:<snip>
...
&xa->xa_lock#1: 10333 10394 ...
--------------&xa->xa_lock#1 5349 [<00000000bbbc9751>] xa_erase+0xe/0x30 &xa->xa_lock#1 5045 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 -------------- &xa->xa_lock#1 7326 [<0000000018def45d>] vm_map_ram+0x3a4/0x4f0 &xa->xa_lock#1 3068 [<00000000bbbc9751>] xa_erase+0xe/0x30...
<snip>Running the
test_vmalloc.shrun_test_mask=1024 nr_threads=64 nr_pages=5 shows around ~8 percent of throughput improvement ofvm_map_ram()andvm_unmap_ram()APIs.This patch does not fix vmap_area_lock/free_vmap_area_lock and
purge_vmap_area_lockbottle-necks, it is rather a separate rework.v1 - v2:
- Add more comments(Andrew Morton req.)
- Switch toWARN_ON_ONCE(Lorenzo Stoakes req.)v2 -> v3:
- Fix a kernel-doc complain(Matthew Wilcox)v3 -> v4:
- Improve comments about hashing logic(Lorenzo Stoakes)
- Improve code design(Lorenzo Stoakes)
- Keep theaddr_to_vb_idx()func. to cut index length(Baoquan He)Signed-off-by Uladzislau Rezki (Sony) <[email protected]>--- mm/vmalloc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 8 deletions(-)mm/vmalloc.c +63
-9@@ -1911,6 +1911,13 @@ static struct vmap_area *find_unlink_vmap_area(unsigned long addr)struct vmap_block_queue {spinlock_t lock;struct list_head free; + +/* +* An xarray requires an extra memory dynamically to +* be allocated. If it is an issue, we can use rb-tree +* instead. +*/ +struct xarray vmap_blocks; };struct vmap_block {@@ -1928,11 +1935,48 @@ struct vmap_block { static DEFINE_PER_CPU(struct vmap_block_queue, vmap_block_queue);/* -* XArray of vmap blocks, indexed by address, to quickly find a vmap block -* in the free path. Could get rid of this if we change the API to return a -* "cookie" from alloc, to be passed to free. But no big deal yet. +* In order to fast access to any "vmap_block" associated with a +* specific address, we use a hash. +* +* A per-cpu vmap_block_queue is used in both ways, to serialize +* an access to free block chains among CPUs(alloc path) and it +* also acts as a vmap_block hash(alloc/free paths). It means we +* overload it, since we already have the per-cpu array which is +* used as a hash table. When used as a hash a 'cpu' passed to +* per_cpu() is not actually a CPU but rather a hash index. +* +* A hash function is addr_to_vb_xarray() which hashes any address +* to a specific index(in a hash) it belongs to. This then uses a +* per_cpu() macro to access an array with generated index. +* +* An example: +* +* CPU_1 CPU_2 CPU_0 +* | | | +* V V V +* 0 10 20 30 40 50 60 +* |------|------|------|------|------|------|...<vmap address space> +* CPU0 CPU1 CPU2 CPU0 CPU1 CPU2 +* +* - CPU_1 invokes vm_unmap_ram(6), 6 belongs to CPU0 zone, thus +* it access: CPU0/INDEX0 -> vmap_blocks -> xa_lock; +* +* - CPU_2 invokes vm_unmap_ram(11), 11 belongs to CPU1 zone, thus +* it access: CPU1/INDEX1 -> vmap_blocks -> xa_lock; +* +* - CPU_0 invokes vm_unmap_ram(20), 20 belongs to CPU2 zone, thus +* it access: CPU2/INDEX2 -> vmap_blocks -> xa_lock. +* +* This technique almost always avoids lock contention on insert/remove, +* however xarray spinlocks protect against any contention that remains. */ -static DEFINE_XARRAY (vmap_blocks); +static struct xarray * +addr_to_vb_xarray (unsigned long addr) +{ +int index = (addr /VMAP_BLOCK_SIZE ) %num_possible_cpus (); + +return &per_cpu (vmap_block_queue, index).vmap_blocks; +}/* * We should probably have a fallback mechanism to allocate virtual memory @@ -1970,6 +2014,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)struct vmap_block_queue *vbq;struct vmap_block *vb;struct vmap_area *va; +struct xarray *xa;unsigned long vb_idx;int node, err;void *vaddr;@@ -2003,8 +2048,9 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)bitmap_set (vb->used_map,0 , (1UL << order));INIT_LIST_HEAD (&vb->free_list); + xa =addr_to_vb_xarray (va->va_start); vb_idx =addr_to_vb_idx (va->va_start); - err =xa_insert (&vmap_blocks, vb_idx, vb, gfp_mask); + err =xa_insert (xa, vb_idx, vb, gfp_mask);if (err) {kfree (vb);free_vmap_area (va);@@ -2022,8 +2068,10 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)static void free_vmap_block (struct vmap_block *vb) {struct vmap_block *tmp; +struct xarray *xa; - tmp =xa_erase (&vmap_blocks,addr_to_vb_idx (vb->va->va_start)); + xa =addr_to_vb_xarray (vb->va->va_start); + tmp =xa_erase (xa,addr_to_vb_idx (vb->va->va_start));BUG_ON (tmp != vb);spin_lock (&vmap_area_lock);@@ -2135,6 +2183,7 @@ static void vb_free(unsigned long addr, unsigned long size)unsigned long offset;unsigned int order;struct vmap_block *vb; +struct xarray *xa;BUG_ON (offset_in_page (size));BUG_ON (size >PAGE_SIZE *VMAP_MAX_ALLOC );@@ -2143,7 +2192,10 @@ static void vb_free(unsigned long addr, unsigned long size) order =get_order (size); offset = (addr & (VMAP_BLOCK_SIZE -1 )) >>PAGE_SHIFT ; - vb =xa_load (&vmap_blocks,addr_to_vb_idx (addr)); + + xa =addr_to_vb_xarray (addr); + vb =xa_load (xa,addr_to_vb_idx (addr)); +spin_lock (&vb->lock);bitmap_clear (vb->used_map, offset, (1UL << order));spin_unlock (&vb->lock);@@ -3486,6 +3538,7 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags {char *start;struct vmap_block *vb; +struct xarray *xa;unsigned long offset;unsigned int rs, re, n;@@ -3503,7 +3556,8 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags* Area is split into regions and tracked with vmap_block, read out * each region and zero fill the hole between regions. */ - vb =xa_load (&vmap_blocks,addr_to_vb_idx ((unsigned long )addr)); + xa =addr_to_vb_xarray ((unsigned long ) addr); + vb =xa_load (xa,addr_to_vb_idx ((unsigned long )addr));if (!vb) goto finished;@@ -4272,6 +4326,7 @@ void __init vmalloc_init(void) p = &per_cpu (vfree_deferred, i);init_llist_head (&p->list);INIT_WORK (&p->wq, delayed_vfree_work); +xa_init (&vbq->vmap_blocks); }/* Import existing vmlist entries. */ --
Quoted 2 lines
2.30.2
Very nice!
On 03/30/23 at 09:06pm, Uladzislau Rezki (Sony) wrote:
......
mm/vmalloc.c struct vmap_block { · line 1974
Quoted 3 lines
mm/vmalloc.c +2
-1-static DEFINE_XARRAY (vmap_blocks); +static struct xarray * +addr_to_vb_xarray (unsigned long addr)
I would call it addr_to_vb_xa() if other parts have taken abbreviation.
Other than this nit, this looks great to me.
Quoted 88 lines
mm/vmalloc.c +20
-4+{ +int index = (addr /VMAP_BLOCK_SIZE ) %num_possible_cpus (); + +return &per_cpu (vmap_block_queue, index).vmap_blocks; +}/* * We should probably have a fallback mechanism to allocate virtual memory @@ -1970,6 +2014,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)struct vmap_block_queue *vbq;struct vmap_block *vb;struct vmap_area *va; +struct xarray *xa;unsigned long vb_idx;int node, err;void *vaddr;@@ -2003,8 +2048,9 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)bitmap_set (vb->used_map,0 , (1UL << order));INIT_LIST_HEAD (&vb->free_list); + xa =addr_to_vb_xarray (va->va_start); vb_idx =addr_to_vb_idx (va->va_start); - err =xa_insert (&vmap_blocks, vb_idx, vb, gfp_mask); + err =xa_insert (xa, vb_idx, vb, gfp_mask);if (err) {kfree (vb);free_vmap_area (va);@@ -2022,8 +2068,10 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)static void free_vmap_block (struct vmap_block *vb) {struct vmap_block *tmp; +struct xarray *xa; - tmp =xa_erase (&vmap_blocks,addr_to_vb_idx (vb->va->va_start)); + xa =addr_to_vb_xarray (vb->va->va_start); + tmp =xa_erase (xa,addr_to_vb_idx (vb->va->va_start));BUG_ON (tmp != vb);spin_lock (&vmap_area_lock);@@ -2135,6 +2183,7 @@ static void vb_free(unsigned long addr, unsigned long size)unsigned long offset;unsigned int order;struct vmap_block *vb; +struct xarray *xa;BUG_ON (offset_in_page (size));BUG_ON (size >PAGE_SIZE *VMAP_MAX_ALLOC );@@ -2143,7 +2192,10 @@ static void vb_free(unsigned long addr, unsigned long size) order =get_order (size); offset = (addr & (VMAP_BLOCK_SIZE -1 )) >>PAGE_SHIFT ; - vb =xa_load (&vmap_blocks,addr_to_vb_idx (addr)); + + xa =addr_to_vb_xarray (addr); + vb =xa_load (xa,addr_to_vb_idx (addr)); +spin_lock (&vb->lock);bitmap_clear (vb->used_map, offset, (1UL << order));spin_unlock (&vb->lock);@@ -3486,6 +3538,7 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags {char *start;struct vmap_block *vb; +struct xarray *xa;unsigned long offset;unsigned int rs, re, n;@@ -3503,7 +3556,8 @@ static void vmap_ram_vread(char *buf, char *addr, int count, unsigned long flags* Area is split into regions and tracked with vmap_block, read out * each region and zero fill the hole between regions. */ - vb =xa_load (&vmap_blocks,addr_to_vb_idx ((unsigned long )addr)); + xa =addr_to_vb_xarray ((unsigned long ) addr); + vb =xa_load (xa,addr_to_vb_idx ((unsigned long )addr));if (!vb) goto finished;@@ -4272,6 +4326,7 @@ void __init vmalloc_init(void) p = &per_cpu (vfree_deferred, i);init_llist_head (&p->list);INIT_WORK (&p->wq, delayed_vfree_work); +xa_init (&vbq->vmap_blocks); }/* Import existing vmlist entries. */ Signature · 1 line
2.30.2