Skip to contentSkip to conversation

kasan: hw_tags: include linux/vmalloc.h

PATCH In review Arnd Bergmann 3 participants 3 messages Apr 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kasan: hw_tags: include linux/vmalloc.h

From: Arnd Bergmann <[email protected]>

This header is no longer included implicitly and instead needs to be pulled in directly:

mm/kasan/hw_tags.c: In function 'unpoison_vmalloc_pages':
mm/kasan/hw_tags.c:280:16: error: implicit declaration of function 'find_vm_area'; did you mean 'find_vma_prev'? [-Werror=implicit-function-declaration]

  280 |         area = find_vm_area((void *)addr);
      |                ^~~~~~~~~~~~
      |                find_vma_prev

mm/kasan/hw_tags.c:280:14: error: assignment to 'struct vm_struct *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
280 | area = find_vm_area((void *)addr);
| ^
mm/kasan/hw_tags.c:284:29: error: invalid use of undefined type 'struct vm_struct'
284 | for (i = 0; i < area->nr_pages; i++) {
| ^~
mm/kasan/hw_tags.c:285:41: error: invalid use of undefined type 'struct vm_struct'
285 | struct page *page = area->pages[i];
| ^~

---
 mm/kasan/hw_tags.c | 1 +
 1 file changed, 1 insertion(+)
mm/kasan/hw_tags.c +1 -0
index 2b994092a2d4..9958ebc15d38 100644
@@ -16,6 +16,7 @@
 #include <linux/static_key.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/vmalloc.h>
 
 #include "kasan.h"
 
Signature · 1 line
2.39.2
maintainer
#1 lore raw
Quoted 10 lines · On Thu, 4 Apr 2024 14:44:30 +0200 Arnd Bergmann <[email protected]> wrote:

From: Arnd Bergmann <[email protected]>

This header is no longer included implicitly and instead needs to be pulled in directly:

mm/kasan/hw_tags.c: In function 'unpoison_vmalloc_pages':
mm/kasan/hw_tags.c:280:16: error: implicit declaration of function 'find_vm_area'; did you mean 'find_vma_prev'? [-Werror=implicit-function-declaration]

  280 |         area = find_vm_area((void *)addr);
      |                ^~~~~~~~~~~~
      |                find_vma_prev
Quoted 9 lines

mm/kasan/hw_tags.c:280:14: error: assignment to 'struct vm_struct *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
280 | area = find_vm_area((void *)addr);
| ^
mm/kasan/hw_tags.c:284:29: error: invalid use of undefined type 'struct vm_struct'
284 | for (i = 0; i < area->nr_pages; i++) {
| ^~
mm/kasan/hw_tags.c:285:41: error: invalid use of undefined type 'struct vm_struct'
285 | struct page *page = area->pages[i];
| ^~

Thanks, but I'd like to know which patch this patch is fixing, please. Is it mainline or linux-next? I'm suspecting it might be a fix for fix-missing-vmalloch-includes.patch but without knowing how to reproduce this I can't determine anything.

Quoted 9 lines
mm/kasan/hw_tags.c +1 -0
@@ -16,6 +16,7 @@
 #include <linux/static_key.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/vmalloc.h>
 
 #include "kasan.h"
#2 lore raw
Quoted 22 lines · Andrew Morton
Quoted 10 lines · On Thu, 4 Apr 2024 14:44:30 +0200 Arnd Bergmann <[email protected]> wrote:

From: Arnd Bergmann <[email protected]>

This header is no longer included implicitly and instead needs to be pulled in directly:

mm/kasan/hw_tags.c: In function 'unpoison_vmalloc_pages':
mm/kasan/hw_tags.c:280:16: error: implicit declaration of function 'find_vm_area'; did you mean 'find_vma_prev'? [-Werror=implicit-function-declaration]

  280 |         area = find_vm_area((void *)addr);
      |                ^~~~~~~~~~~~
      |                find_vma_prev
Quoted 9 lines

mm/kasan/hw_tags.c:280:14: error: assignment to 'struct vm_struct *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
280 | area = find_vm_area((void *)addr);
| ^
mm/kasan/hw_tags.c:284:29: error: invalid use of undefined type 'struct vm_struct'
284 | for (i = 0; i < area->nr_pages; i++) {
| ^~
mm/kasan/hw_tags.c:285:41: error: invalid use of undefined type 'struct vm_struct'
285 | struct page *page = area->pages[i];
| ^~

Quoted 4 lines

Thanks, but I'd like to know which patch this patch is fixing, please. Is it mainline or linux-next? I'm suspecting it might be a fix for fix-missing-vmalloch-includes.patch but without knowing how to reproduce this I can't determine anything.

It only showed up yesterday in linux-next. I thought about bisecting it but ended up not doing it as it seemed simple enough.

fix-missing-vmalloch-includes.patch looks like the right place to me, given both the timing and contents, so please fold my change into that.

Arnd