tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: 16K: Avoid conflicting __PAGE_SIZE in bpf/core

Browse Source 
Android uses __PAGE_SIZE for larger than 4KB base page size
emulation on x86_64.

Undef this to avoid conflicts with bpf core's usage of
__PAGE_SIZE.

Bug: 383389337
Bug: 383389337
Change-Id: Iae21f4bc7d0541687c98f0ac75ac93a6ed341bc7
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
Kalesh Singh
2025-04-30 12:57:42 -07:00
committed by Carlos Llamas
parent 778a447513
commit 1022438243
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/bpf/core.c
+9
View File
@@ -89,6 +89,15 @@ void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, uns
return NULL; return NULL;
} }
/*
* Android uses __PAGE_SIZE for larger than 4KB base page size emulation
* on x86_64. Undef this to avoid conflicts with bpf core's usage of
* __PAGE_SIZE in this compilation unit.
*/
#ifdef __PAGE_SIZE
#undef __PAGE_SIZE
#endif
/* tell bpf programs that include vmlinux.h kernel's PAGE_SIZE */ /* tell bpf programs that include vmlinux.h kernel's PAGE_SIZE */
enum page_size_enum { enum page_size_enum {
__PAGE_SIZE = PAGE_SIZE __PAGE_SIZE = PAGE_SIZE