SelfTest: KVM: Drop Asserts for madvise failures
PATCH 1/1 SelfTest: KVM: Drop Asserts for madvise failures
From: Ahmed Abd El Mawgood <ahmedsoliman at mena.vt.edu>
madvise() returns -1 without CONFIG_TRANSPARENT_HUGEPAGE=y. That would trigger asserts when checking for return value of madvice. Following similar decision to [1]. I thought it is ok to assume that madvise() failures implies that THP is not supported by host kernel.
Other options were to check for Transparent Huge Page support in /sys/kernel/mm/transparent_hugepage/enabled.
-- links --
[1] https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04514.html
--- tools/testing/selftests/kvm/lib/kvm_util.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +6 -8
@@ -586,14 +586,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1);/* As needed perform madvise */ -if (src_type ==VM_MEM_SRC_ANONYMOUS || src_type ==VM_MEM_SRC_ANONYMOUS_THP ) { - ret =madvise (region->host_mem, npages * vm->page_size, - src_type ==VM_MEM_SRC_ANONYMOUS ?MADV_NOHUGEPAGE :MADV_HUGEPAGE ); -TEST_ASSERT (ret ==0 ,"madvise failed,\n" -" addr: %p\n" -" length: 0x%lx\n" -" src_type: %x" , - region->host_mem, npages * vm->page_size, src_type); +if (src_type ==VM_MEM_SRC_ANONYMOUS ) { +madvise (region->host_mem, npages * vm->page_size, +MADV_NOHUGEPAGE ); + }else if (src_type ==VM_MEM_SRC_ANONYMOUS_THP ) { +madvise (region->host_mem, npages * vm->page_size, +MADV_HUGEPAGE ); } region->unused_phy_pages =sparsebit_alloc ();
Signature · 1 line
2.18.1
Quoted 27 lines · Ahmed Abd El Mawgood
From: Ahmed Abd El Mawgood <ahmedsoliman at mena.vt.edu>
madvise()returns -1 withoutCONFIG_TRANSPARENT_HUGEPAGE=y. That would trigger asserts when checking for return value of madvice. Following similar decision to [1]. I thought it is ok to assume thatmadvise()failures implies that THP is not supported by host kernel.Other options were to check for Transparent Huge Page support in
/sys/kernel/mm/transparent_hugepage/enabled.-- links --
[1] https://lists.gnu.org/archive/html/qemu-devel/2015-11/msg04514.htmlSigned-off-by Ahmed Abd El Mawgood <ahmedsoliman at mena.vt.edu>--- tools/testing/selftests/kvm/lib/kvm_util.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +0
-1@@ -586,14 +586,12 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1);/* As needed perform madvise */ -if (src_type ==VM_MEM_SRC_ANONYMOUS || src_type ==VM_MEM_SRC_ANONYMOUS_THP ) {
tools/testing/selftests/kvm/lib/kvm_util.c void vm_userspace_mem_region_add(struct kvm_vm *vm, · line 591
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +3
-7- ret =madvise (region->host_mem, npages * vm->page_size, - src_type ==VM_MEM_SRC_ANONYMOUS ?MADV_NOHUGEPAGE :MADV_HUGEPAGE ); -TEST_ASSERT (ret ==0 ,"madvise failed,\n" -" addr: %p\n" -" length: 0x%lx\n" -" src_type: %x" , - region->host_mem, npages * vm->page_size, src_type); +if (src_type ==VM_MEM_SRC_ANONYMOUS ) { +madvise (region->host_mem, npages * vm->page_size, +MADV_NOHUGEPAGE );
This is fine.
tools/testing/selftests/kvm/lib/kvm_util.c void vm_userspace_mem_region_add(struct kvm_vm *vm, · line 594
Quoted 3 lines
tools/testing/selftests/kvm/lib/kvm_util.c +3
-0+ }else if (src_type ==VM_MEM_SRC_ANONYMOUS_THP ) { +madvise (region->host_mem, npages * vm->page_size, +MADV_HUGEPAGE );
I would still assert here, but with a more informative message like "madvise(MADV_HUGEPAGE) failed. Does the kernel have CONFIG_TRANSPARENT_HUGEPAGE=y?"
Quoted 6 lines
tools/testing/selftests/kvm/lib/kvm_util.c +0
-0} region->unused_phy_pages =sparsebit_alloc ();Signature · 1 line
2.18.1
Thanks,
drew