patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

tests: x86: pagetables: fix non-KPTI case

Browse source 
If KPTI is not enabled, then the US bit will be set for all
the default memory partitions in the _app_smem section.

The error printed when a mismatch occurs now shows the
expected flags.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-10-21 15:30:02 -07:00 committed by Anas Nashif
parent ba9fd65a4b
commit cdbf3aa27d
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/arch/x86/pagetables/src/main.c
View file

@ -100,6 +100,18 @@ void test_ram_perms(void)
expected = MMU_P | MMU_XD;
}
#endif /* CONFIG_X86_64 */
#ifndef CONFIG_X86_KPTI
} else if (IN_REGION(_app_smem, pos)) {
/* If KPTI is not enabled, then the default memory
* domain affects our page tables even though we are
* in supervisor mode. We'd expect everything in
* the _app_smem region to have US set since all the
* partitions within it would be active in
* k_mem_domain_default (ztest_partition and any libc
* partitions)
*/
expected = MMU_P | MMU_US | MMU_RW | MMU_XD;
#endif /* CONFIG_X86_KPTI */
} else {
/* We forced CONFIG_HW_STACK_PROTECTION off otherwise
* guard pages will have RW cleared. We can relax this
@ -109,8 +121,8 @@ void test_ram_perms(void)
}
zassert_equal(flags, expected,
"bad flags " PRI_ENTRY " at %p",
flags, pos);
"bad flags " PRI_ENTRY " at %p, expected "
PRI_ENTRY, flags, pos, expected);
}
}