mm-vmalloc-extend-find_vmap_lowest_match_check-with-extra-arguments.patch removed from -mm tree
The quilt patch titled
Subject: mm/vmalloc: extend find_vmap_lowest_match_check with extra arguments
has been removed from the -mm tree. Its filename was
mm-vmalloc-extend-find_vmap_lowest_match_check-with-extra-arguments.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Song Liu <[email protected]>
Subject: mm/vmalloc: extend find_vmap_lowest_match_check with extra arguments
Date: Tue, 30 Aug 2022 22:27:34 -0700
find_vmap_lowest_match() is now able to handle different roots. With DEBUG_AUGMENT_LOWEST_MATCH_CHECK enabled as:
: --- a/mm/vmalloc.c
: +++ b/mm/vmalloc.c
: @@ -713,7 +713,7 @@ EXPORT_SYMBOL(vmalloc_to_pfn); : /*** Global kva allocator ***/
:
: -#define DEBUG_AUGMENT_LOWEST_MATCH_CHECK 0 : +#define DEBUG_AUGMENT_LOWEST_MATCH_CHECK 1
compilation failed as:
mm/vmalloc.c: In function 'find_vmap_lowest_match_check':mm/vmalloc.c:1328:32: warning: passing argument 1 of 'find_vmap_lowest_match' makes pointer from integer without a cast [-Wint-conversion]
1328 | va_1 = find_vmap_lowest_match(size, align, vstart, false);
| ^~~~
| |
| long unsigned int
mm/vmalloc.c:1236:40: note: expected 'struct rb_root *' but argument is of type 'long unsigned int'
1236 | find_vmap_lowest_match(struct rb_root *root, unsigned long size,
| ~~~~~~~~~~~~~~~~^~~~
mm/vmalloc.c:1328:9: error: too few arguments to function 'find_vmap_lowest_match'
1328 | va_1 = find_vmap_lowest_match(size, align, vstart, false);
| ^~~~~~~~~~~~~~~~~~~~~~
mm/vmalloc.c:1236:1: note: declared here
1236 | find_vmap_lowest_match(struct rb_root *root, unsigned long size,
| ^~~~~~~~~~~~~~~~~~~~~~Extend find_vmap_lowest_match_check() and find_vmap_lowest_linear_match() with extra arguments to fix this.
---
mm/vmalloc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
mm/vmalloc.c renamed from mm/vmalloc.c~mm-vmalloc-extend-find_vmap_lowest_match_check-with-extra-arguments +7 -6
@@ -1300,12 +1300,12 @@ find_vmap_lowest_match(struct rb_root *r#include <linux/random.h> static struct vmap_area * -find_vmap_lowest_linear_match (unsigned long size, +find_vmap_lowest_linear_match (struct list_head *head,unsigned long size,unsigned long align,unsigned long vstart) {struct vmap_area *va; -list_for_each_entry (va, &free_vmap_area_list, list) { +list_for_each_entry (va, head, list) {if (!is_within_this_va (va, size, align, vstart))continue ;
@@ -1316,7 +1316,8 @@ find_vmap_lowest_linear_match(unsigned l }static void -find_vmap_lowest_match_check (unsigned long size,unsigned long align) +find_vmap_lowest_match_check (struct rb_root *root,struct list_head *head, +unsigned long size,unsigned long align) {struct vmap_area *va_1, *va_2;unsigned long vstart;
@@ -1325,8 +1326,8 @@ find_vmap_lowest_match_check(unsigned loget_random_bytes (&rnd,sizeof (rnd)); vstart =VMALLOC_START + rnd; - va_1 =find_vmap_lowest_match (size, align, vstart, false); - va_2 =find_vmap_lowest_linear_match (size, align, vstart); + va_1 =find_vmap_lowest_match (root, size, align, vstart, false); + va_2 =find_vmap_lowest_linear_match (head, size, align, vstart);if (va_1 != va_2) pr_emerg("not lowest: t: 0x%p, l: 0x%p, v: 0x%lx\n",
@@ -1513,7 +1514,7 @@ __alloc_vmap_area(struct rb_root *root,return vend;#if DEBUG_AUGMENT_LOWEST_MATCH_CHECK -find_vmap_lowest_match_check (size, align); +find_vmap_lowest_match_check (root, head, size, align);#endif return nva_start_addr;
_
Patches currently in -mm which might be from [email protected] are