From patchwork Fri Aug 12 01:28:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zach O'Keefe X-Patchwork-Id: 12941856 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 6014BC25B0F for ; Fri, 12 Aug 2022 01:29:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 264288E000A; Thu, 11 Aug 2022 21:29:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 14BD78E0002; Thu, 11 Aug 2022 21:29:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E91E88E000A; Thu, 11 Aug 2022 21:29:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CF1D98E0002 for ; Thu, 11 Aug 2022 21:29:24 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A7B55140DED for ; Fri, 12 Aug 2022 01:29:24 +0000 (UTC) X-FDA: 79789207848.05.06BDB6A Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf31.hostedemail.com (Postfix) with ESMTP id 5420220063 for ; Fri, 12 Aug 2022 01:29:24 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-3283109eae2so163658787b3.15 for ; Thu, 11 Aug 2022 18:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc; bh=3nr5F4A0+V9kT3e8RFu9Rt2OU6PrFOrt3oixvjMWIP4=; b=BzQKXHqXxtv8Y0KdtRPFwLesTcd3VyMOp5wAIlsmrKO4offPTCdjcwbbWy3cjHZAw4 Ahbu+anJnLslYvYK3RmElkc5Dwbnv1C+ruW04yiCA5gbWWrN6YPzLhLydDcy5lW/8+xp cQqFRD68mlwh6WMa9+0fwMGTgZg7BpYDtT33Uy1SO/UkwZz5Ou3EEumNV1MtRPCqGndE F9VXD/3uQUgFRbb9C4Q1PSrcBXuAEQIPixUgMMd9vkLVK/ErcoZtCp/IIXsCp0TlbFxe lkF6zJ9wKyDya/LZ94/IxjHbcu/xJhKYswUmhQAHbnyYZHGSRmVAUNnh02gf1+95t680 FFVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc; bh=3nr5F4A0+V9kT3e8RFu9Rt2OU6PrFOrt3oixvjMWIP4=; b=eWZ67iQ+FHPU5bGMKpkGsKnWW80G4LbWafkhyKiDQPvPajutiyF8wc9Ld329oKpWeY TBUKBxUvSn3SLEzPIrpF3ZWo8Uao1+QLdwEj1cs6/v239C9inQP/MfIlE1ic2GIQIBHD 4HCEY4xeZrTpspELSn58TrgW+A4J1eCsPfbyy8CXkfeX1zcEGsVJl4ldg+UweOQso2Ec nXwOYu6XkprTYcSXjGVBkQeq/wg8NsVcisjwjjwJ+BGh4xSNCHEPrRGwnXN54tyjdFjw FEN4vR76f/vp4mUsWRV/8nxTN2b5SmaGL+mIQ8a6BVWrdw2aWKhoRB6TmB7ihiSVjZH7 gvQA== X-Gm-Message-State: ACgBeo1YjJ4/hTkaDlG7dMVfZR8GM2FxGE1nEju3NViJNZvig3rMZWn6 KX5fSjxq5ylfAzzVjSx+whjFiY39JcNuFNIuGnTvlHP7sNo7GGl8dUvYvoG4B4vYDHlYFd1Yi5Z oXVmX+WHD4V/P+5a0P5CvnjmKezssasZ+jftOrvLk6n3dMScbMp0geGjU3xk= X-Google-Smtp-Source: AA6agR6ulngYI/v6NVs1U4tPPWTVg71A/WeAFkA5PPUMKbw8wUhLJTepAceA9Vo4UnofGXO1hLytr174K7IP X-Received: from zokeefe3.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b6]) (user=zokeefe job=sendgmr) by 2002:a0d:df4e:0:b0:31f:56c7:ba0a with SMTP id i75-20020a0ddf4e000000b0031f56c7ba0amr1913148ywe.384.1660267763600; Thu, 11 Aug 2022 18:29:23 -0700 (PDT) Date: Thu, 11 Aug 2022 18:28:42 -0700 In-Reply-To: <20220812012843.3948330-1-zokeefe@google.com> Message-Id: <20220812012843.3948330-9-zokeefe@google.com> Mime-Version: 1.0 References: <20220812012843.3948330-1-zokeefe@google.com> X-Mailer: git-send-email 2.37.1.559.g78731f0fdb-goog Subject: [PATCH mm-unstable 8/9] selftests/vm: add thp collapse shmem testing From: "Zach O'Keefe" To: linux-mm@kvack.org Cc: Andrew Morton , linux-api@vger.kernel.org, Axel Rasmussen , James Houghton , Hugh Dickins , Yang Shi , Miaohe Lin , David Hildenbrand , David Rientjes , Matthew Wilcox , Pasha Tatashin , Peter Xu , Rongwei Wang , SeongJae Park , Song Liu , Vlastimil Babka , Chris Kennelly , "Kirill A. Shutemov" , Minchan Kim , Patrick Xia , "Zach O'Keefe" ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BzQKXHqX; spf=pass (imf31.hostedemail.com: domain of 386z1YgcKCEI3soiijiksskpi.gsqpmry1-qqozego.svk@flex--zokeefe.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=386z1YgcKCEI3soiijiksskpi.gsqpmry1-qqozego.svk@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660267764; a=rsa-sha256; cv=none; b=8PWBmTRrUZmegW4p7o9Ekj6Dqmqk8P3PIS3brRZW3LTQba/0k8RD++7eFHNmj6p/lKHsxJ r/lRs1Ht/c7kM0t8tuTbyYss/utOdq/0dWtyCyCZP4CQkiNPUOFGtBneqZYyX0s4gUpzE5 RK3gz9f6qXI1G92o2U5W3EKFCHS+YXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660267764; 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=3nr5F4A0+V9kT3e8RFu9Rt2OU6PrFOrt3oixvjMWIP4=; b=19Dr/Y+CXzCh3XjdRj5IjB+h2wS59fZbC0/o1+YuPAPP43oqZu2mYvzDIVUkZCaAJKsmw8 eXSy+X2rDDNMFNMlokM/sSkSd6EEWsz6IbRA375sxrpkKoNKC3TrvkLvSdPWgoOLC/C9Ux cBgtqIiRy/VBcOnX+1BqIQMdJGIybYM= Authentication-Results: imf31.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=BzQKXHqX; spf=pass (imf31.hostedemail.com: domain of 386z1YgcKCEI3soiijiksskpi.gsqpmry1-qqozego.svk@flex--zokeefe.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=386z1YgcKCEI3soiijiksskpi.gsqpmry1-qqozego.svk@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5420220063 X-Stat-Signature: xuia6quhbtrya1mayakaczncu9qqcwxs X-Rspam-User: X-HE-Tag: 1660267764-798885 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 memory operations for shmem (memfd) memory, and reuse existing tests with the new memory operations. Shmem tests can be called with "shmem" mem_type, and shmem tests are ran with "all" mem_type as well. Signed-off-by: Zach O'Keefe --- tools/testing/selftests/vm/khugepaged.c | 57 ++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/vm/khugepaged.c b/tools/testing/selftests/vm/khugepaged.c index 0ddfffb87411..9a136f65d43a 100644 --- a/tools/testing/selftests/vm/khugepaged.c +++ b/tools/testing/selftests/vm/khugepaged.c @@ -57,6 +57,7 @@ struct mem_ops { static struct mem_ops *file_ops; static struct mem_ops *anon_ops; +static struct mem_ops *shmem_ops; struct collapse_context { void (*collapse)(const char *msg, char *p, int nr_hpages, @@ -637,6 +638,40 @@ static bool file_check_huge(void *addr, int nr_hpages) } } +static void *shmem_setup_area(int nr_hpages) +{ + void *p; + unsigned long size = nr_hpages * hpage_pmd_size; + + finfo.fd = memfd_create("khugepaged-selftest-collapse-shmem", 0); + if (finfo.fd < 0) { + perror("memfd_create()"); + exit(EXIT_FAILURE); + } + if (ftruncate(finfo.fd, size)) { + perror("ftruncate()"); + exit(EXIT_FAILURE); + } + p = mmap(BASE_ADDR, size, PROT_READ | PROT_WRITE, MAP_SHARED, finfo.fd, + 0); + if (p != BASE_ADDR) { + perror("mmap()"); + exit(EXIT_FAILURE); + } + return p; +} + +static void shmem_cleanup_area(void *p, unsigned long size) +{ + munmap(p, size); + close(finfo.fd); +} + +static bool shmem_check_huge(void *addr, int nr_hpages) +{ + return check_huge_shmem(addr, nr_hpages, hpage_pmd_size); +} + static struct mem_ops __anon_ops = { .setup_area = &anon_setup_area, .cleanup_area = &anon_cleanup_area, @@ -653,6 +688,14 @@ static struct mem_ops __file_ops = { .name = "file", }; +static struct mem_ops __shmem_ops = { + .setup_area = &shmem_setup_area, + .cleanup_area = &shmem_cleanup_area, + .fault = &anon_fault, + .check_huge = &shmem_check_huge, + .name = "shmem", +}; + static void __madvise_collapse(const char *msg, char *p, int nr_hpages, struct mem_ops *ops, bool expect) { @@ -1214,7 +1257,7 @@ static void usage(void) fprintf(stderr, "\nUsage: ./khugepaged [dir]\n\n"); fprintf(stderr, "\t\t: :\n"); fprintf(stderr, "\t\t: [all|khugepaged|madvise]\n"); - fprintf(stderr, "\t\t: [all|anon|file]\n"); + fprintf(stderr, "\t\t: [all|anon|file|shmem]\n"); fprintf(stderr, "\n\t\"file,all\" mem_type requires [dir] argument\n"); fprintf(stderr, "\n\t\"file,all\" mem_type requires kernel built with\n"); fprintf(stderr, "\tCONFIG_READ_ONLY_THP_FOR_FS=y\n"); @@ -1256,10 +1299,13 @@ static void parse_test_type(int argc, const char **argv) if (!strcmp(buf, "all")) { file_ops = &__file_ops; anon_ops = &__anon_ops; + shmem_ops = &__shmem_ops; } else if (!strcmp(buf, "anon")) { anon_ops = &__anon_ops; } else if (!strcmp(buf, "file")) { file_ops = &__file_ops; + } else if (!strcmp(buf, "shmem")) { + shmem_ops = &__shmem_ops; } else { usage(); } @@ -1278,7 +1324,7 @@ int main(int argc, const char **argv) struct settings default_settings = { .thp_enabled = THP_MADVISE, .thp_defrag = THP_DEFRAG_ALWAYS, - .shmem_enabled = SHMEM_NEVER, + .shmem_enabled = SHMEM_ADVISE, .use_zero_page = 0, .khugepaged = { .defrag = 1, @@ -1322,16 +1368,20 @@ int main(int argc, const char **argv) TEST(collapse_full, khugepaged_context, anon_ops); TEST(collapse_full, khugepaged_context, file_ops); + TEST(collapse_full, khugepaged_context, shmem_ops); TEST(collapse_full, madvise_context, anon_ops); TEST(collapse_full, madvise_context, file_ops); + TEST(collapse_full, madvise_context, shmem_ops); TEST(collapse_empty, khugepaged_context, anon_ops); TEST(collapse_empty, madvise_context, anon_ops); TEST(collapse_single_pte_entry, khugepaged_context, anon_ops); TEST(collapse_single_pte_entry, khugepaged_context, file_ops); + TEST(collapse_single_pte_entry, khugepaged_context, shmem_ops); TEST(collapse_single_pte_entry, madvise_context, anon_ops); TEST(collapse_single_pte_entry, madvise_context, file_ops); + TEST(collapse_single_pte_entry, madvise_context, shmem_ops); TEST(collapse_max_ptes_none, khugepaged_context, anon_ops); TEST(collapse_max_ptes_none, khugepaged_context, file_ops); @@ -1345,8 +1395,10 @@ int main(int argc, const char **argv) TEST(collapse_full_of_compound, khugepaged_context, anon_ops); TEST(collapse_full_of_compound, khugepaged_context, file_ops); + TEST(collapse_full_of_compound, khugepaged_context, shmem_ops); TEST(collapse_full_of_compound, madvise_context, anon_ops); TEST(collapse_full_of_compound, madvise_context, file_ops); + TEST(collapse_full_of_compound, madvise_context, shmem_ops); TEST(collapse_compound_extreme, khugepaged_context, anon_ops); TEST(collapse_compound_extreme, madvise_context, anon_ops); @@ -1368,6 +1420,7 @@ int main(int argc, const char **argv) TEST(madvise_collapse_existing_thps, madvise_context, anon_ops); TEST(madvise_collapse_existing_thps, madvise_context, file_ops); + TEST(madvise_collapse_existing_thps, madvise_context, shmem_ops); restore_settings(0); }