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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E8BBC77B7E for ; Sun, 28 May 2023 14:49:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5D536B0071; Sun, 28 May 2023 10:49:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0CDC6B0074; Sun, 28 May 2023 10:49:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8FBC46B0075; Sun, 28 May 2023 10:49:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 81B836B0071 for ; Sun, 28 May 2023 10:49:14 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4847B140270 for ; Sun, 28 May 2023 14:49:14 +0000 (UTC) X-FDA: 80839946628.18.B1F2A88 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf23.hostedemail.com (Postfix) with ESMTP id 6004714000B for ; Sun, 28 May 2023 14:49:11 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="D5u0j/Br"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685285351; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=um+ZIBHmGp4TfeKSdvKKFeVwJH/FQpz6nR2TripbIu4=; b=pYByfd3/nvXTIRSLfsXiQhqhnCQXBK74AQSC/qK0CwctvsFV4eJnFV5+1KQC71mRtkEMTO 107aQMY614iInB1gyMsQKCYjLqO7AMpjOw7+Lpdm+EI4aUIEsqO5ZIv9dmXwY1HdPVnMU5 TAdtP5jyKHXZD03RlfUc1pTm/xSqk2k= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b="D5u0j/Br"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf23.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685285351; a=rsa-sha256; cv=none; b=Vl7aV5gwfxv/Djlp9ORSRTBH3SnKwAB++WO/GZuAPyF1WPCY1OkWPYsuL14HZ+TQFV3hoc bZXEoin/NYO6WLmExA/KudVVYc/o3B5BTVTacuF+PHOnstrMH9hTujceI4FwEsgyIyd7g9 dGTuYe0La0vXBAJuPHKZoF2bIWBUNlg= Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-307d20548adso1406782f8f.0 for ; Sun, 28 May 2023 07:49:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685285350; x=1687877350; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=um+ZIBHmGp4TfeKSdvKKFeVwJH/FQpz6nR2TripbIu4=; b=D5u0j/Br8jCPvAxfu/sLuIXAcuRhj/uCA3k9rVd0RYZIRy/x1dHty3YE2f/nTbRrRV MjmhrsRk1YYobDp4HLx6lwgU3lqkQjbGKQDoqU7ILmr0gLU24ASXIIp2lbPQLX+dSPjL 0OA9CPcoa6iXz4yl03is8180HZmsXs6EKpUqKheAdYTXiNwR8AB5i/wKuj+yVojC77pP iqXRXbgy6JT7opiy7ajsql9Gv2m9X4szxKwr1Ho8o2s6WpLxgqHpwT0xtUIxKQUjq30f uuJwVY65b0hJKtp8HltO3b63TkhjULnXRpO/853uoLHI55qix8Q/CoEefJsgBJhRGEbC DaLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685285350; x=1687877350; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=um+ZIBHmGp4TfeKSdvKKFeVwJH/FQpz6nR2TripbIu4=; b=VtmCM2ypmvd82yQxccnFTjieYhvXkKmKBqlfvImrDC7HirkCVqihwJ8vLfSgnygqi0 JWhcbs5JvTH9rbQpNg+XxAWuF0GnBVnaqM3PTqr+tN52ntARg9sWgxua4NMnpS4lcY8E b/VWtTJOBX8k/UwXXVcNU1QUIdgh7alcX3q/06J6rA+3LDbUWHADGodLRCAHymOL5Mld FMZKzv8rXmV1JcFPgw+H5RcShmsHDKKgXRZwgolJGJtC6fKUi742yul3jfeyV1iczPU3 hjlH1oZfWamgkox2p4+ftAGDBX7ykw9PA+IwN3wchKLQVB4V0qXM7FfOSb9qzLbEjUyW E8+A== X-Gm-Message-State: AC+VfDzymoeqms3ubC699XkMkfqGk7cLjRKFSIgd4tlxpJqNfSvzbrmK 5mBBB4h2LIGlZtvGLVxc2Is= X-Google-Smtp-Source: ACHHUZ7WfC3v+TMmHOiDbzB0lFrMelBb8/1324DY7fdiS9NE2NUOX1hsuo0dCwr8CGwVy8/EOf3djg== X-Received: by 2002:adf:ec44:0:b0:30a:bae6:fa98 with SMTP id w4-20020adfec44000000b0030abae6fa98mr7225561wrn.39.1685285349551; Sun, 28 May 2023 07:49:09 -0700 (PDT) Received: from localhost (host81-154-179-160.range81-154.btcentralplus.com. [81.154.179.160]) by smtp.gmail.com with ESMTPSA id l16-20020adfe590000000b002fb60c7995esm10940691wrm.8.2023.05.28.07.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 07:49:08 -0700 (PDT) Date: Sun, 28 May 2023 15:49:07 +0100 From: Lorenzo Stoakes To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Andrew Morton , Shuah Khan , Jens Axboe , Peter Xu , Jason Gunthorpe , John Hubbard , Jan Kara Subject: Re: [PATCH v1 1/3] selftests/mm: factor out detection of hugetlb page sizes into vm_util Message-ID: References: <20230519102723.185721-1-david@redhat.com> <20230519102723.185721-2-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230519102723.185721-2-david@redhat.com> X-Rspamd-Queue-Id: 6004714000B X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: per3kitr61w6kqubednhbqtm46qxhiwx X-HE-Tag: 1685285351-941889 X-HE-Meta: U2FsdGVkX19qF2QVEw/jOTWOQTXiFaukfTNf33ld4ISTCw99TlzorGt+FXH/Dtg/HAp29+mXGM1Ekk1KexAOt5Pai/OSA9bJRPuKxu/IQFmzOChSYO6XLIsz/ySGYK6qi0xSJR7w0A0fPiDzin3TpX6yMMs7yAhl53BLCWB+utElRM5gg5mFUy9g7mygxVydsmiXY5M4YvLiqSVV1laInzFK20NyI9IMw6aKOvz59zj4tZEPHZo93SfW9ZQQYuG4KgBo+Oq2PJpDRiQGXNLxLtsLNwe1SLB5uFMMpDtrYT7jlrxn5pZ8ukxsqtT2lLiMDCm5f1Y8qpwWa1A0ASAznlSoJFihrKLUxO1hcouNZdPHWOQmWnXY1kokPY/TiSKmzbBAnBqjN9gFaK/9diFCFlnVOCa/yVxiUbPIpxKw1qPjyZlVkOnRb7h1gn/E/utM3hmJvk35Jd1jag/GKpzPLW0Yxc4XhkhU5uJWfksKG2XO7GNiV1cJX4CjKgvGy6L3OHj78BFje/uAozDAAcCQ8XZ3ttl8HEd4MZqHRRRRzo9S7DlkdufKLjmVMx72LHqrn4sc9fdL0ox7Dn7wSDvHw7NIB4tHu5mJ72VhAPIJZhjEa8NtX7zSP1G0n7ZdnkTDkvsdA/zePMg9fsT8UQj34ebXdpyLsjKQLQJKGf/Y/KaPqn4tW2ryCsT8b7slOJtpSXblI+ZijlksPuT998DQJe6UAhefJFfqDLHnxTSMIt8dgbhu4oqrBOsJ/isuW7COP40avqB7vEHZwkKBA8I4mG88/YJ+wJ4HFvw2Qplw34yJYrpa4MS/YeEzU6NlFGgcf/udiviEzT43zEJ8gsS73fkTAjdzvISaUoINqBnIgNi/PT4bRSYrlSonN+YFnTODXsRgSkH6I7VxID7xLW9W7fRjVrijcmzlxWcYkg3SD8KS2sh8w1UxAzc4MPBrH0qQjP1plVZl0wfSbZu3Dgp I3Zd3k/e 0mC+RpMfTgF31eC8k/EekclapwnAv6pBBdTezlf+/xhlZbdtP15ov+vL99AEiXJk4vnncUrQm2UGnG5st9IANAUcGhvCsrXnSZeTvpHlwiGXkkoJVxuzblhrL27e8/a9b1txpukdq5H+Gacw03JxiufyhODRky8lSEIsDazArwxHNZIB6IkdzMZuLxE9UrpYGgCehHN9Bmq7b3f2EMV3UtIuDxbo7E6EbZDJ7Bnh2yp1RjF/yjnLIPvzntTmdAl+kPip1kKM8UXlzcXXJ22RJxXtdaaQBVtj+KcUndj5Td7WrqPGFBg7R337g8rX2599XCfZkI7Sqs6u2w+R9ksDnRKDxFh+aIM3gZedksC9JAY3eOlyPGZyHo3J5VzzmVZ3eJAiI8FMi3WIjO2DQDpfpCgtDiKDew+iyNJYtfgZV9PrFTvBxIASm+VsvxdxKVGb4psehivST4Y19xcO3mgCgMQqtavUwUh+QTrhGEO6y69sOC2c= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, May 19, 2023 at 12:27:21PM +0200, David Hildenbrand wrote: > Let's factor detection out into vm_util, to be reused by a new test. > Bit of a nit as it's hardly vitally important, but perhaps worth mentioning that you also refactor the function to accept any array (this is a requirement rather than simply refactoring a thing but still :) > Signed-off-by: David Hildenbrand > --- > tools/testing/selftests/mm/cow.c | 29 ++-------------------------- > tools/testing/selftests/mm/vm_util.c | 27 ++++++++++++++++++++++++++ > tools/testing/selftests/mm/vm_util.h | 1 + > 3 files changed, 30 insertions(+), 27 deletions(-) > > diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c > index dc9d6fe86028..7f3b620d9cb7 100644 > --- a/tools/testing/selftests/mm/cow.c > +++ b/tools/testing/selftests/mm/cow.c > @@ -14,7 +14,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -70,31 +69,6 @@ static void detect_huge_zeropage(void) > close(fd); > } > > -static void detect_hugetlbsizes(void) > -{ > - DIR *dir = opendir("/sys/kernel/mm/hugepages/"); > - > - if (!dir) > - return; > - > - while (nr_hugetlbsizes < ARRAY_SIZE(hugetlbsizes)) { > - struct dirent *entry = readdir(dir); > - size_t kb; > - > - if (!entry) > - break; > - if (entry->d_type != DT_DIR) > - continue; > - if (sscanf(entry->d_name, "hugepages-%zukB", &kb) != 1) > - continue; > - hugetlbsizes[nr_hugetlbsizes] = kb * 1024; > - nr_hugetlbsizes++; > - ksft_print_msg("[INFO] detected hugetlb size: %zu KiB\n", > - kb); > - } > - closedir(dir); > -} > - > static bool range_is_swapped(void *addr, size_t size) > { > for (; size; addr += pagesize, size -= pagesize) > @@ -1717,7 +1691,8 @@ int main(int argc, char **argv) > if (thpsize) > ksft_print_msg("[INFO] detected THP size: %zu KiB\n", > thpsize / 1024); > - detect_hugetlbsizes(); > + nr_hugetlbsizes = detect_hugetlb_page_sizes(hugetlbsizes, > + ARRAY_SIZE(hugetlbsizes)); > detect_huge_zeropage(); > > ksft_print_header(); > diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c > index 9b06a5034808..5cf84d860076 100644 > --- a/tools/testing/selftests/mm/vm_util.c > +++ b/tools/testing/selftests/mm/vm_util.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > #include > #include > +#include > #include > #include > #include > @@ -198,6 +199,32 @@ unsigned long default_huge_page_size(void) > return hps; > } > > +int detect_hugetlb_page_sizes(size_t sizes[], int max) > +{ > + DIR *dir = opendir("/sys/kernel/mm/hugepages/"); > + int count = 0; > + > + if (!dir) > + return 0; > + > + while (count < max) { > + struct dirent *entry = readdir(dir); > + size_t kb; > + > + if (!entry) > + break; > + if (entry->d_type != DT_DIR) > + continue; > + if (sscanf(entry->d_name, "hugepages-%zukB", &kb) != 1) > + continue; > + sizes[count++] = kb * 1024; > + ksft_print_msg("[INFO] detected hugetlb page size: %zu KiB\n", > + kb); > + } > + closedir(dir); > + return count; > +} > + > /* If `ioctls' non-NULL, the allowed ioctls will be returned into the var */ > int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len, > bool miss, bool wp, bool minor, uint64_t *ioctls) > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h > index b950bd16083a..99b795528716 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -44,6 +44,7 @@ bool check_huge_file(void *addr, int nr_hpages, uint64_t hpage_size); > bool check_huge_shmem(void *addr, int nr_hpages, uint64_t hpage_size); > int64_t allocate_transhuge(void *ptr, int pagemap_fd); > unsigned long default_huge_page_size(void); > +int detect_hugetlb_page_sizes(size_t sizes[], int max); > > int uffd_register(int uffd, void *addr, uint64_t len, > bool miss, bool wp, bool minor); > -- > 2.40.1 > Looks good to me, Reviewed-by: Lorenzo Stoakes