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 C09D3C433F5 for ; Tue, 4 Oct 2022 22:05:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4256C6B0071; Tue, 4 Oct 2022 18:05:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D3D36B0073; Tue, 4 Oct 2022 18:05:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 275C16B0074; Tue, 4 Oct 2022 18:05:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0613B6B0071 for ; Tue, 4 Oct 2022 18:05:03 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D1193A0983 for ; Tue, 4 Oct 2022 22:05:02 +0000 (UTC) X-FDA: 79984648044.13.01DF726 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 3520B1C0012 for ; Tue, 4 Oct 2022 22:05:01 +0000 (UTC) Received: by mail-lj1-f172.google.com with SMTP id b6so16805261ljr.10 for ; Tue, 04 Oct 2022 15:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=JZOjir3bErEGZtdKwYJi22299Sgdh4HK9usPWaztJic=; b=S23DRjlyhxbAzHBeZYgt//cHEKrfwVbpyj/AV8ySrwBEcWKviUVGv3G4JJVRRxU5hS yHeCwjHMfSPqsk984lecY+fJ1mZaN9e+3Jb/X+RzeyVkc+Sk0Eaxgu06DKR5OcH21j2P CT4uoq/YoVqlCe5bwcvh1uAT+RAwe7JjfA643XBUfBKr7hmWAA85mapYRsDpG7fsuU7E 2/HiEonP/aKp7MZtAhZmYaA0wMHpfuurevVGx1J4zgWRHhTAszuVifl9GFt7tR9A/Jij ADJqpl0f3vD2Vm2D+V3GzZF84FW4MaweRpo6+D7nJ1EbTN63XXCoracj/jdcJFWQ9ooU m/JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=JZOjir3bErEGZtdKwYJi22299Sgdh4HK9usPWaztJic=; b=CGnf5Lq8XUXy7RlNtNTXyxFcHrZDSFU7460HkCxCIm7TmmHW3SKsS8pn6xp2oivqKB ZdGR+hIuQGtUMLUjvVUtRzgY/thRwVPg6myydnM0mxhjU2PAD1VjU/I5K1GOfTh36BBb V5kg28x91tHwhuzaSEvTlQclqNcKWY2SqNKN9FUX+BxxzjrVsoGY2QnGdV+gnI3lvkUU HtoWYY+rB8KVY632EFtMJ/X7/BF0Pe/ERl3FGUkjLNqJfD3ogWXm8pXwiKtb2H6vKEPG CWNrPDwEAPKj9S8uios0DmtPEgMyZttJjTHEEW31SCkpEMCNeKHCOFZqerE1/bGJaI9Y g0Pw== X-Gm-Message-State: ACrzQf1s2bzllyXv8tlJTP0qThZedixQDgXqGUWgCM/plOxWMzY363sr qdNZyqaeUkvRdCq8+uGbTouqY3kREpmCCAVoPej2ow== X-Google-Smtp-Source: AMsMyM5q0JRPqQc/cQ8WzhhOr5ZwKE43aj8qiMA6PDjlSsrwUoEm+1Uwd0nC4AF7e8ffT/5Ah6NwAK5VHFJVF7Hoa9o= X-Received: by 2002:a05:651c:882:b0:261:81b3:16b3 with SMTP id d2-20020a05651c088200b0026181b316b3mr8389002ljq.142.1664921100235; Tue, 04 Oct 2022 15:05:00 -0700 (PDT) MIME-Version: 1.0 References: <20221004214125.120993-1-peterx@redhat.com> <20221004214125.120993-2-peterx@redhat.com> In-Reply-To: <20221004214125.120993-2-peterx@redhat.com> From: Axel Rasmussen Date: Tue, 4 Oct 2022 15:04:23 -0700 Message-ID: Subject: Re: [PATCH 1/4] selftests/vm: Use memfd for hugetlb tests To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Mike Kravetz Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=S23DRjly; spf=pass (imf21.hostedemail.com: domain of axelrasmussen@google.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=axelrasmussen@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664921102; a=rsa-sha256; cv=none; b=F68o4XDFu1v1kgceZ6kMqhWHeyq263JgeYKFpFYTQnXNwCnKVYHRG0l3zemta5803UK896 NAZvLhgBXuneDpA/pqquqr7VtStJ9krYmsAl0d9d22MqT1+5n/pQd3cLL7WR0t3saKV5FX xzJN6RYq4oNSLkj1nXh9crjR4gqzJ3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664921102; 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=JZOjir3bErEGZtdKwYJi22299Sgdh4HK9usPWaztJic=; b=Dq9iZBlXKipkWDEDSX6CSN//YZtrkmXgkzTpzB81xois7p0iW0LngH8LaDa6krylrT2gsy YBBQP2EA68wlaNwk1MrthrPwsCdFyBRc8A1Na5l6x2ABz1UlrvtYcbcLUwifvJGR/NSxee pvofpJWlfvDxP++ILrsmGzgEOJkzK6E= X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3520B1C0012 X-Rspam-User: Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=S23DRjly; spf=pass (imf21.hostedemail.com: domain of axelrasmussen@google.com designates 209.85.208.172 as permitted sender) smtp.mailfrom=axelrasmussen@google.com; dmarc=pass (policy=reject) header.from=google.com X-Stat-Signature: ym3kq6n6fp7yeh34w1mffofhjf7761hm X-HE-Tag: 1664921101-788159 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 Tue, Oct 4, 2022 at 2:41 PM Peter Xu wrote: > > We already used memfd for shmem test, move it forward with hugetlb too so > that we don't need user to specify the hugetlb file path explicitly when > running hugetlb shared tests. > > Signed-off-by: Peter Xu > --- > tools/testing/selftests/vm/userfaultfd.c | 60 ++++++++---------------- > 1 file changed, 20 insertions(+), 40 deletions(-) > > diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c > index 74babdbc02e5..c0c6853cdce5 100644 > --- a/tools/testing/selftests/vm/userfaultfd.c > +++ b/tools/testing/selftests/vm/userfaultfd.c > @@ -93,10 +93,8 @@ static volatile bool test_uffdio_zeropage_eexist = true; > static bool test_uffdio_wp = true; > /* Whether to test uffd minor faults */ > static bool test_uffdio_minor = false; > - > static bool map_shared; > -static int shm_fd; > -static int huge_fd; > +static int mem_fd; > static unsigned long long *count_verify; > static int uffd = -1; > static int uffd_flags, finished, *pipefd; > @@ -260,35 +258,21 @@ static void hugetlb_release_pages(char *rel_area) > > static void hugetlb_allocate_area(void **alloc_area, bool is_src) > { > + off_t size = nr_pages * page_size; > + off_t offset = is_src ? 0 : size; > void *area_alias = NULL; > char **alloc_area_alias; > > - if (!map_shared) > - *alloc_area = mmap(NULL, > - nr_pages * page_size, > - PROT_READ | PROT_WRITE, > - MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | > - (is_src ? 0 : MAP_NORESERVE), > - -1, > - 0); > - else > - *alloc_area = mmap(NULL, > - nr_pages * page_size, > - PROT_READ | PROT_WRITE, > - MAP_SHARED | > - (is_src ? 0 : MAP_NORESERVE), > - huge_fd, > - is_src ? 0 : nr_pages * page_size); > + *alloc_area = mmap(NULL, size, PROT_READ | PROT_WRITE, > + (map_shared ? MAP_SHARED : MAP_PRIVATE) | > + (is_src ? 0 : MAP_NORESERVE), > + mem_fd, offset); > if (*alloc_area == MAP_FAILED) > err("mmap of hugetlbfs file failed"); > > if (map_shared) { > - area_alias = mmap(NULL, > - nr_pages * page_size, > - PROT_READ | PROT_WRITE, > - MAP_SHARED, > - huge_fd, > - is_src ? 0 : nr_pages * page_size); > + area_alias = mmap(NULL, size, PROT_READ | PROT_WRITE, > + MAP_SHARED, mem_fd, offset); > if (area_alias == MAP_FAILED) > err("mmap of hugetlb file alias failed"); > } > @@ -334,14 +318,14 @@ static void shmem_allocate_area(void **alloc_area, bool is_src) > } > > *alloc_area = mmap(p, bytes, PROT_READ | PROT_WRITE, MAP_SHARED, > - shm_fd, offset); > + mem_fd, offset); > if (*alloc_area == MAP_FAILED) > err("mmap of memfd failed"); > if (test_collapse && *alloc_area != p) > err("mmap of memfd failed at %p", p); > > area_alias = mmap(p_alias, bytes, PROT_READ | PROT_WRITE, MAP_SHARED, > - shm_fd, offset); > + mem_fd, offset); > if (area_alias == MAP_FAILED) > err("mmap of memfd alias failed"); > if (test_collapse && area_alias != p_alias) > @@ -1821,21 +1805,17 @@ int main(int argc, char **argv) > } > nr_pages = nr_pages_per_cpu * nr_cpus; > > - if (test_type == TEST_HUGETLB && map_shared) { > - if (argc < 5) > - usage(); > - huge_fd = open(argv[4], O_CREAT | O_RDWR, 0755); > - if (huge_fd < 0) > - err("Open of %s failed", argv[4]); > - if (ftruncate(huge_fd, 0)) > - err("ftruncate %s to size 0 failed", argv[4]); We should also update the examples / help text near the top of the file, since we're changing what arguments this accepts. It might also be better to squash the changes to test arguments in run_vmtests.sh into each patch, so if we're bisecting we'll have a matching / working test + run_vmtests.sh combo at each commit. > - } else if (test_type == TEST_SHMEM) { > - shm_fd = memfd_create(argv[0], 0); > - if (shm_fd < 0) > + if (test_type == TEST_SHMEM || test_type == TEST_HUGETLB) { > + unsigned int memfd_flags = 0; > + > + if (test_type == TEST_HUGETLB) > + memfd_flags = MFD_HUGETLB; > + mem_fd = memfd_create(argv[0], memfd_flags); > + if (mem_fd < 0) > err("memfd_create"); > - if (ftruncate(shm_fd, nr_pages * page_size * 2)) > + if (ftruncate(mem_fd, nr_pages * page_size * 2)) > err("ftruncate"); > - if (fallocate(shm_fd, > + if (fallocate(mem_fd, > FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, 0, > nr_pages * page_size * 2)) > err("fallocate"); > -- > 2.37.3 > This is a nice simplification! Thanks for doing it. Besides the comments above, the rest of the code here looks correct to me. Feel free to take: Reviewed-by: Axel Rasmussen