Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp4697981pxf; Tue, 23 Mar 2021 18:20:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXtzo1t0VZEtGQaptBHEjSACGCh/JiE6d2/fqY80HsmxrYcHW2lQitIIuN6096B5/stnkD X-Received: by 2002:aa7:cd16:: with SMTP id b22mr675027edw.357.1616548829057; Tue, 23 Mar 2021 18:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616548829; cv=none; d=google.com; s=arc-20160816; b=IKqMUn6Zg+Zm47uCMdMdcU+RLKD2G2nrFGdvTVAgP7iWlOHfjnIzAbP8H+V4n3+dba YJtW8Hq3uR/eh8DEjbPuOKieIixXC0RJ/x24eQkDugnL71XOrnlbCsVKF6GiFtE/271E IEV86zkOdcyMWybbZ96CAXwq+2AUdb1mQr5Sm0GohxsLJ6klBLom72aExiCscox2ma59 POQ+QfmsGcKAsGxt9FWFKx1hDKLPxjxS/pkuQJXjj7lbfpA5Ypcotxf3fOlZwp56oFJw ionXesHgBaTe6W9pF1wLTg4vMN6MvwsQuGMfL4mtQQfERKvaK+mwTaXCuP8V34QYbXaL dXVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=PAnYrByvRd6a79Mw3091FAEKPIAdiyYz+EBOBcD+HEU=; b=uLzwqw/IXigchBwOi8T8aJVghrXtk1vCth7n98xHm1z1tDPxWKsFoMhh7LwF/AXbXW dTH9IAhhcOa6o4VWDuFZnLpQ/NisOf3LkIzIujL8JeD7kyewbQJzSQHEcBqDvCnjyo6s 2N6Z+G1jRtuzBIgOHh+4PWv1D92Q3l6VO0sPaGWBzMotPST90I8qPic047PnDT1cBXbc 8YOoVi+UeJmlGqFVKMvbS2e13DAKk51qNXBYRfGvaCjup9DQK773kdDZIgXLh9ABVz4O Y6lMj9hymtjB/IpUMyJDKqeSiqln/lB90xtcycc2+j6W+Mq0cMwR49+H0uGihTnZTnCV S+tQ== 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 h1si518837ede.545.2021.03.23.18.20.05; Tue, 23 Mar 2021 18:20:29 -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 S231828AbhCWNxR (ORCPT + 99 others); Tue, 23 Mar 2021 09:53:17 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:13670 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231516AbhCWNwx (ORCPT ); Tue, 23 Mar 2021 09:52:53 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4F4Xn75GXkznV6l; Tue, 23 Mar 2021 21:50:19 +0800 (CST) Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.187.128) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.498.0; Tue, 23 Mar 2021 21:52:43 +0800 From: Yanan Wang To: Paolo Bonzini , Andrew Jones , , , CC: Ben Gardon , Sean Christopherson , Vitaly Kuznetsov , Peter Xu , "Ingo Molnar" , Adrian Hunter , Jiri Olsa , Arnaldo Carvalho de Melo , Arnd Bergmann , Michael Kerrisk , Thomas Gleixner , , , Yanan Wang Subject: [RFC PATCH v5 06/10] KVM: selftests: Add a helper to get system configured THP page size Date: Tue, 23 Mar 2021 21:52:27 +0800 Message-ID: <20210323135231.24948-7-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 In-Reply-To: <20210323135231.24948-1-wangyanan55@huawei.com> References: <20210323135231.24948-1-wangyanan55@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.187.128] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If we want to have some tests about transparent hugepages, the system configured THP hugepage size should better be known by the tests, which can be used for kinds of alignment or guest memory accessing of vcpus... So it makes sense to add a helper to get the transparent hugepage size. With VM_MEM_SRC_ANONYMOUS_THP specified in vm_userspace_mem_region_add(), we now stat /sys/kernel/mm/transparent_hugepage to check whether THP is configured in the host kernel before madvise(). Based on this, we can also read file /sys/kernel/mm/transparent_hugepage/hpage_pmd_size to get THP hugepage size. Signed-off-by: Yanan Wang Reviewed-by: Ben Gardon --- .../testing/selftests/kvm/include/test_util.h | 2 ++ tools/testing/selftests/kvm/lib/test_util.c | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h index b7f41399f22c..ef24c76ba89a 100644 --- a/tools/testing/selftests/kvm/include/test_util.h +++ b/tools/testing/selftests/kvm/include/test_util.h @@ -78,6 +78,8 @@ struct vm_mem_backing_src_alias { enum vm_mem_backing_src_type type; }; +bool thp_configured(void); +size_t get_trans_hugepagesz(void); 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/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c index c7c0627c6842..efc1a7782de0 100644 --- a/tools/testing/selftests/kvm/lib/test_util.c +++ b/tools/testing/selftests/kvm/lib/test_util.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "linux/kernel.h" #include "test_util.h" @@ -117,6 +118,34 @@ const struct vm_mem_backing_src_alias backing_src_aliases[] = { {"anonymous_hugetlb", VM_MEM_SRC_ANONYMOUS_HUGETLB,}, }; +bool thp_configured(void) +{ + int ret; + struct stat statbuf; + + ret = stat("/sys/kernel/mm/transparent_hugepage", &statbuf); + TEST_ASSERT(ret == 0 || (ret == -1 && errno == ENOENT), + "Error in stating /sys/kernel/mm/transparent_hugepage"); + + return ret == 0; +} + +size_t get_trans_hugepagesz(void) +{ + size_t size; + FILE *f; + + TEST_ASSERT(thp_configured(), "THP is not configured in host kernel"); + + f = fopen("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size", "r"); + TEST_ASSERT(f != NULL, "Error in opening transparent_hugepage/hpage_pmd_size"); + + fscanf(f, "%ld", &size); + fclose(f); + + return size; +} + void backing_src_help(void) { int i; -- 2.19.1