perf test amd ibs: avoid using executable heap
Subsystems (2)
PATCH v2 1/1 perf test amd ibs: avoid using executable heap
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the malloc()
+ mprotect() combo with just mmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem" permission under SELinux (things like JIT or regex compilation need it as well). mmap() with MAP_ANONYMOUS will give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without a memset() or the page-alignment dance.
Verified that the test still passes on a machine with an AMD CPU that has the "ibs" CPU flag.
---
v2: fix mmap() failure check (found by sashiko-bot)
tools/perf/arch/x86/tests/amd-ibs-period.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
tools/perf/arch/x86/tests/amd-ibs-period.c +6 -14
@@ -46,7 +46,6 @@ static int dummy_workload_1(unsigned long count) {int (*func)(void );int ret =0 ; -char *p;char insn1[] = {0xb8 ,0x01 ,0x00 ,0x00 ,0x00 ,/* mov 1,%eax */ 0xc3 ,/* ret */
@@ -59,18 +58,11 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); -return 1 ; - } - - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); - - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); -if (ret) { -printf ("mprotect() failed. %m" ); - goto out; + func =mmap (NULL , page_size,PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (func ==MAP_FAILED ) { +pr_debug ("mmap() failed. %m\n" ); +return -1 ; }if (count <100000 )
@@ -93,7 +85,7 @@ static int dummy_workload_1(unsigned long count) } out: -free (p); +munmap (func, page_size);return ret; }
Signature · 1 line
2.54.0
[email protected]
AI reviewSashiko has reviewed this patch and found no issues. It looks great!
Quoted 9 lines
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the
malloc()
+mprotect()combo with justmmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem" permission under SELinux (things like JIT or regex compilation need it as well).mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
Quoted 5 lines
Verified that the test still passes on a machine with an AMD CPU that has the "ibs" CPU flag.
Fixes 35db59fa8ea2 ("perf test amd ibs: Add sample period unit test")Signed-off-by Ondrej Mosnacek <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 4 lines · Ondrej Mosnacek
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the
malloc()
+mprotect()combo with justmmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem"
I do not understand. Ultimately malloc() will have to use mmap() to get the memory too. So how is malloc() + mprotect() considered more dangerous?
Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
I would argue that having RWX is a problem, you really want RW->RO->RX transitions, so even with mmap() you want to combine with mprotect().
Obviously this doesn't matter for this test case, but any halfway sane JIT should really avoid keeping RWX mappings around.
Quoted 5 lines
Verified that the test still passes on a machine with an AMD CPU that has the "ibs" CPU flag.
Fixes 35db59fa8ea2 ("perf test amd ibs: Add sample period unit test")Signed-off-by Ondrej Mosnacek <[email protected]>
The patch is obviously good, simpler is more better and all that. But the justification really smells.
If and when we get AMD to support IBT, this thing will need more changes, but alas.
Quoted 55 lines
---
v2: fix
mmap()failure check (found by sashiko-bot)tools/perf/arch/x86/tests/amd-ibs-period.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)tools/perf/arch/x86/tests/amd-ibs-period.c +6
-14@@ -46,7 +46,6 @@ static int dummy_workload_1(unsigned long count) {int (*func)(void );int ret =0 ; -char *p;char insn1[] = {0xb8 ,0x01 ,0x00 ,0x00 ,0x00 ,/* mov 1,%eax */ 0xc3 ,/* ret */ @@ -59,18 +58,11 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); -return 1 ; - } - - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); - - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); -if (ret) { -printf ("mprotect() failed. %m" ); - goto out; + func =mmap (NULL , page_size,PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (func ==MAP_FAILED ) { +pr_debug ("mmap() failed. %m\n" ); +return -1 ; }if (count <100000 )@@ -93,7 +85,7 @@ static int dummy_workload_1(unsigned long count) } out: -free (p); +munmap (func, page_size);return ret; }Signature · 1 line
2.54.0
Hi Peter, Ondrej,
Quoted 7 lines
Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.I would argue that having RWX is a problem, you really want
RW->RO->RXtransitions, so even withmmap()you want to combine withmprotect().
My original intent for using RWX was to generate sufficient Icache miss samples for the IBS Fetch unit by overwriting the code prior to execution. I am wondering whether it would be possible to achieve the same result by using CLFLUSH with RX permissions. Something like below (build tested only).
tools/perf/arch/x86/tests/amd-ibs-period.c +27 -11
@@ -25,6 +25,7 @@ static int page_size;#define PERF_MMAP_TOTAL_PAGES (PERF_MMAP_DATA_PAGES + 1)#define PERF_MMAP_TOTAL_SIZE (PERF_MMAP_TOTAL_PAGES * page_size) +#define mb () asm volatile("mfence":::"memory")#define rmb () asm volatile("lfence":::"memory")enum {
@@ -41,10 +42,16 @@ struct perf_pmu *fetch_pmu;struct perf_pmu *op_pmu;unsigned int perf_event_max_sample_rate; +static inline void clflush (const volatile void *p) +{ + asmvolatile ("clflush (%0)" ::"r" (p) :"memory" ); +} +/* Dummy workload to generate IBS samples. */ static int dummy_workload_1 (unsigned long count) { -int (*func)(void ); +int (*func1)(void ); +int (*func2)(void );int ret =0 ;char *p;char insn1[] = {
@@ -59,33 +66,42 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); + + p =mmap (NULL , page_size,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (p ==MAP_FAILED ) { +printf ("mmap() failed. %m" );return 1 ; } - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); +memcpy (p, insn1,sizeof (insn1)); +memcpy (p +128 , insn2,sizeof (insn2)); - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); + ret =mprotect (p, page_size,PROT_READ |PROT_EXEC );if (ret) {printf ("mprotect() failed. %m" ); goto out; } + func1 = (void *)(p); + func2 = (void *)(p +128 ); +if (count <100000 ) count =100000 ;else if (count >10000000 ) count =10000000 ;while (count--) { -memcpy ((void *)func, insn1,sizeof (insn1)); -if (func () !=1 ) { +clflush (func1); +mb (); +if (func1 () !=1 ) {pr_debug ("ERROR insn1\n" ); ret =-1 ; goto out; } -memcpy ((void *)func, insn2,sizeof (insn2)); -if (func () !=2 ) { + +clflush (func2); +mb (); +if (func2 () !=2 ) {pr_debug ("ERROR insn2\n" ); ret =-1 ; goto out;
@@ -93,7 +109,7 @@ static int dummy_workload_1(unsigned long count) } out: -free (p); +munmap (p, page_size);return ret; }
---
Thanks,
Ravi
Ian Rogers
reviewerQuoted 8 lines · Ravi Bangoria
Hi Peter, Ondrej,
Quoted 5 lines
Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
Quoted 8 lines
Quoted 2 lines
I would argue that having RWX is a problem, you really want
RW->RO->RXtransitions, so even withmmap()you want to combine withmprotect().My original intent for using RWX was to generate sufficient Icache miss samples for the IBS Fetch unit by overwriting the code prior to execution. I am wondering whether it would be possible to achieve the same result by using CLFLUSH with RX permissions. Something like below (build tested only).
(Minor 2 cents) To make the code more canonical JIT code it should probably use memory protection keys for permissions.
Thanks,
Ian
Quoted 93 lines
tools/perf/arch/x86/tests/amd-ibs-period.c +27
-12@@ -25,6 +25,7 @@ static int page_size;#define PERF_MMAP_TOTAL_PAGES (PERF_MMAP_DATA_PAGES + 1)#define PERF_MMAP_TOTAL_SIZE (PERF_MMAP_TOTAL_PAGES * page_size) +#define mb () asm volatile("mfence":::"memory")#define rmb () asm volatile("lfence":::"memory")enum {@@ -41,10 +42,16 @@ struct perf_pmu *fetch_pmu;struct perf_pmu *op_pmu;unsigned int perf_event_max_sample_rate; +static inline void clflush (const volatile void *p) +{ + asmvolatile ("clflush (%0)" ::"r" (p) :"memory" ); +} +/* Dummy workload to generate IBS samples. */ static int dummy_workload_1 (unsigned long count) { -int (*func)(void ); +int (*func1)(void ); +int (*func2)(void );int ret =0 ;char *p;char insn1[] = {@@ -59,33 +66,42 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); + + p =mmap (NULL , page_size,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (p ==MAP_FAILED ) { +printf ("mmap() failed. %m" );return 1 ; } - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); +memcpy (p, insn1,sizeof (insn1)); +memcpy (p +128 , insn2,sizeof (insn2)); - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); + ret =mprotect (p, page_size,PROT_READ |PROT_EXEC );if (ret) {printf ("mprotect() failed. %m" ); goto out; } + func1 = (void *)(p); + func2 = (void *)(p +128 ); +if (count <100000 ) count =100000 ;else if (count >10000000 ) count =10000000 ;while (count--) { -memcpy ((void *)func, insn1,sizeof (insn1)); -if (func () !=1 ) { +clflush (func1); +mb (); +if (func1 () !=1 ) {pr_debug ("ERROR insn1\n" ); ret =-1 ; goto out; } -memcpy ((void *)func, insn2,sizeof (insn2)); -if (func () !=2 ) { + +clflush (func2); +mb (); +if (func2 () !=2 ) {pr_debug ("ERROR insn2\n" ); ret =-1 ; goto out;@@ -93,7 +109,7 @@ static int dummy_workload_1(unsigned long count) } out: -free (p); +munmap (p, page_size);return ret; } ---Thanks,
Ravi
Peter Zijlstra
maintainerQuoted 7 lines · Ravi Bangoria
Hi Peter, Ondrej,
Quoted 5 lines
Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
Quoted 8 lines
Quoted 2 lines
I would argue that having RWX is a problem, you really want
RW->RO->RXtransitions, so even withmmap()you want to combine withmprotect().My original intent for using RWX was to generate sufficient Icache miss samples for the IBS Fetch unit by overwriting the code prior to execution. I am wondering whether it would be possible to achieve the same result by using CLFLUSH with RX permissions. Something like below (build tested only).
So for a test it is fine to have RWX, my comments were mostly aimed at the IMO insane SELinux policies.
CLFLUSH+MB, and on AMD MB is serializing. Thus CLFLUSH will flush the I-cache and MB will flush decode / ucode buffers IIRC. So yeah, CLFLUSH+MB should work fine; if you want to go that route.
Quoted 29 lines
tools/perf/arch/x86/tests/amd-ibs-period.c +8
-1@@ -25,6 +25,7 @@ static int page_size;#define PERF_MMAP_TOTAL_PAGES (PERF_MMAP_DATA_PAGES + 1)#define PERF_MMAP_TOTAL_SIZE (PERF_MMAP_TOTAL_PAGES * page_size) +#define mb () asm volatile("mfence":::"memory")#define rmb () asm volatile("lfence":::"memory")enum {@@ -41,10 +42,16 @@ struct perf_pmu *fetch_pmu;struct perf_pmu *op_pmu;unsigned int perf_event_max_sample_rate; +static inline void clflush (const volatile void *p) +{ + asmvolatile ("clflush (%0)" ::"r" (p) :"memory" ); +} +/* Dummy workload to generate IBS samples. */ static int dummy_workload_1 (unsigned long count) { -int (*func)(void ); +int (*func1)(void ); +int (*func2)(void );int ret =0 ;char *p;char insn1[] = {
tools/perf/arch/x86/tests/amd-ibs-period.c static int dummy_workload_1(unsigned long count) · line 71
Quoted 9 lines
tools/perf/arch/x86/tests/amd-ibs-period.c +3
-3@@ -59,33 +66,42 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); + + p =mmap (NULL , page_size,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 );
RW
tools/perf/arch/x86/tests/amd-ibs-period.c static int dummy_workload_1(unsigned long count) · line 80
Quoted 11 lines
tools/perf/arch/x86/tests/amd-ibs-period.c +5
-2+if (p ==MAP_FAILED ) { +printf ("mmap() failed. %m" );return 1 ; } - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); +memcpy (p, insn1,sizeof (insn1)); +memcpy (p +128 , insn2,sizeof (insn2)); - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); + ret =mprotect (p, page_size,PROT_READ |PROT_EXEC );
RX
You really need an RO step in between IIRC, otherwise, depending on arch details and mprotect implementation details, it is possible to have WX overlap.
Notably, you want to have a TLB flush between removing W and adding X.
But again, this isn't relevant for simple test cases, but does matter for JITs, esp. when they're embedded into applications with lots of user input.
The thing you want to avoid at all cost is things like buffer overflows (write primitives) to escalate into random code execution, which if there are RWX buffers around, is almost trivial.
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.I would argue that having RWX is a problem, you really want
RW->RO->RXtransitions, so even withmmap()you want to combine withmprotect().
Quoted 7 lines
Quoted 5 lines
My original intent for using RWX was to generate sufficient Icache miss samples for the IBS Fetch unit by overwriting the code prior to execution. I am wondering whether it would be possible to achieve the same result by using CLFLUSH with RX permissions. Something like below (build tested only).
So for a test it is fine to have RWX
Sure, makes sense.
Thanks,
Ravi
Quoted 16 lines · Peter Zijlstra
Quoted 4 lines · Ondrej Mosnacek
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the
malloc()
+mprotect()combo with justmmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem"I do not understand. Ultimately
malloc()will have to usemmap()to get the memory too. So how ismalloc()+mprotect()considered more dangerous?Quoted 4 lines
permission under SELinux (things like JIT or regex compilation need it as well).
mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
Quoted 5 lines
I would argue that having RWX is a problem, you really want
RW->RO->RXtransitions, so even withmmap()you want to combine withmprotect().Obviously this doesn't matter for this test case, but any halfway sane JIT should really avoid keeping RWX mappings around.
You're right, an RWX mapping in the heap range isn't really worse than an mmap()-returned anonymous RWX mapping. I think the key difference is that executable ranges in the heap are much less common, so can be treated as a sign of malware and denied more strictly in the policy. The "execmem" permission is triggered on any anonymous executable (or file-backed private writable-executable) mapping, which would apply even for well-implemented JITs and thus can't be restricted as broadly.
So the point is just to not do the more weird thing (which will get you blocked under SELinux even under unconfined_t), so that the test can be run on a SELinux-enforcing machine without workarounds. In hindsight, I should have thought about it more deeply and phrase it better in the commit message, sorry.
Quoted 71 lines
Quoted 6 lines
Verified that the test still passes on a machine with an AMD CPU that has the "ibs" CPU flag.
Fixes 35db59fa8ea2 ("perf test amd ibs: Add sample period unit test")Signed-off-by Ondrej Mosnacek <[email protected]>The patch is obviously good, simpler is more better and all that. But the justification really smells.
If and when we get AMD to support IBT, this thing will need more changes, but alas.
Quoted 55 lines
---
v2: fix
mmap()failure check (found by sashiko-bot)tools/perf/arch/x86/tests/amd-ibs-period.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)tools/perf/arch/x86/tests/amd-ibs-period.c +6
-15@@ -46,7 +46,6 @@ static int dummy_workload_1(unsigned long count) {int (*func)(void );int ret =0 ; -char *p;char insn1[] = {0xb8 ,0x01 ,0x00 ,0x00 ,0x00 ,/* mov 1,%eax */ 0xc3 ,/* ret */ @@ -59,18 +58,11 @@ static int dummy_workload_1(unsigned long count) 0xcc, /* int 3 */ }; - p =calloc (2 , page_size); -if (!p) { -printf ("malloc() failed. %m" ); -return 1 ; - } - - func = (void *)((unsigned long )(p + page_size -1 ) & ~(page_size -1 )); - - ret =mprotect (func, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ); -if (ret) { -printf ("mprotect() failed. %m" ); - goto out; + func =mmap (NULL , page_size,PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +if (func ==MAP_FAILED ) { +pr_debug ("mmap() failed. %m\n" ); +return -1 ; }if (count <100000 )@@ -93,7 +85,7 @@ static int dummy_workload_1(unsigned long count) } out: -free (p); +munmap (func, page_size);return ret; } --2.54.0
Signature · 3 lines
Ondrej Mosnacek Senior Software Engineer, Linux Security - SELinux kernel Red Hat, Inc.
Quoted 9 lines
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the
malloc()
+mprotect()combo with justmmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem" permission under SELinux (things like JIT or regex compilation need it as well).mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.
Quoted 5 lines
Verified that the test still passes on a machine with an AMD CPU that has the "ibs" CPU flag.
Fixes 35db59fa8ea2 ("perf test amd ibs: Add sample period unit test")Signed-off-by Ondrej Mosnacek <[email protected]>
Thanks,
Ravi
Quoted 10 lines · Ondrej Mosnacek
Making [parts of] the heap executable is dangerous and is blocked by SELinux on Fedora/RHEL even for an unconfined user. Replace the
malloc()
+mprotect()combo with justmmap(), creating a private anonymous rwx mapping, which only requires the more commonly allowed "execmem" permission under SELinux (things like JIT or regex compilation need it as well).mmap()withMAP_ANONYMOUSwill give us a zeroed mapping that begins on a page boundary, so the result is equivalent to the original code even without amemset()or the page-alignment dance.[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung