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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 EFEC6C072B5 for ; Fri, 24 May 2019 08:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B593A20675 for ; Fri, 24 May 2019 08:29:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389502AbfEXI3l (ORCPT ); Fri, 24 May 2019 04:29:41 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:51932 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389279AbfEXI3l (ORCPT ); Fri, 24 May 2019 04:29:41 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4O8ReAi062118 for ; Fri, 24 May 2019 04:29:40 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2spcgm1x92-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 24 May 2019 04:29:40 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 May 2019 09:29:38 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 24 May 2019 09:29:35 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x4O8TYai44499198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 May 2019 08:29:34 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2AEE44C04E; Fri, 24 May 2019 08:29:34 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AE6A74C040; Fri, 24 May 2019 08:29:33 +0000 (GMT) Received: from oc7455500831.ibm.com (unknown [9.152.224.26]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 24 May 2019 08:29:33 +0000 (GMT) To: Andrew Jones , Thomas Huth Cc: Janosch Frank , kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Shuah Khan , David Hildenbrand , Cornelia Huck , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> From: Christian Borntraeger Openpgp: preference=signencrypt Autocrypt: addr=borntraeger@de.ibm.com; prefer-encrypt=mutual; keydata= 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 syiRa+UVlsKmx1hsEg== Date: Fri, 24 May 2019 10:29:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19052408-0008-0000-0000-000002E9E906 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19052408-0009-0000-0000-00002256AABD Message-Id: <7919d65e-d814-9e68-4df0-d12f43f0b984@de.ibm.com> Subject: Re: Re: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-24_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905240058 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23.05.19 19:40, Andrew Jones wrote: > 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. I can do - alignment = huge_page_size; + alignment = max(huge_page_size, alignment); when applying. > >> + >> + /* 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: borntraeger at de.ibm.com (Christian Borntraeger) Date: Fri, 24 May 2019 10:29:33 +0200 Subject: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x In-Reply-To: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> Message-ID: <7919d65e-d814-9e68-4df0-d12f43f0b984@de.ibm.com> On 23.05.19 19:40, Andrew Jones wrote: > 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. I can do - alignment = huge_page_size; + alignment = max(huge_page_size, alignment); when applying. > >> + >> + /* 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: borntraeger@de.ibm.com (Christian Borntraeger) Date: Fri, 24 May 2019 10:29:33 +0200 Subject: [PATCH 5/9] KVM: selftests: Align memory region addresses to 1M on s390x In-Reply-To: <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> References: <20190523164309.13345-1-thuth@redhat.com> <20190523164309.13345-6-thuth@redhat.com> <20190523174028.3giefzff3l5eclki@kamzik.brq.redhat.com> Message-ID: <7919d65e-d814-9e68-4df0-d12f43f0b984@de.ibm.com> Content-Type: text/plain; charset="UTF-8" Message-ID: <20190524082933.FVh6fMe9sdTIiU3M_iZgPfU0ALpI0AA4j9rz-5gUvqg@z> On 23.05.19 19:40, Andrew Jones wrote: > 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. I can do - alignment = huge_page_size; + alignment = max(huge_page_size, alignment); when applying. > >> + >> + /* 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 >> >