From patchwork Wed Oct 4 17:11:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 148431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp283453vqb; Wed, 4 Oct 2023 10:14:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAOwDZkrF/HQMYcC5KxOPpX5363b6AMqwrrq3P4uzj7x3VNvpIqiIA4D45ukWcwNGkN17Q X-Received: by 2002:a17:903:238f:b0:1c7:436d:ec3a with SMTP id v15-20020a170903238f00b001c7436dec3amr2395568plh.57.1696439677880; Wed, 04 Oct 2023 10:14:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696439677; cv=none; d=google.com; s=arc-20160816; b=Fe1Tr/I1VKEFj0xD8WynNMmlzjsZ9EU/Y4+1F9xyp1gFmMz5gkmhoZleLvlVQ5uW80 Rv3TswSpaLIRJc65qd4OVUG19DL/0pssgq9WIDbiXIctJHaTKN4zpdJQxtybzN5aZJ6X zhyV0rwFIjOlYlCuJAGEo+yFxs1Rhje5Z1QM7LSM36mwcwbu6JeKDDzXxWcorCMg6fCH H/lRnMMMV1uBm50/G6szadxouE9BTsPlAgtGNb1GjqOmJRkEye+QdVU8xdIurRb/KQe/ Vq+o8gK9puXb+FVwszRa/PJT7a9M3HIzNqGfsHI8WV4A9WJ7AaAg3jNbk/9zamIn4HxV 4uoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=CXe2b1SQetsxvQIMHBxAgfGGNR39eEXqqOWXi1pgTdY=; fh=oPccr6L1xYOfJzG3Pt1mbPWtnzp0+sBJjQoU+6uugjU=; b=g8aoFtqpxF1ZKk4W+jaIwg2hot9pVHTiCA0eAIHj/HHJIbTF7q8JBM5h7WRkC2S+Ut NFIf2v5B+tNyheHRVE56A320ISNPdiXENLbaaGUH3yTAAYgGF1NmVg5/+HYHGk5vK2ES vrIwiUo7NgazLL759zPDYCtkNDOmmT2SJWL+DmzfvxpM+hqJq3HhSRUg1XWGnSVibHQ1 5bwkARcPPeRvPxGw0p6Xk2VUIcbMxQnKfMj8OvychGuVsMZ3PW1yl8JWT1N+WSrE5gCV RWC1Ud8lV27gawix+9ixrMq/dsCkcehY5GmkQUrcoGnjtmIuMUGypn7i4urbqKPpdV73 1dVg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id m12-20020a170902c44c00b001c3e13018ffsi3878314plm.51.2023.10.04.10.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:14:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id A175E81C46E1; Wed, 4 Oct 2023 10:14:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243642AbjJDRMN (ORCPT + 18 others); Wed, 4 Oct 2023 13:12:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243627AbjJDRMN (ORCPT ); Wed, 4 Oct 2023 13:12:13 -0400 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6B2395; Wed, 4 Oct 2023 10:12:08 -0700 (PDT) Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-9a58dbd5daeso9467166b.2; Wed, 04 Oct 2023 10:12:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696439527; x=1697044327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=CXe2b1SQetsxvQIMHBxAgfGGNR39eEXqqOWXi1pgTdY=; b=dIBrDsv/omajYDcjt1S5VMcxAxF4ASg9WRLTFh/+Py2WjDs5Icqm2AeLklLYUJh1O8 OX+siDAx/6jYsJw4zOhsVPopKGaL3jzX90IEN9LIUIzJkXVqr4fS80l2gkXi3KIAiDoz U7UKYlxZRhcuqeS8jNLAUgWLvwtNSBc+D9Pop29+x00Ys4M306b3dXRn2Dv9tycxEnr2 Y/CdeNtWF6kCzihYNqnPlBmInZ6lSTWLTnYeowS/uL0aowYKrYJpHS/krP9koy+YgZW9 VINY4byV0dbQea91wMtJ+VASfFjlS0qWyldYmnWHRtWPf4PDY5ozfWEkZwOl0uRb/7M7 oLkA== X-Gm-Message-State: AOJu0Yynvpmr7y/ZV5NlusQqLY8AJKQrgf6VITN2SaS+B4AOAlXcRKoY KX9pbut6iGAQwp5BeWj9P04ZaoiqxXo= X-Received: by 2002:a17:906:5357:b0:9ae:7681:f62a with SMTP id j23-20020a170906535700b009ae7681f62amr3072085ejo.44.1696439527012; Wed, 04 Oct 2023 10:12:07 -0700 (PDT) Received: from localhost (fwdproxy-cln-006.fbsv.net. [2a03:2880:31ff:6::face:b00c]) by smtp.gmail.com with ESMTPSA id z25-20020a1709067e5900b0099bccb03eadsm3064093ejr.205.2023.10.04.10.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:12:06 -0700 (PDT) From: Breno Leitao To: mike.kravetz@oracle.com, muchun.song@linux.dev, akpm@linux-foundation.org, Shuah Khan Cc: linux-mm@kvack.org, riel@surriel.com, linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] selftests/mm: export get_free_hugepages() Date: Wed, 4 Oct 2023 10:11:25 -0700 Message-Id: <20231004171127.106056-1-leitao@debian.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 04 Oct 2023 10:14:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778845931504196515 X-GMAIL-MSGID: 1778845931504196515 get_free_hugepages() is helpful for other hugepage tests. Export it to the common file (vm_util.c) to be reused. Signed-off-by: Breno Leitao --- tools/testing/selftests/mm/hugetlb-madvise.c | 19 ------------------- tools/testing/selftests/mm/vm_util.c | 19 +++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 1 + 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/mm/hugetlb-madvise.c b/tools/testing/selftests/mm/hugetlb-madvise.c index d55322df4b73..f32d99565c5e 100644 --- a/tools/testing/selftests/mm/hugetlb-madvise.c +++ b/tools/testing/selftests/mm/hugetlb-madvise.c @@ -36,25 +36,6 @@ unsigned long huge_page_size; unsigned long base_page_size; -unsigned long get_free_hugepages(void) -{ - unsigned long fhp = 0; - char *line = NULL; - size_t linelen = 0; - FILE *f = fopen("/proc/meminfo", "r"); - - if (!f) - return fhp; - while (getline(&line, &linelen, f) > 0) { - if (sscanf(line, "HugePages_Free: %lu", &fhp) == 1) - break; - } - - free(line); - fclose(f); - return fhp; -} - void write_fault_pages(void *addr, unsigned long nr_pages) { unsigned long i; diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c index 558c9cd8901c..3082b40492dd 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -269,3 +269,22 @@ int uffd_unregister(int uffd, void *addr, uint64_t len) return ret; } + +unsigned long get_free_hugepages(void) +{ + unsigned long fhp = 0; + char *line = NULL; + size_t linelen = 0; + FILE *f = fopen("/proc/meminfo", "r"); + + if (!f) + return fhp; + while (getline(&line, &linelen, f) > 0) { + if (sscanf(line, "HugePages_Free: %lu", &fhp) == 1) + break; + } + + free(line); + fclose(f); + return fhp; +} diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h index c7fa61f0dff8..c02990bbd56f 100644 --- a/tools/testing/selftests/mm/vm_util.h +++ b/tools/testing/selftests/mm/vm_util.h @@ -51,6 +51,7 @@ int uffd_register(int uffd, void *addr, uint64_t len, int uffd_unregister(int uffd, void *addr, uint64_t len); int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len, bool miss, bool wp, bool minor, uint64_t *ioctls); +unsigned long get_free_hugepages(void); /* * On ppc64 this will only work with radix 2M hugepage size From patchwork Wed Oct 4 17:11:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 148430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp282099vqb; Wed, 4 Oct 2023 10:12:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuvnx4DeYA1OSnIVuhZaAZV4ZuClZm0Dd/1cxtAjjQU8yfRxOaZkMa0CjJ35zRxs56qaLD X-Received: by 2002:a9d:6a0b:0:b0:6b9:52cb:3adf with SMTP id g11-20020a9d6a0b000000b006b952cb3adfmr2542342otn.20.1696439546324; Wed, 04 Oct 2023 10:12:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696439546; cv=none; d=google.com; s=arc-20160816; b=lx31UW13bs39Oi4TBbb+KgGI3yQa6sF68fqVoVoI1Abe89reTJZ7is17uVo/0r1zhJ 1hxH99bDXAtxaExpx7IHXRvvst6EdNkN7UUzYUs5ZbG5xxX6i02DU2Bl5OQAwUHTl79w 2TVf7oEoVtj37ZG45TjCEvPG/YoBLgX27XckM3o59aaNehhGp0ikpoOSKAZYY+4SXo1w x9iF/TIzV0G3NKsM3PS5jCGieEIcJZ1vl9vscW0IfCKJ+2JTSAOEbxJUsBZMeND1fJYb I+AURpOpM0MIJ/ErXtyYsl/ZCxWGFkhGc5SoT29RDGRw8JwPSCcYkDf+L2llP+9ia+PG J7fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=v8ih6B2Rlcxp81srnkWek1jGwJ1l7RM9hd1ykDQtxDA=; fh=rADv+LRNTbKQV9sDSNMfE11lOg4Fy3GmZlpncsyzeds=; b=UwuPaL6eJ9yZaW2hLTOlgrWquY6ZTQVk8tK9a3LftWTUobXmsfNjjsLmKcVs8AY4CW 6nlnOSzRnIIKNUvqYYVLvLMQ3CUs6X6nL80w2hfLH8gRAK65khyW67kGOpG75qVdiUaN Q3roeVHi4baCNf5RFitGRd60RNxV3tERtH0pK1/gRz92roNgGjzyNdBoCTXD/BJu/rL7 f2dbTivwAQHAtOg70VJE9XkY8O9uNufk2HTHarkEsfaqKiMIJgRLzNZrLBtMYErS5peF uM7ftCrYz/q5Owqwv3v2Kn8jg452brMyYnQpsfZbE8OnGwbYont7XwudRSXTg0W9LNW0 Gwhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id j70-20020a638b49000000b0057d7cff25a9si3967492pge.323.2023.10.04.10.12.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:12:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 3E79C80D700C; Wed, 4 Oct 2023 10:12:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243649AbjJDRMS (ORCPT + 19 others); Wed, 4 Oct 2023 13:12:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243627AbjJDRMR (ORCPT ); Wed, 4 Oct 2023 13:12:17 -0400 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B48B69E; Wed, 4 Oct 2023 10:12:13 -0700 (PDT) Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-533d6a8d6b6so4526286a12.2; Wed, 04 Oct 2023 10:12:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696439532; x=1697044332; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v8ih6B2Rlcxp81srnkWek1jGwJ1l7RM9hd1ykDQtxDA=; b=aY4OAPMk7QKIAcgujy1hvKphtahUrxQ3db6f4doHZDcErMnLwDIweCWgsM+dyS2vJt Qn/6RJ63LHEH2tQHB4mBLs1SdrZ6o62iKwqCl514aMQzyQhy7dpf+ikMzvZzZpY8JSHA WCSNLshvBEKbUXtu7vcBUcj0UktN986TogNh6bl+4GKZMatKKTQ0AQ1tj9YtAp1wWvHV 9Z9AR1c8jHfzFrjfZ6R8vF5hiyi9KAfZcxkQQiNbcnPUWRqGsn90Do87z49L+Ucn+pqI I5Zw1skzwsmC1Zc+szeGs8o/gsQB0S06WeSKzFLmhEdqOIsUb23ttzmfPtzmbJamiTEc FKNA== X-Gm-Message-State: AOJu0Yw6BQQmW6iX7YkB9zuz/Lsh/QxeGuh+2fWGwynNX4pdD6uMbDuC Q1ug+61HnyZ9d7DrKGsb/1Y= X-Received: by 2002:a17:906:309a:b0:9b7:1e26:e2de with SMTP id 26-20020a170906309a00b009b71e26e2demr2388918ejv.21.1696439532120; Wed, 04 Oct 2023 10:12:12 -0700 (PDT) Received: from localhost (fwdproxy-cln-025.fbsv.net. [2a03:2880:31ff:19::face:b00c]) by smtp.gmail.com with ESMTPSA id g10-20020a170906348a00b0099bd0b5a2bcsm3108543ejb.101.2023.10.04.10.12.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 10:12:11 -0700 (PDT) From: Breno Leitao To: mike.kravetz@oracle.com, muchun.song@linux.dev, akpm@linux-foundation.org, Shuah Khan Cc: linux-mm@kvack.org, riel@surriel.com, linux-kernel@vger.kernel.org (open list), linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST FRAMEWORK) Subject: [PATCH 2/2] selftests/mm: Add a new test for madv and hugetlb Date: Wed, 4 Oct 2023 10:11:26 -0700 Message-Id: <20231004171127.106056-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231004171127.106056-1-leitao@debian.org> References: <20231004171127.106056-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 10:12:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778845793506940346 X-GMAIL-MSGID: 1778845793506940346 Create a selftest that exercises the conflict between page faults and madvise(MADV_DONTNEED) in the same huge page. Do it by running two threads that touches the huge page and madvise(MADV_DONTNEED) at the same time. In case of a SIGBUS coming at pagefault, the test should fail, since we hit the bug. The test doesn't have a signal handler, and if it fails, it fails like the following ---------------------------------- running ./hugetlb_fault_after_madv ---------------------------------- ./run_vmtests.sh: line 186: 595563 Bus error (core dumped) "$@" [FAIL] This selftest goes together with the fix of the bug[1] itself. [1] https://lore.kernel.org/all/20231001005659.2185316-1-riel@surriel.com/#r Signed-off-by: Breno Leitao --- tools/testing/selftests/mm/Makefile | 1 + .../selftests/mm/hugetlb_fault_after_madv.c | 82 +++++++++++++++++++ tools/testing/selftests/mm/run_vmtests.sh | 4 + 3 files changed, 87 insertions(+) create mode 100644 tools/testing/selftests/mm/hugetlb_fault_after_madv.c diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 6a9fc5693145..e71ec9910c62 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -68,6 +68,7 @@ TEST_GEN_FILES += split_huge_page_test TEST_GEN_FILES += ksm_tests TEST_GEN_FILES += ksm_functional_tests TEST_GEN_FILES += mdwe_test +TEST_GEN_FILES += hugetlb_fault_after_madv ifneq ($(ARCH),arm64) TEST_GEN_PROGS += soft-dirty diff --git a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c b/tools/testing/selftests/mm/hugetlb_fault_after_madv.c new file mode 100644 index 000000000000..d6d38d443840 --- /dev/null +++ b/tools/testing/selftests/mm/hugetlb_fault_after_madv.c @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include +#include +#include + +#include "vm_util.h" + +#define MMAP_SIZE (1 << 21) +#define INLOOP_ITER 100 + +char *huge_ptr; + +/* Touch the memory while it is being madvised() */ +void *touch(void *unused) +{ + char *ptr = (char *)huge_ptr; + + if (!ptr) { + fprintf(stderr, "Failed to allocate memory\n"); + perror(""); + } + + for (int i = 0; i < INLOOP_ITER; i++) + ptr[0] = '.'; + + return NULL; +} + +void *madv(void *unused) +{ + usleep(rand() % 10); + if (!huge_ptr) + return NULL; + + for (int i = 0; i < INLOOP_ITER; i++) + madvise(huge_ptr, MMAP_SIZE, MADV_DONTNEED); + + return NULL; +} + +int main(void) +{ + unsigned long free_hugepages; + pthread_t thread1, thread2; + /* + * On kernel 6.4, we are able to reproduce the problem with ~1000 + * interactions + */ + int max = 10000; + + srand(getpid()); + + free_hugepages = get_free_hugepages(); + if (free_hugepages != 1) { + fprintf(stderr, + "This test needs one and only one page to execute. Got %lu\n", + free_hugepages); + exit(1); + } + + while (max--) { + huge_ptr = mmap(NULL, MMAP_SIZE, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0); + + if ((unsigned long)huge_ptr == -1) { + perror("Failed to allocate\n"); + continue; + } + + pthread_create(&thread1, NULL, madv, NULL); + pthread_create(&thread2, NULL, touch, NULL); + + pthread_join(thread1, NULL); + pthread_join(thread2, NULL); + munmap(huge_ptr, MMAP_SIZE); + } + + return 0; +} diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 3e2bc818d566..9f53f7318a38 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -221,6 +221,10 @@ CATEGORY="hugetlb" run_test ./hugepage-mremap CATEGORY="hugetlb" run_test ./hugepage-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise +# For this test, we need one and just one huge page +echo 1 > /proc/sys/vm/nr_hugepages +CATEGORY="hugetlb" run_test ./hugetlb_fault_after_madv + if test_selected "hugetlb"; then echo "NOTE: These hugetlb tests provide minimal coverage. Use" echo " https://github.com/libhugetlbfs/libhugetlbfs.git for"