From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19944C282DD for ; Thu, 23 May 2019 17:40:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E63742075B for ; Thu, 23 May 2019 17:40:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731392AbfEWRkg (ORCPT ); Thu, 23 May 2019 13:40:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45258 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731195AbfEWRkf (ORCPT ); Thu, 23 May 2019 13:40:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DD0830C1AF9; Thu, 23 May 2019 17:40:35 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CCF55C219; Thu, 23 May 2019 17:40:30 +0000 (UTC) Date: Thu, 23 May 2019 19:40:28 +0200 From: Andrew Jones To: Thomas Huth Cc: Christian Borntraeger , Janosch Frank , kvm@vger.kernel.org, Paolo Bonzini , Radim =?utf-8?B?S3LEjW3DocWZ?= , Shuah Khan , David Hildenbrand , Cornelia Huck , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org Subject: Re: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x Message-ID: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190523164309.13345-6-thuth@redhat.com> User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 23 May 2019 17:40:35 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 23, 2019 at 06:43:05PM +0200, Thomas Huth wrote: > On s390x, there is a constraint that memory regions have to be aligned > to 1M (or running the VM will fail). Introduce a new "alignment" variable > in the vm_userspace_mem_region_add() function which now can be used for > both, huge page and s390x alignment requirements. > > Signed-off-by: Thomas Huth > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 08edb8436c47..656df9d5cd4d 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -559,6 +559,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > unsigned long pmem_size = 0; > struct userspace_mem_region *region; > size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size; > + size_t alignment; > > TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical " > "address not on a page boundary.\n" > @@ -608,9 +609,20 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > TEST_ASSERT(region != NULL, "Insufficient Memory"); > region->mmap_size = npages * vm->page_size; > > - /* Enough memory to align up to a huge page. */ > +#ifdef __s390x__ > + /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ > + alignment = 0x100000; > +#else > + alignment = 1; > +#endif > + > if (src_type == VM_MEM_SRC_ANONYMOUS_THP) > - region->mmap_size += huge_page_size; > + alignment = huge_page_size; I guess s390x won't ever support VM_MEM_SRC_ANONYMOUS_THP? If it does, then we need 'alignment = max(huge_page_size, alignment)'. Actually that might be a nice way to write this anyway for future-proofing. > + > + /* Add enough memory to align up if necessary */ > + if (alignment > 1) > + region->mmap_size += alignment; > + > region->mmap_start = mmap(NULL, region->mmap_size, > PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS > @@ -620,9 +632,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > "test_malloc failed, mmap_start: %p errno: %i", > region->mmap_start, errno); > > - /* Align THP allocation up to start of a huge page. */ > - region->host_mem = align(region->mmap_start, > - src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1); > + /* Align host address */ > + region->host_mem = align(region->mmap_start, alignment); > > /* As needed perform madvise */ > if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) { > -- > 2.21.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: drjones at redhat.com (Andrew Jones) Date: Thu, 23 May 2019 19:40:28 +0200 Subject: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x In-Reply-To: <20190523164309.13345-6-thuth@redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> Message-ID: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> On Thu, May 23, 2019 at 06:43:05PM +0200, Thomas Huth wrote: > On s390x, there is a constraint that memory regions have to be aligned > to 1M (or running the VM will fail). Introduce a new "alignment" variable > in the vm_userspace_mem_region_add() function which now can be used for > both, huge page and s390x alignment requirements. > > Signed-off-by: Thomas Huth > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 08edb8436c47..656df9d5cd4d 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -559,6 +559,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > unsigned long pmem_size = 0; > struct userspace_mem_region *region; > size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size; > + size_t alignment; > > TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical " > "address not on a page boundary.\n" > @@ -608,9 +609,20 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > TEST_ASSERT(region != NULL, "Insufficient Memory"); > region->mmap_size = npages * vm->page_size; > > - /* Enough memory to align up to a huge page. */ > +#ifdef __s390x__ > + /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ > + alignment = 0x100000; > +#else > + alignment = 1; > +#endif > + > if (src_type == VM_MEM_SRC_ANONYMOUS_THP) > - region->mmap_size += huge_page_size; > + alignment = huge_page_size; I guess s390x won't ever support VM_MEM_SRC_ANONYMOUS_THP? If it does, then we need 'alignment = max(huge_page_size, alignment)'. Actually that might be a nice way to write this anyway for future-proofing. > + > + /* Add enough memory to align up if necessary */ > + if (alignment > 1) > + region->mmap_size += alignment; > + > region->mmap_start = mmap(NULL, region->mmap_size, > PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS > @@ -620,9 +632,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > "test_malloc failed, mmap_start: %p errno: %i", > region->mmap_start, errno); > > - /* Align THP allocation up to start of a huge page. */ > - region->host_mem = align(region->mmap_start, > - src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1); > + /* Align host address */ > + region->host_mem = align(region->mmap_start, alignment); > > /* As needed perform madvise */ > if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) { > -- > 2.21.0 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: drjones@redhat.com (Andrew Jones) Date: Thu, 23 May 2019 19:40:28 +0200 Subject: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x In-Reply-To: <20190523164309.13345-6-thuth@redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> Message-ID: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> Content-Type: text/plain; charset="UTF-8" Message-ID: <20190523174028.PSQ39fObEwMLz2Y3QWnSnV9L4wOiQrU9_Su9dWpTtEA@z> On Thu, May 23, 2019@06:43:05PM +0200, Thomas Huth wrote: > On s390x, there is a constraint that memory regions have to be aligned > to 1M (or running the VM will fail). Introduce a new "alignment" variable > in the vm_userspace_mem_region_add() function which now can be used for > both, huge page and s390x alignment requirements. > > Signed-off-by: Thomas Huth > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 08edb8436c47..656df9d5cd4d 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -559,6 +559,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > unsigned long pmem_size = 0; > struct userspace_mem_region *region; > size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size; > + size_t alignment; > > TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical " > "address not on a page boundary.\n" > @@ -608,9 +609,20 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > TEST_ASSERT(region != NULL, "Insufficient Memory"); > region->mmap_size = npages * vm->page_size; > > - /* Enough memory to align up to a huge page. */ > +#ifdef __s390x__ > + /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ > + alignment = 0x100000; > +#else > + alignment = 1; > +#endif > + > if (src_type == VM_MEM_SRC_ANONYMOUS_THP) > - region->mmap_size += huge_page_size; > + alignment = huge_page_size; I guess s390x won't ever support VM_MEM_SRC_ANONYMOUS_THP? If it does, then we need 'alignment = max(huge_page_size, alignment)'. Actually that might be a nice way to write this anyway for future-proofing. > + > + /* Add enough memory to align up if necessary */ > + if (alignment > 1) > + region->mmap_size += alignment; > + > region->mmap_start = mmap(NULL, region->mmap_size, > PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS > @@ -620,9 +632,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, > "test_malloc failed, mmap_start: %p errno: %i", > region->mmap_start, errno); > > - /* Align THP allocation up to start of a huge page. */ > - region->host_mem = align(region->mmap_start, > - src_type == VM_MEM_SRC_ANONYMOUS_THP ? huge_page_size : 1); > + /* Align host address */ > + region->host_mem = align(region->mmap_start, alignment); > > /* As needed perform madvise */ > if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) { > -- > 2.21.0 >