Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3218687pxf; Mon, 22 Mar 2021 00:24:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjmN/38FLI69408/KrS3JnJ+pAFYTDRDR+4LXrMkCRd1ObeALLCTWwM2PzH4wzgsew3ObH X-Received: by 2002:a17:906:4bce:: with SMTP id x14mr17502335ejv.383.1616397877377; Mon, 22 Mar 2021 00:24:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616397877; cv=none; d=google.com; s=arc-20160816; b=hpiF5iEAoADPqNs5bQzCZkvmbxo1l1T9AVJXIgAfyDUgO1HoWq6uPaPBa5AfKqRKsp VFhAHdQ6ZGe5ev3pQtq7ZoHHaeSgS3zNqBSB1vvaJe2ZAXX/7sWzu5C1WLb/ky8H96ds 8IfoDHvo0qmI3+c4U+8/0znTaKJGPR6cB5dvfo0qb/QWRCwrabFMdwX7qroLbXQ1TnOJ k+W25T0Y2NIIfmI0PhMUc6jfixy8ayBavg609CkkFYIk5xWD1cTyNA1ln+5H9WF5XJB9 /zuvfMtcaqT0tYjONq12q9SoNwq+fNoTbAH/zqQofoSgFBQ6yqj/Hilnshx81gksQv8I RvEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-language:content-transfer-encoding :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=9Ag1DowqUEcX/8a+yQzr0zMsHVGspyFXjvvJSMaI0o8=; b=Qa4rjI2/04CPLzySfgbM8O82tDORSf72sCH1mG6sgE532fcp7KYA5h046KVmCNUFLG ftbHXRiHVcoQnAeGGqDoSQIvfF0mvBMw4Pd2W66xYfL6eQbpHPljBtDSbRdjbOyfqnsN UocdRyaV2dltyaRj0wQ+Q8xNN/8f1yXi2MZPk+S6Wi+GGvJCMH7DrCI2+bbJaHZj1Uvz EMfphcL1EDzxsngbo+OR5m5imXNNLERJaNUneP0P/Nx6otlZT1Kr8O63lgcuZrAU9Ha7 RjwT2ThiBvmJ2Icd14VEFGw/zmWhbJx+Jwy6ONYhMHaEYw5Zc/f/GLq84Di4XvRr12kq 0F7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a7si12196678edm.320.2021.03.22.00.24.13; Mon, 22 Mar 2021 00:24:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbhCVHXT (ORCPT + 99 others); Mon, 22 Mar 2021 03:23:19 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:5105 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbhCVHWu (ORCPT ); Mon, 22 Mar 2021 03:22:50 -0400 Received: from DGGEML402-HUB.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4F3mBL68vzzY8f2; Mon, 22 Mar 2021 15:20:58 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by DGGEML402-HUB.china.huawei.com (10.3.17.38) with Microsoft SMTP Server (TLS) id 14.3.498.0; Mon, 22 Mar 2021 15:22:46 +0800 Received: from [10.174.187.128] (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2106.2; Mon, 22 Mar 2021 15:22:45 +0800 Subject: Re: [RFC PATCH v4 7/9] KVM: selftests: List all hugetlb src types specified with page sizes To: Andrew Jones CC: , , , Paolo Bonzini , "Ben Gardon" , Sean Christopherson , "Vitaly Kuznetsov" , Peter Xu , Marc Zyngier , Ingo Molnar , Adrian Hunter , Jiri Olsa , "Arnaldo Carvalho de Melo" , Arnd Bergmann , Michael Kerrisk , Thomas Gleixner , , , References: <20210302125751.19080-1-wangyanan55@huawei.com> <20210302125751.19080-8-wangyanan55@huawei.com> <20210312114938.zfwnux3kwz44fd2i@kamzik.brq.redhat.com> From: "wangyanan (Y)" Message-ID: <80acf061-bf2b-30b8-f2b0-03849304a83e@huawei.com> Date: Mon, 22 Mar 2021 15:22:45 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210312114938.zfwnux3kwz44fd2i@kamzik.brq.redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggeme710-chm.china.huawei.com (10.1.199.106) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2021/3/12 19:49, Andrew Jones wrote: > On Tue, Mar 02, 2021 at 08:57:49PM +0800, Yanan Wang wrote: >> With VM_MEM_SRC_ANONYMOUS_HUGETLB, we currently can only use system >> default hugetlb pages to back the testing guest memory. In order to >> add flexibility, now list all the known hugetlb backing src types with >> different page sizes, so that we can specify use of hugetlb pages of the >> exact granularity that we want. And as all the known hugetlb page sizes >> are listed, it's appropriate for all architectures. >> >> Besides, the helper get_backing_src_pagesz() is added to get the >> granularity of different backing src types(anonumous, thp, hugetlb). >> >> Suggested-by: Ben Gardon >> Signed-off-by: Yanan Wang >> --- >> .../testing/selftests/kvm/include/test_util.h | 18 +++++- >> tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- >> tools/testing/selftests/kvm/lib/test_util.c | 59 +++++++++++++++---- >> 3 files changed, 66 insertions(+), 13 deletions(-) >> >> diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h >> index e087174eefe5..fade3130eb01 100644 >> --- a/tools/testing/selftests/kvm/include/test_util.h >> +++ b/tools/testing/selftests/kvm/include/test_util.h >> @@ -71,16 +71,32 @@ enum vm_mem_backing_src_type { >> VM_MEM_SRC_ANONYMOUS, >> VM_MEM_SRC_ANONYMOUS_THP, >> VM_MEM_SRC_ANONYMOUS_HUGETLB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_16KB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_64KB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_512KB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_1MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_2MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_8MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_16MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_32MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_256MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_512MB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_2GB, >> + VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB, >> + NUM_SRC_TYPES, >> }; >> >> struct vm_mem_backing_src_alias { >> const char *name; >> - enum vm_mem_backing_src_type type; >> + uint32_t flag; >> }; >> >> bool thp_configured(void); >> size_t get_trans_hugepagesz(void); >> size_t get_def_hugetlb_pagesz(void); >> +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i); >> +size_t get_backing_src_pagesz(uint32_t i); >> void backing_src_help(void); >> enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name); >> >> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c >> index cc22c4ab7d67..b91c8e3a7ee1 100644 >> --- a/tools/testing/selftests/kvm/lib/kvm_util.c >> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c >> @@ -757,7 +757,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, >> region->mmap_start = mmap(NULL, region->mmap_size, >> PROT_READ | PROT_WRITE, >> MAP_PRIVATE | MAP_ANONYMOUS >> - | (src_type == VM_MEM_SRC_ANONYMOUS_HUGETLB ? MAP_HUGETLB : 0), >> + | vm_mem_backing_src_alias(src_type)->flag, >> -1, 0); >> TEST_ASSERT(region->mmap_start != MAP_FAILED, >> "test_malloc failed, mmap_start: %p errno: %i", >> diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c >> index 80d68dbd72d2..df8a42eff1f8 100644 >> --- a/tools/testing/selftests/kvm/lib/test_util.c >> +++ b/tools/testing/selftests/kvm/lib/test_util.c >> @@ -11,6 +11,7 @@ >> #include >> #include >> #include >> +#include >> #include "linux/kernel.h" >> >> #include "test_util.h" >> @@ -112,12 +113,6 @@ void print_skip(const char *fmt, ...) >> puts(", skipping test"); >> } >> >> -const struct vm_mem_backing_src_alias backing_src_aliases[] = { >> - {"anonymous", VM_MEM_SRC_ANONYMOUS,}, >> - {"anonymous_thp", VM_MEM_SRC_ANONYMOUS_THP,}, >> - {"anonymous_hugetlb", VM_MEM_SRC_ANONYMOUS_HUGETLB,}, >> -}; >> - >> bool thp_configured(void) >> { >> int ret; >> @@ -180,22 +175,64 @@ size_t get_def_hugetlb_pagesz(void) >> return 0; >> } >> >> +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias(uint32_t i) >> +{ >> + static const struct vm_mem_backing_src_alias aliases[] = { >> + { "anonymous", 0 }, >> + { "anonymous_thp", 0 }, >> + { "anonymous_hugetlb", MAP_HUGETLB }, >> + { "anonymous_hugetlb_16kb", MAP_HUGETLB | MAP_HUGE_16KB }, >> + { "anonymous_hugetlb_64kb", MAP_HUGETLB | MAP_HUGE_64KB }, >> + { "anonymous_hugetlb_512kb", MAP_HUGETLB | MAP_HUGE_512KB }, >> + { "anonymous_hugetlb_1mb", MAP_HUGETLB | MAP_HUGE_1MB }, >> + { "anonymous_hugetlb_2mb", MAP_HUGETLB | MAP_HUGE_2MB }, >> + { "anonymous_hugetlb_8mb", MAP_HUGETLB | MAP_HUGE_8MB }, >> + { "anonymous_hugetlb_16mb", MAP_HUGETLB | MAP_HUGE_16MB }, >> + { "anonymous_hugetlb_32mb", MAP_HUGETLB | MAP_HUGE_32MB }, >> + { "anonymous_hugetlb_256mb", MAP_HUGETLB | MAP_HUGE_256MB }, >> + { "anonymous_hugetlb_512mb", MAP_HUGETLB | MAP_HUGE_512MB }, >> + { "anonymous_hugetlb_1gb", MAP_HUGETLB | MAP_HUGE_1GB }, >> + { "anonymous_hugetlb_2gb", MAP_HUGETLB | MAP_HUGE_2GB }, >> + { "anonymous_hugetlb_16gb", MAP_HUGETLB | MAP_HUGE_16GB }, >> + }; >> + _Static_assert(ARRAY_SIZE(aliases) == NUM_SRC_TYPES, >> + "Missing new backing src types?"); >> + >> + TEST_ASSERT(i < NUM_SRC_TYPES, "Backing src type ID %d too big", i); >> + >> + return &aliases[i]; >> +} >> + >> +size_t get_backing_src_pagesz(uint32_t i) >> +{ >> + uint32_t flag = vm_mem_backing_src_alias(i)->flag; >> + >> + if (i == VM_MEM_SRC_ANONYMOUS) >> + return getpagesize(); >> + if (i == VM_MEM_SRC_ANONYMOUS_THP) >> + return get_trans_hugepagesz(); >> + if (i == VM_MEM_SRC_ANONYMOUS_HUGETLB) >> + return get_def_hugetlb_pagesz(); > nit: a switch would look nicer (IMHO) Ok, will change. >> + >> + return MAP_HUGE_PAGE_SIZE(flag); >> +} >> + >> void backing_src_help(void) >> { >> int i; >> >> printf("Available backing src types:\n"); >> - for (i = 0; i < ARRAY_SIZE(backing_src_aliases); i++) >> - printf("\t%s\n", backing_src_aliases[i].name); >> + for (i = 0; i < NUM_SRC_TYPES; i++) >> + printf("\t%s\n", vm_mem_backing_src_alias(i)->name); > What happened with the indentation here? Thanks for pointing out this. It was a stupid mistake, I will fix it. >> } >> >> enum vm_mem_backing_src_type parse_backing_src_type(const char *type_name) >> { >> int i; >> >> - for (i = 0; i < ARRAY_SIZE(backing_src_aliases); i++) >> - if (!strcmp(type_name, backing_src_aliases[i].name)) >> - return backing_src_aliases[i].type; >> + for (i = 0; i < NUM_SRC_TYPES; i++) >> + if (!strcmp(type_name, vm_mem_backing_src_alias(i)->name)) >> + return i; >> >> backing_src_help(); >> TEST_FAIL("Unknown backing src type: %s", type_name); >> -- >> 2.23.0 >> > Otherwise > > Reviewed-by: Andrew Jones Thanks, Yanan > > .