From patchwork Fri Feb 21 18:25:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986160 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 28093C021B3 for ; Fri, 21 Feb 2025 18:26:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 07ECD28001B; Fri, 21 Feb 2025 13:26:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F22A828000C; Fri, 21 Feb 2025 13:26:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D729628001B; Fri, 21 Feb 2025 13:26:00 -0500 (EST) 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 AD56628000C for ; Fri, 21 Feb 2025 13:26:00 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 650BE1A1DA0 for ; Fri, 21 Feb 2025 18:26:00 +0000 (UTC) X-FDA: 83144780880.09.6FDAFFD Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf13.hostedemail.com (Postfix) with ESMTP id 7686220005 for ; Fri, 21 Feb 2025 18:25:58 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZD9FXhmQ; spf=pass (imf13.hostedemail.com: domain of 3NcW4ZwgKCOYRIKSUIVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jackmanb.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3NcW4ZwgKCOYRIKSUIVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740162358; 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=OAoxH1QQtcmtrqfrqrquGCaxLx3Ng1Kyj4nYfPKggLc=; b=zs8WnlPSdXcOxdM6id9UxqvZHu3wccOiERFhfYcdt8Fi+/ex1pt/HS0brTbd/ylOfeOLLb sncDyHxixFYNoqpi8t/oT6gjH9iWh9tk4OFJHMSChe067n9+nubJG2FRC3X6F75LfvovpG ZLw/xLSdjrhC7jFHAUX+Q+Rppq6lnnY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZD9FXhmQ; spf=pass (imf13.hostedemail.com: domain of 3NcW4ZwgKCOYRIKSUIVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jackmanb.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3NcW4ZwgKCOYRIKSUIVJOWWOTM.KWUTQVcf-UUSdIKS.WZO@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162358; a=rsa-sha256; cv=none; b=mhuxMNv7O2yQxshCt+fPQy6Pn9TTCcls3QPUL1jdCAYPjTb6UhvSXTc4AL9qFI4W8tET6S 5f71ExIQE2d3sbJGZWjKe/kR/bIOKMIIlFYA5adxnm2LlJA5NALCPfqVjLTexpJM43sQ4K kzTwxvg92qDkEhnFPQ3AxaT4L9KmevE= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-38f3eb82fceso1154593f8f.0 for ; Fri, 21 Feb 2025 10:25:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162357; x=1740767157; darn=kvack.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=OAoxH1QQtcmtrqfrqrquGCaxLx3Ng1Kyj4nYfPKggLc=; b=ZD9FXhmQ7v8Hay5pgvXhmX/S/A+DlFaReO25SE4/dKJMl1FQ2V17SMgt12O06dhKg6 Sx3QB+i4BSZuEBrlradmlOMRYxgucUn24HzZrt3q7bNQvEvPUaJqZLn7fhB8+zPl5SYc nqIQW/eSPUbUG9HqugbgtSgeKLv3+QWHWQIMf6l6LXg2w5/eoTq6Ax9ty2DfauhjWevV 5997ZC5RWX1+YoAAz3HQsqZ9y7kh4dDxjNqg1t640BXgiGZ6hsHVqpV1yOz8o4wZkp3F sml2nAVBnereHStT/wjSFCqx5moKQPgveLevjMh23U51t7ILzNNk581L0rG+LUDse8QM nJnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162357; x=1740767157; 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=OAoxH1QQtcmtrqfrqrquGCaxLx3Ng1Kyj4nYfPKggLc=; b=cLaqDx8+pS9ADmDOLv6DC7FkczVSsd+bz6A0DUUHRWwolzGq9E106IqTlH5z0V5OFa oB7EipPDVkKikrntGVcF2PcypFvWptcDFvPgC0/QtqcDaqHdt0MNs4qV/lPypCURt/AC M3oUe1SAw3dk/iDQhQl/9IxVHjNWh+6gD+gpqaMwIbY0K+q+eTSTGpnzbnJnWV3nN/2z TNGjgQ0ExsWWEdmqVCvoH7VU84u3q1UamdDMAM/W1paHmdmuIzk9IcgZYKqBZS/Vc2MW CiSeJgqLMfyP5UDWWIt5YqhP5bvoYyLQGOnq/Wq7K4x3jHL6QG4u+OAiOW2XlQyHEifs W30w== X-Forwarded-Encrypted: i=1; AJvYcCUuP9X1XkAdzuY2ro29hqM6xbuB4ELAzgh6zIjLoftHJgB6GN3EOwC0yeUXJV9l5FRbSUUxubUmhw==@kvack.org X-Gm-Message-State: AOJu0Yzw7CDbB4lbzbfWLbLlxcT2SPPfsoaNBx2Yh6UkW1rFD/1RxC3D 5vAwt0OM8hx9dJzsUfBfJBamKNVrLjIcgVWMASdXMQ1NpcIA4hv3bB5V7le0Qjreus0HqCE8ip3 +dz4MfP9uoA== X-Google-Smtp-Source: AGHT+IHHIQYpEKNyaX/t5tMIplaMMGcwEJk4a4wqfwMyLM1OocqQC+kF8/Z1ZzyO2qvH8d+pb7JjF85UNU1YYA== X-Received: from wmbbh16.prod.google.com ([2002:a05:600c:3d10:b0:439:80fc:8bce]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:6d04:0:b0:38f:4b2c:2475 with SMTP id ffacd0b85a97d-38f6e95c496mr3867149f8f.20.1740162357219; Fri, 21 Feb 2025 10:25:57 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:44 +0000 In-Reply-To: <20250221-mm-selftests-v2-0-28c4d66383c5@google.com> Mime-Version: 1.0 References: <20250221-mm-selftests-v2-0-28c4d66383c5@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250221-mm-selftests-v2-5-28c4d66383c5@google.com> Subject: [PATCH v2 5/9] 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 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7686220005 X-Stat-Signature: c9tbkmgnh7g9nii4ijqy51qm96qcqstk X-HE-Tag: 1740162358-251945 X-HE-Meta: U2FsdGVkX18NZN+QjBicBsKsRg2ErZk/RRjRieEsDLure89SGJbs82G9Gt9jeZO4GfwZ0deXRpvPaLD3z+RucZNZOgRJp+TsLxlSx6GBQP5Ar063OYyuUG+1J2IHm9WZANjqIBicKhENQb178mIEEAevlXWOuTA8/x5jvt2k0RmoPg62oqhyvdqR00pyIOLCFutJ0Z+xCFvpL0PlCjLKlzpEYKnK+tT9mRDaHvFcOhT9GIz13IsEYDvy7nmOvdtHGE4otlrZKLvcwaqG8qqvGIFb+yxzGMSGwvl6/0SGXOeuscQjY7W6N5dtR0WTuTGfl6iOeo0bbPxXn175R79P1PHpV4aR2wESFaXpfJaQ7WWoZcGvzuNqX/caq5j3L7vfB7/pkvWOOB1FRqKFgGO7L2kzTTJn5iaBHu430YXi3n+U5bEgt4opDWr4tT76XjH/aaO6M8/cTnCwNCs4uNjL0QMqbE2zLjWqCXvlii/pS5mW//WJJdx/gwnObSBAKVohfbyIDssLf4isee7C+WYOCx8kF0XqDS59sWI1K+tovIt3x/T9vfxQWTPc2+09+DRZPqvgP/5amwHVnFbTFfmrSoQTh96XC8ifl4hG94Gii2rVtXc45z57kvGFWmBwQ8BnedVxFuU4/cb9uhngqHzkp6FVFxFjaITiby8yZqK88xBqINIG9pwe+CgU7eRkoRC1MMKpWj5pbmlRHKmz/mxI6M0r6ny4yDgD2HOZHXGFM3R+d6jLWUzy3e36+Ifu0Kh7YWiZosGZlqrycj98lKFvFx04RZsD+ecRvaHrazeCmuOWomSA7q3WSRDs9EvyhFUQpHKauqnnCKmwkj1LoNjgxqsPbHdgyROhkNgMnHzA5lRQPghmnlL0W+rioWkUkxLu2f7Sw+3E7T1aoQfXXn2mHlK4QNvIyvZ99dxl4hQsUhZJc5UhTW4YbaEmhDYXjk0AES9WhD8JzLLlBFrNIBA sos7ZoLP Qyvng32q4TX80fHlU3xczrKGViLy8LdtGTQKYfid11Erqk3G3y3HREMXaBYUGvjinSgVntkJddGi6AzUBNh6Y+39toHSAqyFjaL4++sYEnwwQhUpMdG1vrxu/ZIUphsG3AKM76c000kQPrUv43A79FTI3/NG2phgIKhUQ3io92DCgc1cjoYsBbkNBDMbW0aejTJb8C0ePIKvX5goTO3QtCcwJtZFIUTdkwn+hRBX5mnwEZMyCf+QE7dIiDPAPzUF2ErBHZ7gLWCFt4WHDUL2r+L6EcVZB2Pap235fWgrKBeh9RCs8d0ZbE2DDhozPulCoECUYpT/wqtSZQ/OjR58EjJSQ15UYzWknE5Kx051DbKzeW0hiedHQMVepE4lnqizsZTxqB8ZTGJIq4fkm8Lp2H1g2hp1qcQVOnSlIhXnwNsArgFv620f2AAYJgZwVT12d4U3B/HjJEE8QqmSABkZrfWbZGw4od4iC8sjIqMU0ZLLC8Cis6NBvbRZvfmxGUOHs4jrzt4mvnhjvZ2voTNHZFWv+kwtwomtKDlqBgJSchwt/R2dRo5nLvBvDT6E6qE+HYv2/l/9stNLqSkyvhIIcUTCF/cTLnCWfTge9 X-Bogosity: Ham, tests=bogofilter, spamicity=0.003019, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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;