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 EAF79C77B60 for ; Thu, 30 Mar 2023 20:30:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74A77900002; Thu, 30 Mar 2023 16:30:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FA8E6B0085; Thu, 30 Mar 2023 16:30:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59BD6900002; Thu, 30 Mar 2023 16:30:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4AE4B6B0083 for ; Thu, 30 Mar 2023 16:30:46 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1F6E1A0BA7 for ; Thu, 30 Mar 2023 20:30:46 +0000 (UTC) X-FDA: 80626708092.02.A6EF484 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by imf09.hostedemail.com (Postfix) with ESMTP id 4315A140008 for ; Thu, 30 Mar 2023 20:30:43 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=EKma1yxP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of axelrasmussen@google.com designates 209.85.167.42 as permitted sender) smtp.mailfrom=axelrasmussen@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680208244; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ibqoW3aqug8lkTzee2r6dDS7STVhEoPrqifxRDlW8Ew=; b=0+G2yMWFvtK/fgOj1KrolYkSWkMsX+2mL169/HEDn4s9aHGQWbN8nS9kZmT9UG4yzPOQvb ryRJjw2PaxxtFFV4PNJhA1iVEFEdty56fxAAisUbDxjLoyYmf9WEhrQ6BzArXUr2rkk8jE tZm8IhyT1dRUjlPM2YvBC4G0Hh9ib4w= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=EKma1yxP; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf09.hostedemail.com: domain of axelrasmussen@google.com designates 209.85.167.42 as permitted sender) smtp.mailfrom=axelrasmussen@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680208244; a=rsa-sha256; cv=none; b=l7RJu6E0OE/oeUgubGWxY1g2v72+Nw7XuepKtU71/ogdN8KjUhpDI20jngSyl9IbVc6csn X2xNiVb9qpnILlkHBsxrmwue2g5BMXxAnSIqOxt1rfTn1IdlqS42GJe0X6i4A9qFi1KIZ9 K7JTdzMDEaTRJQY17swIk4Lpfx+J/S8= Received: by mail-lf1-f42.google.com with SMTP id y15so26112705lfa.7 for ; Thu, 30 Mar 2023 13:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680208242; x=1682800242; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=ibqoW3aqug8lkTzee2r6dDS7STVhEoPrqifxRDlW8Ew=; b=EKma1yxPhX7S7dNEjIgjcNMi1jPUfyn/Z3BVoYLK3q7ysAYFxDxRTekPFQ9THsHBU5 6SsdoxySmNSRlLIVgsPqfUeF7LJ7t6Thi/wNpKjGa/BhGaZX22sZgNgf39nFa/HSKsDa Qee/o4Pp8Kh6MK6ca9kuNkG+QFScr+tuLmuMlCGGJJm4g9ysiXpO8aUsZCdRcPJdXbxV VFV4hlVYP1+MMgb/j2GhIMCLDHrflioyiidAeg2NbJSLFcX/f3uU/g8uxYqEcaW4lMTU 4eubA30dTML5nAFdrOVdGzv62fj1XpDhpwPQutcmk+fmEho17pdJTDqNr1k7ukW0Q9Rk pk4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680208242; x=1682800242; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ibqoW3aqug8lkTzee2r6dDS7STVhEoPrqifxRDlW8Ew=; b=feQhsoQYlMXUG9jbe2M3NJN+Bx71q+fq29Lj4pVfKRYFJpHa6u+Ew3wRYgFu3SC22I dgUB2S8+hWPu3Qs7vVJiOgSkf9UNjXf8eaE66bylq3sXdWhcfSGMXz9oDlNkvw8feZLQ bbGiQm+CEsHAQZYCUqcW26fAD8GjLdb/SHrzLpuoOTLPYfsV6aUPVflHKf8V5Lqyt5cM 49avlfzIwIKg4HQvGyoOBbMqHpQS08R5BNZ12ylbs4+JsGbnzbREgdH6JfEjZb02VHYY Zav9K8UVw3A+20duWChAoXOq8JmgxqK0vhsG1wRICP5iwS1puSQFhZevfxSJztnRGkgM +YBA== X-Gm-Message-State: AAQBX9egCVdgQGeOWwgXREas6RGCK6k74t6g+Ocq3un7iuYdhWw38Tk2 D149nVJIyzl7byxgrXmdwdozOQALA9qxJb/8i9fv4A== X-Google-Smtp-Source: AKy350aidLSuvX9vJo0uXrSBh5Sk3mH+O9VXXztPPBDn8TXDbKcIWfm/n73qRTubf0tO5RMGGRQK5WHyyA5yUAHn+G8= X-Received: by 2002:ac2:50c3:0:b0:4d5:ca32:6aea with SMTP id h3-20020ac250c3000000b004d5ca326aeamr7392071lfm.10.1680208242140; Thu, 30 Mar 2023 13:30:42 -0700 (PDT) MIME-Version: 1.0 References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160705.3106966-1-peterx@redhat.com> In-Reply-To: <20230330160705.3106966-1-peterx@redhat.com> From: Axel Rasmussen Date: Thu, 30 Mar 2023 13:30:05 -0700 Message-ID: Subject: Re: [PATCH 07/29] selftests/mm: Merge default_huge_page_size() into one To: Peter Xu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , Andrea Arcangeli , Mike Kravetz , Leonardo Bras Soares Passos , Mike Rapoport , Nadav Amit Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4315A140008 X-Stat-Signature: gj4btmecskmeb9hxk3wrtny6zes3tr8q X-HE-Tag: 1680208243-771168 X-HE-Meta: U2FsdGVkX1+D6hqBX2qhD89kkketDtaDEEyDo6RbsjXUtC3xElQdrWGTX6Yx5hesb58LKOJJGMV05uHXnKQjpojYTTn3iZzuqiL8q6GkpFbNUsRyI6mUDSTlks0B0rXTDKSG8Rnzide5JZUjN4NE4c8cRVyQ6osMmk1GYhyA31+qO7hrvZcqRPMUmounyuRVD7gTf9nVMsSp1pGXe5A4AS3tfHoSgk5Am/2LG5y5zhVW8Cqu+Nh8AVaEGMSot+pxT8crzR5+amWN9u/SIerLyahRjRX6I82BefKzEM5RaqJei7onJ/hbGKyIg4rXQDgGydf0OgnbvjAxI5zXGIXlfdpEUyDAIpBkP8htTDKR1MTNdQhIis9c4gKvoiqKv/y/hLY7dQP7wSYGXLPg7TXiX1xotc23hwEf/E7V2AkJOEErQXSJxZPbdpvRdQM5fDhmKbmgG4fcmnww7d7GIjez+PCmBHZKyQVnztu0jr6LVzgvhkLHvyZrIqploP9cm3GlgSrCmC1L42FdUsRgWkG4E0rn+84EWcuPf8aR7QHfPUYRYYz7SYcN4vCq8c2MPW3jgf5cRHRCVIribxFqkJ/hYPHsysc3LqHwIRfryQdTkq0VWrvP5GAGfaKQ01MYBgYDR50lC5Y5xFFNnYHv/iJoZEzzSB80hepqaHtL5TPRZwKU0kPXjN/j+suUIB7cdm+oCGuqHilStbtIrpesg+nJKTPTodaD5rTNRBwqst7/pONu6TtsPcktGCKBx2E94WpaOFgKMeslUmreSZ2CAFfAqFnNRqnFw3AdMH85IsznjgnldZVCCDXc7N8gbZ2PHzFBg6vjJpjAnYRbV2Y8hwjEpg5LhaaJsy8S+GL/T3fPOfmn/kLmJjsmVduPr0uSz4XNVHVG+fuUi2doLxCjgopj6vTAOuF3Ppin3CLiJNYZ5uRsnxHpDxBpdYp53F2f+1zNmhyzkgIpIotFNApRWSz B84vwdqH Wyup1E5+Rwp+5+GRlPYy3Bvkfv2vTZCLDqWkbl0fcqfV5cnNFwE2zdL09y9JUO33nuu6WwqAKsRW3GlMcAgXMz+0pU3GgJ/URP4gzM5d59cRMEddCqtWrIOdZ0cQwp69SkU5RkrU3ZVW2g5YFg3t2qCfGG7Uq7E7wUPQ1pJL80vw9oSXpkNiA2ktmOozOMPFw1Rln0mxoccaVLmbqJD5CfdnyxEsq8eczaIEVmQmpct/UF3X0Gq406sClNc4aIN8pD6vaDcGzNwoYPYjawbSLdz89KElY0c4JPwEJxNVf1wmtexAs1JCyfutLC+jElCqSSSrqUfs2LUQx/XmIkMBtVlbaKJExDLembXIVRQv1W2vDw2BREHVHTyl3CVefGqUq5eSgeeuorEsP2fjNyBaEuJX1B5CWKsGyPQZT 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 Thu, Mar 30, 2023 at 9:07=E2=80=AFAM Peter Xu wrote: > > There're already 3 same definitions of the three functions. Move it into > vm_util.[ch]. > > Signed-off-by: Peter Xu Reviewed-by: Axel Rasmussen > --- > tools/testing/selftests/mm/hugetlb-madvise.c | 25 +------------------- > tools/testing/selftests/mm/thuge-gen.c | 19 +-------------- > tools/testing/selftests/mm/userfaultfd.c | 24 ------------------- > tools/testing/selftests/mm/vm_util.c | 21 ++++++++++++++++ > tools/testing/selftests/mm/vm_util.h | 1 + > 5 files changed, 24 insertions(+), 66 deletions(-) > > diff --git a/tools/testing/selftests/mm/hugetlb-madvise.c b/tools/testing= /selftests/mm/hugetlb-madvise.c > index 9a127a8fe176..28426e30d9bc 100644 > --- a/tools/testing/selftests/mm/hugetlb-madvise.c > +++ b/tools/testing/selftests/mm/hugetlb-madvise.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include "vm_util.h" > > #define MIN_FREE_PAGES 20 > #define NR_HUGE_PAGES 10 /* common number of pages to map/allocate= */ > @@ -35,30 +36,6 @@ > unsigned long huge_page_size; > unsigned long base_page_size; > > -/* > - * default_huge_page_size copied from mlock2-tests.c > - */ > -unsigned long default_huge_page_size(void) > -{ > - unsigned long hps =3D 0; > - char *line =3D NULL; > - size_t linelen =3D 0; > - FILE *f =3D fopen("/proc/meminfo", "r"); > - > - if (!f) > - return 0; > - while (getline(&line, &linelen, f) > 0) { > - if (sscanf(line, "Hugepagesize: %lu kB", &hps) =3D= =3D 1) { > - hps <<=3D 10; > - break; > - } > - } > - > - free(line); > - fclose(f); > - return hps; > -} > - > unsigned long get_free_hugepages(void) > { > unsigned long fhp =3D 0; > diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selft= ests/mm/thuge-gen.c > index 361ef7192cc6..380ab5f0a534 100644 > --- a/tools/testing/selftests/mm/thuge-gen.c > +++ b/tools/testing/selftests/mm/thuge-gen.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include "vm_util.h" > > #define err(x) perror(x), exit(1) > > @@ -74,24 +75,6 @@ void find_pagesizes(void) > globfree(&g); > } > > -unsigned long default_huge_page_size(void) > -{ > - unsigned long hps =3D 0; > - char *line =3D NULL; > - size_t linelen =3D 0; > - FILE *f =3D fopen("/proc/meminfo", "r"); > - if (!f) > - return 0; > - while (getline(&line, &linelen, f) > 0) { > - if (sscanf(line, "Hugepagesize: %lu kB", &hps) =3D= =3D 1) { > - hps <<=3D 10; > - break; > - } > - } > - free(line); > - return hps; > -} > - > void show(unsigned long ps) > { > char buf[100]; > diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/sel= ftests/mm/userfaultfd.c > index a96d126cb40e..4cc80a0e8955 100644 > --- a/tools/testing/selftests/mm/userfaultfd.c > +++ b/tools/testing/selftests/mm/userfaultfd.c > @@ -1703,30 +1703,6 @@ static int userfaultfd_stress(void) > || userfaultfd_events_test() || userfaultfd_minor_test(); > } > > -/* > - * Copied from mlock2-tests.c > - */ > -unsigned long default_huge_page_size(void) > -{ > - unsigned long hps =3D 0; > - char *line =3D NULL; > - size_t linelen =3D 0; > - FILE *f =3D fopen("/proc/meminfo", "r"); > - > - if (!f) > - return 0; > - while (getline(&line, &linelen, f) > 0) { > - if (sscanf(line, "Hugepagesize: %lu kB", &hps) =3D= =3D 1) { > - hps <<=3D 10; > - break; > - } > - } > - > - free(line); > - fclose(f); > - return hps; > -} > - > static void set_test_type(const char *type) > { > if (!strcmp(type, "anon")) { > diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftes= ts/mm/vm_util.c > index 0204c469be43..12dc654b5be3 100644 > --- a/tools/testing/selftests/mm/vm_util.c > +++ b/tools/testing/selftests/mm/vm_util.c > @@ -180,3 +180,24 @@ int64_t allocate_transhuge(void *ptr, int pagemap_fd= ) > > return -1; > } > + > +unsigned long default_huge_page_size(void) > +{ > + unsigned long hps =3D 0; > + char *line =3D NULL; > + size_t linelen =3D 0; > + FILE *f =3D fopen("/proc/meminfo", "r"); > + > + if (!f) > + return 0; > + while (getline(&line, &linelen, f) > 0) { > + if (sscanf(line, "Hugepagesize: %lu kB", &hps) =3D= =3D 1) { > + hps <<=3D 10; > + break; > + } > + } > + > + free(line); > + fclose(f); > + return hps; > +} > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftes= ts/mm/vm_util.h > index 6edeb531afc6..d7163fff8fb7 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -35,6 +35,7 @@ bool check_huge_anon(void *addr, int nr_hpages, uint64_= t hpage_size); > 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); > > /* > * On ppc64 this will only work with radix 2M hugepage size > -- > 2.39.1 >