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: 13996776 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 CFC19C282C1 for ; Fri, 28 Feb 2025 16:55:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6195F6B008A; Fri, 28 Feb 2025 11:55:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A1706B008C; Fri, 28 Feb 2025 11:55:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41CB16B0092; Fri, 28 Feb 2025 11:55:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1DB7B6B008A for ; Fri, 28 Feb 2025 11:55:08 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C4984B3B76 for ; Fri, 28 Feb 2025 16:55:07 +0000 (UTC) X-FDA: 83169953454.20.02606E0 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf25.hostedemail.com (Postfix) with ESMTP id E2A5CA001F for ; Fri, 28 Feb 2025 16:55:05 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="4RP/f1js"; spf=pass (imf25.hostedemail.com: domain of 3aOrBZwgKCIkwnpxzn0ot11tyr.p1zyv07A-zzx8npx.14t@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3aOrBZwgKCIkwnpxzn0ot11tyr.p1zyv07A-zzx8npx.14t@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=1740761706; 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=S9QxBMT1dy5QbhO22yQnX/sY19xHXMzPESl6Emh05kM=; b=D0zkpm+S8OyB0hsMmDSWvabHXwsjChi2D1c4wxuiIU/eyKJEQlTlpeVZQMy/QQOi5r+TAM 23nPPq8SVYoCZvsLvGo5WwJ49ENLWOljO6PRuVukt31/CAVzGMh3Lw0htzny7vto7kM5xt Ix7WBbfMDdA5ef/CwOpP+Ycv4ujew84= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740761706; a=rsa-sha256; cv=none; b=WP17ZTqMyJZFO7oQ32Tgx4TWyLKZyx1FWpj7s4ySEKErAyv2wfoX1tLE9sJFZnImcE0dIS ju5p+tE/C4kh77J+CE39BgdJIkzUfnZH4C2qXpowhwzDhgUOQfXBYQ/I6vjCZSG4s4/9YC RGoM1NaxPzrVtRenfrunlC8t783G8qQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="4RP/f1js"; spf=pass (imf25.hostedemail.com: domain of 3aOrBZwgKCIkwnpxzn0ot11tyr.p1zyv07A-zzx8npx.14t@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3aOrBZwgKCIkwnpxzn0ot11tyr.p1zyv07A-zzx8npx.14t@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4394c0a58e7so15890115e9.0 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=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=S9QxBMT1dy5QbhO22yQnX/sY19xHXMzPESl6Emh05kM=; b=4RP/f1js5xQVx3KPki5W7TmhUe373uBDv8IT8ehwu4QD4wqJ2XKYzAnJwHwS5IFBjB qKM1Osu24TU0yiu/sv6guw1axrbQtfJEr2MAhW3VLYrsXAKxj+NYr0NPQSMwuMthQan6 sZm7rrS4NvtrtypyP0yLV2co4AKN3QBx/1Od9iINwVFWUh1LLSNe6OHJP0D26HW5Ytfz hNeBYBt3GvrTSETKga1E/ypxjP7JzVxturH+fL7ByXu0lk+W+YfAQaUaYFO24LLYtyTp sSJz4GVsn4buKnuaA+YosnddziXTsRMrwzAKjaoUX9OPY5x/NES22Evzn5c5Z2vVcLea crXA== 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=fTYV9dSkHTnEyIWi3deZR9DMDBHNPtCWQzsypfVEy4HfSOjpEzXdeq6tPQTHWqKPSa GzziMLsiJ363a1kBCorl/PWdevOmpsVj5mf+QXxWL5NFsJoF8RP6d8BT3ugsxy9g/nQm yYc3aRHG8JMvI4TotLsrlO/niHDgqjsxH+qAolgnEHUt/zGm8bLeM7a5Kz6GdG67hgFt hkP6dYVqOpnGsB2gAz//s/5gd6tk7GbIXLcUBBs59lOq9cZaf2dj93uwWSC998TLvB0L nrDZjUuQKswJl+0qZF3jTjtMUXohdHAAQ+NENk9RLG0ppcZeYuo0tqvh9kIqzMGLZERu YCzw== X-Forwarded-Encrypted: i=1; AJvYcCWBIZFdGJtkP0eyXeel/m3gktsoZS2msAkhA+eBJV8YKskXuaBv+E+nweZbi8tEPnaH8pHpoGZc2g==@kvack.org X-Gm-Message-State: AOJu0YxTHBgd5BfGASNpONR+z1q6mieQF1meElM7aHhLmHZnuBwsqwCt IGoy50WJc7P8jOefpKC0shtknZ0swfahCftfy+/BPm74NGksilQGKikQYc8ji1/xRLuo/8a+sQD wWbrp+gsI/w== 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> 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 X-Stat-Signature: nakcjqjp1xredw9qawqyrtxezexpc6sn X-Rspamd-Queue-Id: E2A5CA001F X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740761705-133423 X-HE-Meta: U2FsdGVkX1/9cTieG+9MqE+PmYUOVg0Pd88iMxyZxx2qvW5fC7rB5bSdK35I++llRgPz9aCTUv2YaZ65LmZtjQEO+J7DYR1lgcrbPjj5sfFHrbQUevp4wIqa1RfqPKG+u+LMNcQEUvX7EZddjX09Q2tY2F2eUNLpBlDbcjIgaWdBdtnvwcbFTwGUQJTDVDiDElD5Ak0iLy5UQ3yXqjPBsl+mu6tDTwgYUvbxgJWyXlpnfyK+saAOVpy/2cVSznqImj4eFE8mVvuEbKjcV1DgU+t9VePLRJZIUA0Qjge3pSjkHqrOkgbvcWekhPWChFb1Jr3SzavIsBZFC8nlCVxhFnReTl5N7zEcCYESs3AAtCpKSX8hOmL5xXeKkUZNs30FLPZWqioOeJJ7+CkS/LRuDbuIcBlx/qtbZXANd+6Sj5y1/bk/3fMt/ypMxp4K0yCUf6tX7sYjF9IzYVEHCMkofrGNvZ4La5Ri6M0Bswmd2BBVasqEmaV/P9g2oRncDF76p5GLgSilLu0fqW1bXlHTdrWWMc9t1ygjEa2Zn+iYQFArYKUy/q2uAhpWXx4Fp0JVHrAh80DfS6nHXalQPFWHR3W+HCxYNuLQOGhiFJrWFiZweheJ3t2HfIVh3ayG368kh/pH5bePsAIoDbDf4D2BoeKFqki1119Iw29Btk2jRzc0OM2D+d8NXcybV0uEjyEZk6EZNpj9ArmkTcKgKw/P3jIHYcSLCQTYdiRJsRKQVZPFAD2+oqFPdBpKsWwno+4JbqpcVAaSq8FH3Ztzn7/kcJUr04QHKM43QwJNbQoVd745bBemO53Hsg9JeBrcSownFbHXD8dqrAHJIR6B/yuVHkdp+8192tnBwBa9poS/PJcY6QgQaIS9AqO2a1IfVkX1X5LLs25fglPlzqaLuuZpPbRUouUNEODzSaPK8o7AKHbwhzl4Bmf1lffgFb1xjZj37tl8mDkRFLJbXK187pW i5R59jp2 9H0cb3t2apK5AKaJkYDbMnoqYvbiuPI8bhxGWAaurzwDT4xp71UfOzoBJk+0/n/yC+nBon3rB2zgYKqh/FKuf+NuPu8R/VCfEHrlV0BBv08WjFQSOF9rRt19bKqnZ/YsVBV3WV3IqaP59Q+miE1XDh+KMJV5VE6dDlu+siMS80McOdeMWKnQwex4q2eusLg1FU0Z2POjiwi7I0jluH6xPqUVyyfrSTjbEvSl1hqhZm+/dtJtyApjPqZM4bg1PxyfDkzfiV9OPUhxRDdaJOb4HNsSkzsoY3mQre9bdk4CaJzrS1i/0M/hXBsv4v6YWWjNxzDg5Ru4HmpO4LY4T7uoAM3eeNt4U6GZ0Qeb4TK3P3JED9pJSJ0CY3C2E8YsdPC7jJ5go3I8V5d+1BzO/uEIg8+omj1JDvTnHIRAM4ZGFhEojWEGB7JWmXjX33hmmwJCrkweIJmU50tldNWMmDGRJi/mRyHolPaFxBvvTHmV9Q843Y16EsdGT0R9sZyx/o+IB5QPZy8U3eR/fdDYg4nvg7Aaa0dNTuNW08vX5NA2egdqUP1Maz9n0SRPc1oKqrjHyLvfTqPC9plm2XFgPwTBa5FmF3Io1FuG4KmDg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000039, 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 Reviewed-by: Dev Jain --- 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;