On Wed, Mar 21, 2018 at 02:53:00PM +0800, Li Wang wrote:
> On Wed, Mar 21, 2018 at 5:58 AM, Ram Pai <[1]linuxram@xxxxxxxxxx> wrote:
>
> On Fri, Mar 09, 2018 at 11:43:00AM +0800, Li Wang wrote:
> > On Fri, Mar 9, 2018 at 12:45 AM, Ram Pai
> <[1][2]linuxram@xxxxxxxxxx> wrote:
> >
> > On Thu, Mar 08, 2018 at 11:19:12PM +1100, Michael Ellerman wrote:
> > > Li Wang <[2][3]liwang@xxxxxxxxxx> writes:
> > > > Hi,
> > > >
> > am wondering if the slightly different cpu behavior is dependent
..snip..
> on the
> > version of the firmware/microcode?
> >
> > I also run this reproducer on series ppc kvm machines, but none of
> them
> > get the FAIL.
> > If you need some more HW info, pls let me know.
>
> Hi Li,
>
> Can you try the following patch and see if it solves your problem.
>
> It only works on power7 lpar machine.
>
> But for p8 lpar, it still get failure as that before, the thing I wondered
> is
> that why not disable the pkey_execute_disable_supported on p8 machine?
It turns out to be a testcase bug. On Big endian powerpc ABI, function
ptrs are basically pointers to function descriptors. The testcase
copies functions which results in function descriptors getting copied.
You have to apply the following patch to your test case for it to
operate as intended. Thanks to Michael Ellermen for helping me out.
Otherwise I would be scratching my head for ever.
diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c
index 1173afd..9fe9001 100644
--- a/testcases/kernel/syscalls/mprotect/mprotect04.c
+++ b/testcases/kernel/syscalls/mprotect/mprotect04.c
@@ -189,18 +189,30 @@ static void clear_cache(void *start, int len)
#endif
}
+typedef struct {
+ uintptr_t entry;
+ uintptr_t toc;
+ uintptr_t env;
+} func_descr_t;
+
+typedef void (*func_ptr_t)(void);
+
/*
* Copy page where &exec_func resides. Also try to copy subsequent page
* in case exec_func is close to page boundary.
*/
-static void *get_func(void *mem)
+void *get_func(void *mem)
{
uintptr_t page_sz = getpagesize();
uintptr_t page_mask = ~(page_sz - 1);
- uintptr_t func_page_offset = (uintptr_t)&exec_func & (page_sz - 1);
- void *func_copy_start = mem + func_page_offset;
- void *page_to_copy = (void *)((uintptr_t)&exec_func & page_mask);
+ uintptr_t func_page_offset;
+ void *func_copy_start, *page_to_copy;
void *mem_start = mem;
+ func_descr_t *opd = (func_descr_t *)&exec_func;
+
+ func_page_offset = (uintptr_t)opd->entry & (page_sz - 1);
+ func_copy_start = mem + func_page_offset;
+ page_to_copy = (void *)((uintptr_t)opd->entry & page_mask);
/* copy 1st page, if it's not present something is wrong */
if (!page_present(page_to_copy)) {
@@ -228,15 +240,17 @@ static void *get_func(void *mem)
static void testfunc_protexec(void)
{
- void (*func)(void);
void *p;
+ func_ptr_t func;
+ func_descr_t opd;
sig_caught = 0;
p = SAFE_MMAP(cleanup, 0, copy_sz, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- func = get_func(p);
+ opd.entry = (uintptr_t)get_func(p);
+ func = (func_ptr_t)&opd;
/* Change the protection to PROT_EXEC. */
TEST(mprotect(p, copy_sz, PROT_EXEC));
RP
