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 5C865C433EF for ; Fri, 4 Feb 2022 20:21:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C16488D000E; Fri, 4 Feb 2022 15:21:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BA3E28D0007; Fri, 4 Feb 2022 15:21:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81BED8D000E; Fri, 4 Feb 2022 15:21:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 6DFDD8D0007 for ; Fri, 4 Feb 2022 15:21:41 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2D44318215EC1 for ; Fri, 4 Feb 2022 20:21:41 +0000 (UTC) X-FDA: 79106218002.24.AC876DB Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id B2E3220006 for ; Fri, 4 Feb 2022 20:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=n98nGVb9Cb+XvLGLcWCumBllUZqlAwFV4o2oMVvKDzc=; b=cOdXsc5mMVDJurAC+imkmuYttX 3OQsK0McDFwlZIciCYO6E5DH/6M0d69UVVeEwve9KYcFdsYomkwTXHMooUxJu23oEE5tq22dV5GCk YHU1nqo+L6rTpOCkw+/X6IIn40ciY/QvKg3KTvrCpMU6XlL+gTCIb7hRryxSwLU+Gw9UjRKPz8M/S bLtuJ05gTy+4xt4bVVNjV0D5jI5tgs70cVGawKf3TE26pVLqDhWOsM3Sfft8HbvuZ1lke4y9xybpt AyuawnkdC0aDDayzxFsLPS6D6dyB0SZnyRHwppLdZd3S0IZqGMhNvnMbfbR9KMFGqpvsrjvvwyEmf QMPK21rA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG4jc-007Ls3-Hy; Fri, 04 Feb 2022 19:59:08 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org Subject: [PATCH 75/75] selftests/vm/transhuge-stress: Support file-backed PMD folios Date: Fri, 4 Feb 2022 19:58:52 +0000 Message-Id: <20220204195852.1751729-76-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220204195852.1751729-1-willy@infradead.org> References: <20220204195852.1751729-1-willy@infradead.org> MIME-Version: 1.0 X-Rspam-User: nil X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B2E3220006 X-Stat-Signature: fjghcmfhyj4icneck1j81phb6echwk5u Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=cOdXsc5m; dmarc=none; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1644006100-439283 Content-Transfer-Encoding: quoted-printable 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: Add a -f option to test PMD folios on files Signed-off-by: Matthew Wilcox (Oracle) --- tools/testing/selftests/vm/transhuge-stress.c | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/vm/transhuge-stress.c b/tools/testin= g/selftests/vm/transhuge-stress.c index 5e4c036f6ad3..a03cb3fce1f6 100644 --- a/tools/testing/selftests/vm/transhuge-stress.c +++ b/tools/testing/selftests/vm/transhuge-stress.c @@ -26,15 +26,17 @@ #define PAGEMAP_PFN(ent) ((ent) & ((1ull << 55) - 1)) =20 int pagemap_fd; +int backing_fd =3D -1; +int mmap_flags =3D MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE; +#define PROT_RW (PROT_READ | PROT_WRITE) =20 int64_t allocate_transhuge(void *ptr) { uint64_t ent[2]; =20 /* drop pmd */ - if (mmap(ptr, HPAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_FIXED | MAP_ANONYMOUS | - MAP_NORESERVE | MAP_PRIVATE, -1, 0) !=3D ptr) + if (mmap(ptr, HPAGE_SIZE, PROT_RW, MAP_FIXED | mmap_flags, + backing_fd, 0) !=3D ptr) errx(2, "mmap transhuge"); =20 if (madvise(ptr, HPAGE_SIZE, MADV_HUGEPAGE)) @@ -60,6 +62,8 @@ int main(int argc, char **argv) size_t ram, len; void *ptr, *p; struct timespec a, b; + int i =3D 0; + char *name =3D NULL; double s; uint8_t *map; size_t map_len; @@ -69,13 +73,23 @@ int main(int argc, char **argv) ram =3D SIZE_MAX / 4; else ram *=3D sysconf(_SC_PAGESIZE); + len =3D ram; + + while (++i < argc) { + if (!strcmp(argv[i], "-h")) + errx(1, "usage: %s [size in MiB]", argv[0]); + else if (!strcmp(argv[i], "-f")) + name =3D argv[++i]; + else + len =3D atoll(argv[i]) << 20; + } =20 - if (argc =3D=3D 1) - len =3D ram; - else if (!strcmp(argv[1], "-h")) - errx(1, "usage: %s [size in MiB]", argv[0]); - else - len =3D atoll(argv[1]) << 20; + if (name) { + backing_fd =3D open(name, O_RDWR); + if (backing_fd =3D=3D -1) + errx(2, "open %s", name); + mmap_flags =3D MAP_SHARED; + } =20 warnx("allocate %zd transhuge pages, using %zd MiB virtual memory" " and %zd MiB of ram", len >> HPAGE_SHIFT, len >> 20, @@ -86,8 +100,7 @@ int main(int argc, char **argv) err(2, "open pagemap"); =20 len -=3D len % HPAGE_SIZE; - ptr =3D mmap(NULL, len + HPAGE_SIZE, PROT_READ | PROT_WRITE, - MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE, -1, 0); + ptr =3D mmap(NULL, len + HPAGE_SIZE, PROT_RW, mmap_flags, backing_fd, 0= ); if (ptr =3D=3D MAP_FAILED) err(2, "initial mmap"); ptr +=3D HPAGE_SIZE - (uintptr_t)ptr % HPAGE_SIZE; --=20 2.34.1