From patchwork Fri Feb 28 16:54:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 869441 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D60F276057 for ; Fri, 28 Feb 2025 16:55:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761703; cv=none; b=Tj5j2totTFTIheaSLnnwVfGIiEd4kj9t8yjlZ3UzwStddnKED4GT3B92z/gJAh96YIHWo0T4vigS0TOC7jtWDe1x6hH/vMR53UvJlE3eNVC/mbILkC3CQy0+bqaDxgC6uwIxxRpU3idS+AIR4TMiqDXmPuNtjj2EUIK1tRG4vJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761703; c=relaxed/simple; bh=vQSs+Wv2XyuHRXtIYUuvMuXimbQBMJ/md2YsZHKRo2s=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MM2PB9BGg7SJYCwUcgEa+/0Esx54rcfHNzkB2+a9YqjhZiX9n7lsUo3/zkA04XTqe8oplMYYzQg3dh1TWu7RPLTs2dmUHJ1AGBcAqjo5MNA5HC8DlbBQMur1j7QGA4Q0PtUgg6tL0DvnOuKJD5BtTDKCMEyHq7dOycb07/IKIwg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zAHAeie5; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zAHAeie5" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43998ec3733so12796535e9.2 for ; Fri, 28 Feb 2025 08:55:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740761699; x=1741366499; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=iBiyc3H23svJ8vFmdmR1EW1tSRVU2LGHBr3dzguiiSU=; b=zAHAeie5GUMEe40j+cTcSj0aCC0HWWoB8gDZveuGv1cu5P58RBXVPzX6ahGsVw2n17 AaEiR5OBhTXXe7JNM9ElEKfcGgS/aJIhaxBMlUOkeCFqZhqa4gUN1RfdmcWQX4JDpSzA zEty7EW8w4lulvhuqTX+U9n3FlvwYoDcrqnGEeBDbIV+Dch48S84PtmRgxlNyKATdP7O O9SG/mK84COzsRluUJxTRMv8eH50wJm/nX/QfN6RrpSUaT2yJCZP7DSC5z+Npnoh+Isa oTuXDs3Jp3MvPr2Uc/UCeWcXPGRo5970iFHo9Ps+zpwjOg5wmI6a0dvlZI09ahb4tG3C vqOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761699; x=1741366499; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iBiyc3H23svJ8vFmdmR1EW1tSRVU2LGHBr3dzguiiSU=; b=rU5Y2LG72PMMCtn4pAmUe7GR3NT81VvDEkTZm40Dyz2owt3EHryiXEvrvnE2N+vCM/ 7ui7rDDqKrEzFvuqtXl9DzwLuegJrwl5pGjoM1aIjb5TRxxlJJbhPkyV9PVnO6ioDz7D yw55WSwucRhj9MLINZr15cqTlbtXFw92VhrPRj7Wf7tB8+PQrDG4YIob8l/KiCHmHtrq +ZeZOS6nBx1SKFs0m2bWwn6BuZWPlgxu+iXO/C+uIQD9ZXZ2vVbC6KiWvMb6iyjjEBp5 uibAqYqL/ZH7XDaHb7JNwDxXgcurMiWXQzu5KZVnVYunpYz35Cvdk+I9ElNDFcUc0cJH X29g== X-Forwarded-Encrypted: i=1; AJvYcCUTeA8Tqr370n9nDY9qQiKSUoeOmxtpXS0X3eKuE6whmAkX9sI98xOiYYmmW+kdy7EJvgALNi/QRToNWr0i0tM=@vger.kernel.org X-Gm-Message-State: AOJu0YxWmOe8Z6d12TOO+jIabfqYU7L6sTuk+820TnLEdmXvTy/70tol NoyecCqRM8Rlow3bj2KGs001ruM3mDTRghpt9+TNMsti9XiUswnn3ztYOSskvf1OjBDsyIOU0jH czMs2maWuBw== X-Google-Smtp-Source: AGHT+IFI4L13fHbxgZZEec4SUfw5Itwe110pr8uhvkmoWV4jeH6QyQe/bJoYmx708YRn7IAUip5ewSWoYEH6mA== X-Received: from wmbg8.prod.google.com ([2002:a05:600c:a408:b0:439:846f:f9c8]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a03:b0:439:9b19:9e2d with SMTP id 5b1f17b1804b1-43ba6702becmr40505965e9.16.1740761699715; Fri, 28 Feb 2025 08:54:59 -0800 (PST) Date: Fri, 28 Feb 2025 16:54:50 +0000 In-Reply-To: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250228-mm-selftests-v3-2-958e3b6f0203@google.com> Subject: [PATCH v3 02/10] selftests/mm: Skip uffd-stress if userfaultfd not available From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Dev Jain , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman It's pretty obvious that the test wouldn't work if you don't have the feature enabled. But, it's still useful to SKIP instead of failing so the reader can immediately tell that this is the reason why. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/uffd-stress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index a4b83280998ab7ce8d31e91d8f9fbb47ef11d742..ed68436fac62c76e2ca7060c661487f2f8a6ab45 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -411,8 +411,8 @@ static void parse_test_type_arg(const char *raw_type) * feature. */ - if (uffd_get_features(&features)) - err("failed to get available features"); + if (uffd_get_features(&features) && errno == ENOENT) + ksft_exit_skip("failed to get available features (%d)\n", errno); test_uffdio_wp = test_uffdio_wp && (features & UFFD_FEATURE_PAGEFAULT_FLAG_WP); From patchwork Fri Feb 28 16:54:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 869440 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 443F927781E for ; Fri, 28 Feb 2025 16:55:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761708; cv=none; b=WXEc8yU03v/JA2hquDZJBxNBKxtS8PgSvS6gWlcIhmbtgsP9YSUF3itUvxLRQpdFx6pj6U7B3vjcWY+5w2/AZInO9AMVGUVnVR9Z9as/l9OtF989h0JPz87cl6+se0Nt/tesjYfI2ptzWoX6biblV7ilm20Ft/H2+6nxOlEWRT8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761708; c=relaxed/simple; bh=tfftHGPyv69HoB/ZMJmRXyKhQu/kB66LBoTZIdp1nOQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BmO+xbOGCFTMg2NNUhAEBCzXkF11qriBGKDufcMQv0Q3JHCVN+6ncG56nsHxXfY22TkwJ6LEYbJg5jEqCcVf3fv1RFaANPhWLjbJHbpZ0/mxRGUJZZLoaDyukD9TasDT5+z7jXj0xsmyz1AtCB2AOPnirfSRBZImH734bL2SHKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KjsjYz8T; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KjsjYz8T" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-390e5214efdso1477897f8f.1 for ; Fri, 28 Feb 2025 08:55:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740761704; x=1741366504; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=S9QxBMT1dy5QbhO22yQnX/sY19xHXMzPESl6Emh05kM=; b=KjsjYz8Ta89Uy7JNeUGklshpIb0f/79zaiXV5ylxV0sTlC8eFLYGI64EAiB4PXiNXo MLuuYRZGbSsZ5QYEr98GW1OC8wTyKVcGV3ZxxgeukLhnDw8pYjgArgzCTmZnpQSezj5I QQc8e67aME9afa7F4I4d/XYyEDI9v9flnP4rwzVQf0GU914JxrkEp8Ln3swAc4xn3Wzp DW0jT0xH8p/+pNk0PppkniRnDuDKHj8fbqYtLyJdKyhBFzSk0L0X4LeJ+I2knqzNiGE1 RxSRB0yrXDedd130L8fDXoVVoWmN4IWu2vReV7Xu5vWHJbVhmynNRMZq3axd52lNFDwL Kmhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761704; x=1741366504; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=S9QxBMT1dy5QbhO22yQnX/sY19xHXMzPESl6Emh05kM=; b=lFQBpA3LI6HojEV4mvF6HW0uv1Dg8hJcLOT41ea2cYWL1fSTf2XZVJNSFZGIvZia6X SpRSUiCclcG88K/cWDLtPTOsu1ktI43ZX7CEOiTBip4fRbiYWRfD/qeF0H4q7pHq8G0K qSYjOom27SWDFg9Q+A05gtdLjdsbyG3IHdjmPo+XLEtLxrDJKnSYHiBzqKSZ9+V0xS2I kx1X1mPQ4I5czZ/MFP5lLJskojNzne0rwDIBQVfGIo8bQbo0oh0m0tQ93DMSqnQsehmA 1xv0hq/DZWgh1VLwpkqEkcF9vi6i0/fEuVClY3vi2YJ4432izUIJySrpPKY2/ztEbq8Z CHDA== X-Forwarded-Encrypted: i=1; AJvYcCXOVdjfifg2pvWpKgTmJy5fZayx8TPoLz1g9YAt0OLv01TX7sWFAkZ9ThRQNH+95mSERzH8f7BlGucyToRUebU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5hzfzqXbu/lnsjn4IMHfD4rt95yqSbu0CadRb6ON3jkLGd9Ar WEnXxmcbeYQFh03YCkHAlBCd/tyew3ERlSl0zGvLHDx7SRKqTOFLGhbamyf3YVcBo3dTBTnSiGC 5zE8IAFgl4Q== X-Google-Smtp-Source: AGHT+IH0IbPgf0WZB4YwqpZ6IMtQ3dgzowLYjozZVKkhVKhCwE0plHrNAT013hhx4TNDxRckM/EIsEy0iSzC0A== X-Received: from wrbfy2.prod.google.com ([2002:a05:6000:2d82:b0:390:e463:27fd]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2c4:b0:390:ec10:9dca with SMTP id ffacd0b85a97d-390eca414e4mr3842391f8f.45.1740761704683; Fri, 28 Feb 2025 08:55:04 -0800 (PST) Date: Fri, 28 Feb 2025 16:54:52 +0000 In-Reply-To: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250228-mm-selftests-v3-4-958e3b6f0203@google.com> Subject: [PATCH v3 04/10] selftests/mm/uffd: Rename nr_cpus -> nr_threads From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Dev Jain , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman A later commit will bound this variable so it no longer necessarily matches the number of CPUs. Rename it appropriately. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/uffd-common.c | 8 ++++---- tools/testing/selftests/mm/uffd-common.h | 2 +- tools/testing/selftests/mm/uffd-stress.c | 28 ++++++++++++++-------------- tools/testing/selftests/mm/uffd-unit-tests.c | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c index 717539eddf98754250e70e564cd9a59f398bd7ea..a72a2ed5e89480ed06c81b034967ed5ae5f8cad5 100644 --- a/tools/testing/selftests/mm/uffd-common.c +++ b/tools/testing/selftests/mm/uffd-common.c @@ -10,7 +10,7 @@ #define BASE_PMD_ADDR ((void *)(1UL << 30)) volatile bool test_uffdio_copy_eexist = true; -unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; +unsigned long nr_threads, nr_pages, nr_pages_per_cpu, page_size; char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap; int uffd = -1, uffd_flags, finished, *pipefd, test_type; bool map_shared; @@ -269,7 +269,7 @@ void uffd_test_ctx_clear(void) size_t i; if (pipefd) { - for (i = 0; i < nr_cpus * 2; ++i) { + for (i = 0; i < nr_threads * 2; ++i) { if (close(pipefd[i])) err("close pipefd"); } @@ -365,10 +365,10 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) */ uffd_test_ops->release_pages(area_dst); - pipefd = malloc(sizeof(int) * nr_cpus * 2); + pipefd = malloc(sizeof(int) * nr_threads * 2); if (!pipefd) err("pipefd"); - for (cpu = 0; cpu < nr_cpus; cpu++) + for (cpu = 0; cpu < nr_threads; cpu++) if (pipe2(&pipefd[cpu * 2], O_CLOEXEC | O_NONBLOCK)) err("pipe"); diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h index a70ae10b5f6206daecc8e19ed3e3bbb388e265aa..604e3572fe17280ae346b031e2e867e039578f95 100644 --- a/tools/testing/selftests/mm/uffd-common.h +++ b/tools/testing/selftests/mm/uffd-common.h @@ -98,7 +98,7 @@ struct uffd_test_case_ops { }; typedef struct uffd_test_case_ops uffd_test_case_ops_t; -extern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; +extern unsigned long nr_threads, nr_pages, nr_pages_per_cpu, page_size; extern char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap; extern int uffd, uffd_flags, finished, *pipefd, test_type; extern bool map_shared; diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index ed68436fac62c76e2ca7060c661487f2f8a6ab45..ec842bbb9f18e291fa51de0ed8d1fbf9aaf14372 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -179,12 +179,12 @@ static void *background_thread(void *arg) static int stress(struct uffd_args *args) { unsigned long cpu; - pthread_t locking_threads[nr_cpus]; - pthread_t uffd_threads[nr_cpus]; - pthread_t background_threads[nr_cpus]; + pthread_t locking_threads[nr_threads]; + pthread_t uffd_threads[nr_threads]; + pthread_t background_threads[nr_threads]; finished = 0; - for (cpu = 0; cpu < nr_cpus; cpu++) { + for (cpu = 0; cpu < nr_threads; cpu++) { if (pthread_create(&locking_threads[cpu], &attr, locking_thread, (void *)cpu)) return 1; @@ -202,7 +202,7 @@ static int stress(struct uffd_args *args) background_thread, (void *)cpu)) return 1; } - for (cpu = 0; cpu < nr_cpus; cpu++) + for (cpu = 0; cpu < nr_threads; cpu++) if (pthread_join(background_threads[cpu], NULL)) return 1; @@ -218,11 +218,11 @@ static int stress(struct uffd_args *args) uffd_test_ops->release_pages(area_src); finished = 1; - for (cpu = 0; cpu < nr_cpus; cpu++) + for (cpu = 0; cpu < nr_threads; cpu++) if (pthread_join(locking_threads[cpu], NULL)) return 1; - for (cpu = 0; cpu < nr_cpus; cpu++) { + for (cpu = 0; cpu < nr_threads; cpu++) { char c; if (bounces & BOUNCE_POLL) { if (write(pipefd[cpu*2+1], &c, 1) != 1) @@ -245,11 +245,11 @@ static int userfaultfd_stress(void) { void *area; unsigned long nr; - struct uffd_args args[nr_cpus]; + struct uffd_args args[nr_threads]; uint64_t mem_size = nr_pages * page_size; int flags = 0; - memset(args, 0, sizeof(struct uffd_args) * nr_cpus); + memset(args, 0, sizeof(struct uffd_args) * nr_threads); if (features & UFFD_FEATURE_WP_UNPOPULATED && test_type == TEST_ANON) flags = UFFD_FEATURE_WP_UNPOPULATED; @@ -324,7 +324,7 @@ static int userfaultfd_stress(void) */ uffd_test_ops->release_pages(area_dst); - uffd_stats_reset(args, nr_cpus); + uffd_stats_reset(args, nr_threads); /* bounce pass */ if (stress(args)) { @@ -358,7 +358,7 @@ static int userfaultfd_stress(void) swap(area_src_alias, area_dst_alias); - uffd_stats_report(args, nr_cpus); + uffd_stats_report(args, nr_threads); } uffd_test_ctx_clear(); @@ -452,9 +452,9 @@ int main(int argc, char **argv) return KSFT_SKIP; } - nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); + nr_threads = sysconf(_SC_NPROCESSORS_ONLN); - nr_pages_per_cpu = bytes / page_size / nr_cpus; + nr_pages_per_cpu = bytes / page_size / nr_threads; if (!nr_pages_per_cpu) { _err("invalid MiB"); usage(); @@ -465,7 +465,7 @@ int main(int argc, char **argv) _err("invalid bounces"); usage(); } - nr_pages = nr_pages_per_cpu * nr_cpus; + nr_pages = nr_pages_per_cpu * nr_threads; printf("nr_pages: %lu, nr_pages_per_cpu: %lu\n", nr_pages, nr_pages_per_cpu); diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c index 9ff71fa1f9bf09b3ae599250663a25bbe2c13b8a..2f84fae5642c6f91b75fbf5f5d59ae64a1c15f92 100644 --- a/tools/testing/selftests/mm/uffd-unit-tests.c +++ b/tools/testing/selftests/mm/uffd-unit-tests.c @@ -197,7 +197,7 @@ uffd_setup_environment(uffd_test_args_t *args, uffd_test_case_t *test, nr_pages = UFFD_TEST_MEM_SIZE / page_size; /* TODO: remove this global var.. it's so ugly */ - nr_cpus = 1; + nr_threads = 1; /* Initialize test arguments */ args->mem_type = mem_type; From patchwork Fri Feb 28 16:54:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 869439 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02F4B280A39 for ; Fri, 28 Feb 2025 16:55:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761711; cv=none; b=LFg/yJ3lbQDt5/t1Am8tra785VyfJDbmWTIPAwrQ1ZmJUhopE7eqUm6f0rqE4djv088NW9Ua77AyS5/RKZuDJYmUu2M/CV9T/Cf5WVsCtcBnuMC9pMxXKenzI3xlBiydrG0aa6WuB3ixBD7qqGO3SxiuiwP8edhiAQqSMbtLxnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761711; c=relaxed/simple; bh=PKjIjTL+Xm1qQO4L3MUY1vCQdQ2UWrGB2a6naRLAZVI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VAq7wCxxtbsOXMzlFPNnN8cdJDBYVZhlckhf3XyjTL/5Lk+n1r8vKDP7hT9tjPhEz1tSftXBm+TH4EpIjyFhq60SbpokCYdgz7/X/q5gGARALKKGVs70y0EIGacisk8ZciO9t3q5tDhI8/0nplRtjf4pMfOiR8R0HDJmGIM5OWc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=yanSTDwU; arc=none smtp.client-ip=209.85.128.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="yanSTDwU" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-439a0e28cfaso13663295e9.2 for ; Fri, 28 Feb 2025 08:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740761708; x=1741366508; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6xd35kCXpRSECxF8AHgzbuHae7VKgf19dDjA8//S6B4=; b=yanSTDwUZemNcnsHj5ZIso9CJXS1yl2AbGCt0mGfO/WBawWQaqNRdttsh39+8FwaaQ jJnwvXc6E+kdsfJv4GHb6DeBH6UiAQl93IVqlZUZRnpd9KuZQBOmbT8sRH9MFKLgYm+b 0b7gpD3lV/UxUZCkMQYqlAB08YewwQrajBGjmGYbvwS7x/Z4qs+pcKfocdic4ulU0wKG 133CmBbK3zoADwhFNoTOV70T9T91qDQujrJOolW+4LcrkkQBbqHo0WiraMV2LH23lrzL uiisOjXo4SP5GRdE9Nr9CfcWizDpCH8pQc9b8qlNKbHFmnY5KukDBOClDJ4Hv/FsimWL +XDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761708; x=1741366508; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6xd35kCXpRSECxF8AHgzbuHae7VKgf19dDjA8//S6B4=; b=m/ilKRBQno6F5LyVmCpGkss103E1KoQFr8tu4/KYsLtDqo3h9jzvXA1HkZUjlNnqjy AvGr2uPPpTBJNtyL7116b0Q28bG8EnVrh5gfkGxmmHzKyz3q5KgE7VFntEhgZXF/oze1 ccsb8VpRcB55yhpErpNJWzlgVzjfibgBdB1Tjd38+9yJM37UGiyxfRbB/z7pNeMJeaff JSTIG4x36ZFFF0JyARZi724qc05kUxul6ftkez9wI1h14Rbh73lfqasWum01s5NARvlW lYfgtM8GXwSlf5mzuCYlGbkHJJeSvCWZlgOA4P6c6CujrYenaC3xszHEdtlUMwOUYax0 jIYg== X-Forwarded-Encrypted: i=1; AJvYcCWiesfVQfvf4afyvRJ9lTR4FpvTE8mG50HpaoIqnQSMkJop4h7Td1z1pKaBUHf6pdafe3vHBr1UJTxuOxCdtU0=@vger.kernel.org X-Gm-Message-State: AOJu0YzT/kMDsRO4E4hxRtIVA4/oEY0qDFWXxgea2MWqms06LpWzDmNx Ic8jQWiFTVH/9dcfsZO4T0/hP2LtZt3vRsFVKHb34akffB1s6vFMxJ7HsZC1BWNQyIVA9nM2YXD fLgTkUvbYow== X-Google-Smtp-Source: AGHT+IH0ZM4UbMAKoXYRYVdsI8CLX+kx9xcCfgVmPw0K5PMtIeLgyJejHV/DAB6TfrrXG9WhtZl/va8I0oxrQA== X-Received: from wmqa14.prod.google.com ([2002:a05:600c:348e:b0:43b:6943:f013]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:444d:b0:43b:8198:f6fc with SMTP id 5b1f17b1804b1-43ba66e6d07mr42105885e9.11.1740761708569; Fri, 28 Feb 2025 08:55:08 -0800 (PST) Date: Fri, 28 Feb 2025 16:54:54 +0000 In-Reply-To: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250228-mm-selftests-v3-6-958e3b6f0203@google.com> Subject: [PATCH v3 06/10] selftests/mm: Don't fail uffd-stress if too many CPUs From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Dev Jain , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman , Mateusz Guzik This calculation divides a fixed parameter by an environment-dependent parameter i.e. the number of CPUs. The simple way to avoid machine-specific failures here is to just put a cap on the max value of the latter. Suggested-by: Mateusz Guzik Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/uffd-stress.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index efe2051c393096e237d942c04a264b6611a6e127..5656128590373ed376b3b5d9259e5ca3867a4099 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -434,6 +434,7 @@ static void sigalrm(int sig) int main(int argc, char **argv) { + unsigned long nr_cpus; size_t bytes; if (argc < 4) @@ -452,7 +453,15 @@ int main(int argc, char **argv) return KSFT_SKIP; } - nr_threads = sysconf(_SC_NPROCESSORS_ONLN); + nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); + if (nr_cpus > 32) { + /* Don't let calculation below go to zero. */ + ksft_print_msg("_SC_NPROCESSORS_ONLN (%lu) too large, capping nr_threads to 32\n", + nr_cpus); + nr_threads = 32; + } else { + nr_cpus = nr_threads; + } nr_pages_per_cpu = bytes / page_size / nr_threads; if (!nr_pages_per_cpu) { From patchwork Fri Feb 28 16:54:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 869438 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02E2628136B for ; Fri, 28 Feb 2025 16:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761715; cv=none; b=DxdT45Gm98bkW5lTxf7MQOzt0kVcFMR+YtOo54tEx10Qu7SNIG7d4aD0tQVIQnLWi89oTej0g3fHGgKWqn5C247xtZDCHY/RLX2mMxcWDk64Rc0m31gmQQmYlTZHlDiNhXgP5LGD5Snf+g+dxcxFm8Wz+BP/GztxkasuTTouMwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761715; c=relaxed/simple; bh=0bzgAqF8oo8eQx0sm5QVjzxcSuw9SBZhVRceoyFK0JI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=J+u2IZykVpIbcwwtEGuboSAaZluCKZx3Pdw9pHgEp3+0uPOqDUrQ/w72wk5pmPR27B/vXNpUeSRxP0smiFfyRJD4oTrnGo9Dvx/O8UwJHQGsSLoAXLBGCZFcpdai3zwnutTKzpI32nEx1pkJKMMWBIdU2ebknfRx8pfvwSLtk/0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DSqe/sMy; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DSqe/sMy" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-390f000e962so440696f8f.2 for ; Fri, 28 Feb 2025 08:55:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740761712; x=1741366512; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=HglWqqIMp4q4cEq0dB/S4fjKGgd6pGq+F619sE0ZgpE=; b=DSqe/sMyMvEl1cQdPL9xJRi9RWiREeUW3nkEixRNltIn/8iL8CgsWRXyR2NWd746Aj DaA8LEMjNDioNQL5L0uLy49XnHMiGgmC2g9NHyRu1JXJ7R0pWxQq9sPqJTFNFrgHpCSs zTD8SlR/CFgP3iUxsB/Q/ZDG21NiHqo+BeQNs6NwDD1ZHd22Ysr7tvkWqhD5uMX/d6n+ 0eBB8UVpoUGqAB8J/oNE2D6WbOwzgo3Qpwz7JAkWc6iGTgZziVMT2DodYlvHfukQJyR3 rDbUIuMA043GuhjMR7ckDB8HSgvIqBSG2uS3/158Y5qF9BfHN3BRXRjqBIk0cHTJHdBv gf+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761712; x=1741366512; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HglWqqIMp4q4cEq0dB/S4fjKGgd6pGq+F619sE0ZgpE=; b=Vt6jRZxaNw18iqMSe0qQMwdcGhxvCHERZ/Bj1owEMCAiXOXaYYbYWXJ1rCD2hBiXQy +wvZGaWb+r3k1s2d4yHMvQbGKIaNgsEklG+Z875w53dg4gKYMOTYYIU/CAlcXMGLp6cl DrfYKDiir+idsxQleo17ts2F0XJDXaJOm9QAP1/BRiKtW+wv26evkDNF6OYX7xvv4qAU BZ8h2ga+kbJphPRjdNAwEgm35Sgs5ab8LIXpQ5k+Sf2RMZN73biY7uowMA1qBNBHLEov VIpkNBKoo7XVi/uW+xd4OuyIK6BXe1fTc/AsgCjP4rX094S+xPSOuLm61C+Y0agKfzuh 2KEg== X-Forwarded-Encrypted: i=1; AJvYcCWMO6tFr49g3pGPiK+GR702bzExAFjVpcyHXdTsWdFJlkaFTs0qDnt8pLdeFPbDm7pSjmKR6H//fYslZDPCq0M=@vger.kernel.org X-Gm-Message-State: AOJu0YySuS3NYGitN4YzKOnwjRRmmOBFXATbJveFtpGdjePZUPvY0mkg eSuY8yfKBy6nDAk7e4LpXPVSWraRLQ/ocjzS7UV2sc04oMScK8IIEkRAL2p00zHkk6G+lqXlj3k udMAZpSWIyg== X-Google-Smtp-Source: AGHT+IGyvxBXVKudgTqQT/Sz/ZVkUrhVlfUf3CFkBBjkljVRcLXxIDlIjwfcGDVpOf7sFqUfT+P2WC7Tjqu3bw== X-Received: from wmbbi6.prod.google.com ([2002:a05:600c:3d86:b0:439:8688:5f9]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4409:b0:38f:3b9b:6f91 with SMTP id ffacd0b85a97d-390ec7cb9bemr2080325f8f.12.1740761712441; Fri, 28 Feb 2025 08:55:12 -0800 (PST) Date: Fri, 28 Feb 2025 16:54:56 +0000 In-Reply-To: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250228-mm-selftests-v3-8-958e3b6f0203@google.com> Subject: [PATCH v3 08/10] selftests/mm: Skip gup_longerm tests on weird filesystems From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Dev Jain , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman Some filesystems don't support funtract()ing unlinked files. They return ENOENT. In that case, skip the test. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/gup_longterm.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/gup_longterm.c b/tools/testing/selftests/mm/gup_longterm.c index 879e9e4e8cce8127656fabe098abf7db5f6c5e23..494ec4102111b9c96fb4947b29c184735ceb8e1c 100644 --- a/tools/testing/selftests/mm/gup_longterm.c +++ b/tools/testing/selftests/mm/gup_longterm.c @@ -96,7 +96,15 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) int ret; if (ftruncate(fd, size)) { - ksft_test_result_fail("ftruncate() failed (%s)\n", strerror(errno)); + if (errno == ENOENT) { + /* + * This can happen if the file has been unlinked and the + * filesystem doesn't support truncating unlinked files. + */ + ksft_test_result_skip("ftruncate() failed with ENOENT\n"); + } else { + ksft_test_result_fail("ftruncate() failed (%s)\n", strerror(errno)); + } return; } From patchwork Fri Feb 28 16:54:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 869437 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E8C928629A for ; Fri, 28 Feb 2025 16:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761719; cv=none; b=Zq8Iv5LudiFgsevYCvz9UCi3mMsLINGgOahR389nEdVDe3quHR0tUCpfUZwIPILP4S9GLgPWSZ6hHH5YGOL40J1bVxZ244sKwd9fdE6y/QyFaDnsoNGbMuT9Xgu/ViKpgCkH4kLoa0ajrevADM/qI4EM3X5/arBgkVBbZO3jRsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740761719; c=relaxed/simple; bh=KNpskPcxfPhqPpFfjuljLY2fvRa+/kXrp30Qg66iAYQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gRru+SDY7uGDRjfc1YMFS3ckTxkarMmjStY94WWqD90UQpJqP7thmw0OBHCblvUoIghem8f7rMBXKGkVLkP3ssI0M0HJBLeCmOof+Filr6kj2tw+Cx2aYZol5iI7aepmgvVc/QJK/n0DsslrzjRRcgkxue7ABCPJFYn3iUczeM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=20PUkHL6; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="20PUkHL6" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-390f000e962so440726f8f.2 for ; Fri, 28 Feb 2025 08:55:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740761716; x=1741366516; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=2Ql5hc6LJFV7jS99QKiJbBHefyQj7jLlsETMiqi11w8=; b=20PUkHL6q7Ct2ihfse5+vuwCHYBNEyGydEMVwFHcN/3D60tlpDd9dsV+7cBmHmzb02 JL24YpUTA8JglXWvj3/yO54XU+Fr6YY/JsK1zLJxkIJsIvXGLOqxu3Vsms0A74QI5+KO toNFH7h6QX/+RhLH6/affOKV1LF2xc810tDsF/xSSBNypkfHSSkmv0a3AywcTlFKP2rx gYvuVFQ9aggFyCrks5p2aGml9nRyUDrK5nfWnmsjEJHa+YkQAjZA4mvQRAXr3s5KD+8E DgDmph3RJcB8jOvPxK8J6pulDTijLkMY+0VLn4iZYvH/89hp/PikkaCOlqzVyFl/0WkZ jr9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740761716; x=1741366516; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2Ql5hc6LJFV7jS99QKiJbBHefyQj7jLlsETMiqi11w8=; b=lkZHGxrXt0qamnuPSiKMu7NjHOGQUsOx3qjtEoi+1+JdfOLp9wKb3qDrAbIykrAJbl 4SDL0/wPqzLinIvoThxSrAuDuLsut4WXjW5Z1drxOWefi+bqoJH8ihTLKk9PbzaxWtT8 0RIuqa8LL6Vo5NbZnByaycp7Mg9FzdOngRTR6kuhHqk7KaGW2WQUKt5N2NfAIgNOlLCF 530HJLAUQl3z/HStReMhqhon36FkjiQNiPp6L93jX80lIwsJ2UmRE17IG7BWhxb8tSCh ee2Oq0ldrhIJZZbqA1o8V3CNyxt6s/P13MI3SGc8wWSkiIEhJZv5DutBXhbpUZ9P39i5 0apg== X-Forwarded-Encrypted: i=1; AJvYcCU1CitOB1UrdIshf8qZ58QbbpxklV9lYQLOoftGHtlrtijN0pSb7i4ps6BlrNd1A8bRzIXX+j62GcpdxY8+MaA=@vger.kernel.org X-Gm-Message-State: AOJu0YzqLn2yd8pKcpWXiTLGaXXkq9gsgjrS8wZ5DdhkR/7kPvwABHQ/ OMVZeBImPG+xclGlYTQE6P+XHyhdf54mlvgeh2M0zyXVfo6c72tFSL0ihRKSJdlOaNSbG35lv1G l9n9UFgERJg== X-Google-Smtp-Source: AGHT+IFB7nITz7U/iMU0tPl/bO9xV6X55cC7dWX52NbyH2lvSNR7sagUxaeaf3fhuxPU57nHGgdGlD6quABXnQ== X-Received: from wmbbh15.prod.google.com ([2002:a05:600c:3d0f:b0:439:9fd1:8341]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:188c:b0:38f:3224:65ff with SMTP id ffacd0b85a97d-390ec7c6a8emr2890522f8f.5.1740761716612; Fri, 28 Feb 2025 08:55:16 -0800 (PST) Date: Fri, 28 Feb 2025 16:54:58 +0000 In-Reply-To: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250228-mm-selftests-v3-0-958e3b6f0203@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250228-mm-selftests-v3-10-958e3b6f0203@google.com> Subject: [PATCH v3 10/10] selftests/mm: Ensure uffd-wp-mremap gets pages of each size From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Dev Jain , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman This test allocates a page of every available size and doesn't have any SKIP logic if the allocation fails. So, ensure it's available and skip the test if we can't do so. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/run_vmtests.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 0f9fe757c3320a6551e39b6d4552fd4874b0bf43..e86ef8cb37d00e572be8cf0ea9cc8246d4eecd7e 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -309,9 +309,30 @@ CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb "$half_ufd_size_MB" 3 CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb-private "$half_ufd_size_MB" 32 CATEGORY="userfaultfd" run_test ${uffd_stress_bin} shmem 20 16 CATEGORY="userfaultfd" run_test ${uffd_stress_bin} shmem-private 20 16 -CATEGORY="userfaultfd" run_test ./uffd-wp-mremap +# uffd-wp-mremap requires at least one page of each size. +have_all_size_hugepgs=true +declare -A nr_size_hugepgs +for f in /sys/kernel/mm/hugepages/**/nr_hugepages; do + old=$(cat $f) + nr_size_hugepgs["$f"]="$old" + if [ "$old" == 0 ]; then + echo 1 > "$f" + fi + if [ $(cat "$f") == 0 ]; then + have_all_size_hugepgs=false + break + fi +done +if $have_all_size_hugepgs; then + CATEGORY="userfaultfd" run_test ./uffd-wp-mremap +else + echo "# SKIP ./uffd-wp-mremap" +fi #cleanup +for f in "${!nr_size_hugepgs[@]}"; do + echo "${nr_size_hugepgs["$f"]}" > "$f" +done echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages CATEGORY="compaction" run_test ./compaction_test