From patchwork Thu Feb 20 15:03:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984103 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 462A91E5B9F for ; Thu, 20 Feb 2025 15:03:42 +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=1740063824; cv=none; b=EK7XWJaREzkMwCnBCvjdvvagnHqcwtqwwSD90PLyOI4ufma66F5q08BRC56U/t56bE+tQVHSt12DS+cNw5kfpRdmicvQqgzUsJK6MW0NzoF2ltly0vhpkEceDe4WV9usIXYSzVyHOZQkWnt5D2aLMp5NzUof/zkVQJndLePYolI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063824; c=relaxed/simple; bh=mvZIKYgOX6EYSfhAM5B9z6KMXjLDBBxNXjsjITMmL9I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NUdpqcr4u5FU8R3eDLdDPhZoyb3uLRbU53Xr3eQ9foBp/5wF/kYzDJwrDz2339WzPMiai77+OS3XAvDF+EBrbQuUzL6jCItT6ISQP5gwsXmjFNaLZxC8WGM7gSQnEEB9XEn3sbCI6TaW7z+D2xZ5S1ZrsWwC9w9P5R8Kgzh/qs8= 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=LPU/PEhm; 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="LPU/PEhm" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4399304b329so5454305e9.3 for ; Thu, 20 Feb 2025 07:03:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063820; x=1740668620; 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=/GEg9bTAKZaokpu/RBxFBw77BnqyC2KwAVRaZb3wfC8=; b=LPU/PEhm7n/FfaG2a39KA3/5WzgsyhiSvazMWkSojX9lSIsvjJ4YmS0YJFDEZP6KJg N3+1nYJXFzREtMr7HKJ1jcP/gsz0QJGIeZZkzUMtCsbVMildF1VEiENHvFyM+G1FlQLk xXbnx1QimeO1oTfvoJim5UvNE+9O40H+7s2A6SYX8LtI9Cum4VsLpYquzHcRJw3lptaF jzOVSoRCZN//IGccPHR4NXaYozJIaM2xKlaCBK2+PsfHr6oZaj73i+lz0txWW7/2eBPR vZCCNyybLGB+jKrfZ+rQDw1B+qa0/kfExAHQcAqEL203B3zWx9YQqvSargv/kaLkiz+i T0Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063820; x=1740668620; 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=/GEg9bTAKZaokpu/RBxFBw77BnqyC2KwAVRaZb3wfC8=; b=kdTa99ul56R5zo4eLoAr7x72hDJ/iPi8RCTJBewQ2bpWhZztqkkXAK+wadEGC6HwFf vYEkTZrCsw9WCP8SxM+KI2ohkdluCf79oBLv5nLybTsv/tvfSHbK0l/iXa+TSeib6IS+ Z5EDW4DnltOX9v5bHh/Y6EDLVIWNtVew/2nXkoNyUKbzxtV3iaynV29c0MMc31fWq5gi ThUaTPAuv6rbnUzPr3OfCZf22a8r2wWsQhUiwpMtAlWtMDFtBTyEAE6Y4QpQLfWQ30b9 xPNk+HXdAceYNUcfCQoYdkuyc2anqcOzQt91ASM+66LVbcLnmW1Y6khvSrbKY65cC7A9 K9Pw== X-Forwarded-Encrypted: i=1; AJvYcCWffoV00WDX6kw+VEYCwYCndT6wvU7XSrVqzf3B1WSDPmmM0KAGvjv/iYv64NI7+rEwnBJ6oXhsSXStPx6A0c4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyi3RApMMpkFEVhJyqOW+p+73Fx7gsTaEnxcq2/4FSGDGhrYACn 2dU/spS+/gGBFcYizhYOPk/jOCRCDDjmrSAP4x4+szwPaouRy80xg5Vm8+Xml9jHLx3Owc/oOtl eD+h3FuhUAw== X-Google-Smtp-Source: AGHT+IFOliTpraR15CWTkacKeBSUqf8FbRBDdkQpsEi0GIcWjSpwR0EViFfPxP8qN/+qIjSryFofPr/PtV4xXg== X-Received: from wmbhc12.prod.google.com ([2002:a05:600c:870c:b0:439:98ca:e39d]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b26:b0:439:31e0:d9a5 with SMTP id 5b1f17b1804b1-43999dd1e1cmr69699445e9.22.1740063820541; Thu, 20 Feb 2025 07:03:40 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:13 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-1-9bbf57d64463@google.com> Subject: [PATCH 1/6] selftests/mm: Report errno when things fail From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman Just reporting failure doesn't tell you what went wrong. This can fail in different ways so report errno to help the reader get started debugging. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/gup_longterm.c | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/mm/gup_longterm.c b/tools/testing/selftests/mm/gup_longterm.c index 9423ad439a6140163bdef2974615bb86406a8c14..46a2139b3a646f6c050eb031a770f615be76c433 100644 --- a/tools/testing/selftests/mm/gup_longterm.c +++ b/tools/testing/selftests/mm/gup_longterm.c @@ -96,13 +96,13 @@ 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\n"); + ksft_test_result_fail("ftruncate() failed (%d)\n", errno); return; } if (fallocate(fd, 0, 0, size)) { if (size == pagesize) - ksft_test_result_fail("fallocate() failed\n"); + ksft_test_result_fail("fallocate() failed (%d)\n", errno); else ksft_test_result_skip("need more free huge pages\n"); return; @@ -112,7 +112,7 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) shared ? MAP_SHARED : MAP_PRIVATE, fd, 0); if (mem == MAP_FAILED) { if (size == pagesize || shared) - ksft_test_result_fail("mmap() failed\n"); + ksft_test_result_fail("mmap() failed (%d)\n", errno); else ksft_test_result_skip("need more free huge pages\n"); return; @@ -130,7 +130,7 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) */ ret = mprotect(mem, size, PROT_READ); if (ret) { - ksft_test_result_fail("mprotect() failed\n"); + ksft_test_result_fail("mprotect() failed (%d)\n", errno); goto munmap; } /* FALLTHROUGH */ @@ -165,18 +165,18 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) args.flags |= rw ? PIN_LONGTERM_TEST_FLAG_USE_WRITE : 0; ret = ioctl(gup_fd, PIN_LONGTERM_TEST_START, &args); if (ret && errno == EINVAL) { - ksft_test_result_skip("PIN_LONGTERM_TEST_START failed\n"); + ksft_test_result_skip("PIN_LONGTERM_TEST_START failed (EINVAL)n"); break; } else if (ret && errno == EFAULT) { ksft_test_result(!should_work, "Should have failed\n"); break; } else if (ret) { - ksft_test_result_fail("PIN_LONGTERM_TEST_START failed\n"); + ksft_test_result_fail("PIN_LONGTERM_TEST_START failed (%d)\n", errno); break; } if (ioctl(gup_fd, PIN_LONGTERM_TEST_STOP)) - ksft_print_msg("[INFO] PIN_LONGTERM_TEST_STOP failed\n"); + ksft_print_msg("[INFO] PIN_LONGTERM_TEST_STOP failed (%d)\n", errno); /* * TODO: if the kernel ever supports long-term R/W pinning on @@ -202,7 +202,7 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) /* Skip on errors, as we might just lack kernel support. */ ret = io_uring_queue_init(1, &ring, 0); if (ret < 0) { - ksft_test_result_skip("io_uring_queue_init() failed\n"); + ksft_test_result_skip("io_uring_queue_init() failed (%d)\n", errno); break; } /* @@ -215,13 +215,13 @@ static void do_test(int fd, size_t size, enum test_type type, bool shared) /* Only new kernels return EFAULT. */ if (ret && (errno == ENOSPC || errno == EOPNOTSUPP || errno == EFAULT)) { - ksft_test_result(!should_work, "Should have failed\n"); + ksft_test_result(!should_work, "Should have failed (%d)\n", errno); } else if (ret) { /* * We might just lack support or have insufficient * MEMLOCK limits. */ - ksft_test_result_skip("io_uring_register_buffers() failed\n"); + ksft_test_result_skip("io_uring_register_buffers() failed (%d)\n", errno); } else { ksft_test_result(should_work, "Should have worked\n"); io_uring_unregister_buffers(&ring); @@ -249,7 +249,7 @@ static void run_with_memfd(test_fn fn, const char *desc) fd = memfd_create("test", 0); if (fd < 0) { - ksft_test_result_fail("memfd_create() failed\n"); + ksft_test_result_fail("memfd_create() failed (%d)\n", errno); return; } @@ -266,13 +266,13 @@ static void run_with_tmpfile(test_fn fn, const char *desc) file = tmpfile(); if (!file) { - ksft_test_result_fail("tmpfile() failed\n"); + ksft_test_result_fail("tmpfile() failed (%d)\n", errno); return; } fd = fileno(file); if (fd < 0) { - ksft_test_result_fail("fileno() failed\n"); + ksft_test_result_fail("fileno() failed (%d)\n", errno); goto close; } @@ -290,12 +290,12 @@ static void run_with_local_tmpfile(test_fn fn, const char *desc) fd = mkstemp(filename); if (fd < 0) { - ksft_test_result_fail("mkstemp() failed\n"); + ksft_test_result_fail("mkstemp() failed (%d)\n", errno); return; } if (unlink(filename)) { - ksft_test_result_fail("unlink() failed\n"); + ksft_test_result_fail("unlink() failed (%d)\n", errno); goto close; } @@ -317,7 +317,7 @@ static void run_with_memfd_hugetlb(test_fn fn, const char *desc, fd = memfd_create("test", flags); if (fd < 0) { - ksft_test_result_skip("memfd_create() failed\n"); + ksft_test_result_skip("memfd_create() failed (%d)\n", errno); return; } From patchwork Thu Feb 20 15:03:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984104 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 6849F1FF5F4 for ; Thu, 20 Feb 2025 15:03:44 +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=1740063826; cv=none; b=WQMUs0Wv4EOc7KhXurlDPUio/y9sBhUjHlXX8o93/qILWxfCfaXCoF5Y5z8x5TXBlxubtqt9WVz/tuZEzJsY/Ntqal7PRGa+mtv6TfI80f4OJzkkouoGFYXg6Om3chf+0hIbN3i2b+P7/ihGxhy8K5I7F3xAj0BLJVC1k3kobz0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063826; c=relaxed/simple; bh=Ilk6+5tZclI1F7dj4D5Y8eYPtM9YM7Dc/fjaV8j1+O8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Iw5VAnY02addK4f1rOVwR10iC/A3WQmWjn/XAPaaJDIIahheH8CWiwCh08j9GLmrBA7GJOGhmA05vUfufDfoR909ipTaZnpHVElNICkroxiPM1mnn/+lMj1UMwECaN02obPY39Hy2Bnr15SQoi0rcwxtHP+Bnba3rYMlFOrcExc= 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=OCjwY5vX; 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="OCjwY5vX" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-439858c5911so5461095e9.2 for ; Thu, 20 Feb 2025 07:03:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063823; x=1740668623; 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=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=OCjwY5vXJ5IiNskY7194N8VukxN38ZP9SQkZ0aCCPWWOjjrFjDBZq2N6NeX/rV+Fyz 4HjM7oJD/nLmAJDGMGNVD+A4sCa0LN6Z3ConMghkgNHAhKe59DD1tiz9N1kR/bXl6pAT yxexElii3MaMJSFk2pBnPqijIRnwxDC0+eJ2gJeq9yuuI2gSwknv3L+0zejI4uKlHoNO VMEXAwcJ+QhwE01G9RcBgwHT5qelrTDSfS1ku9OVqqwoxZIIFn0Cg+MCJgPP6TFaDSR1 Q/M97tSm6VOJt2KXibC5MSosSuhkGCBRPiCdQdT5XJu1/aUyrSM5dgWD7fQ8bd0qN3HA ++uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063823; x=1740668623; 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=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=D1/XACdaMQ6YaBCCU/pmkosLSDCQuZ37XyvUbaFZchcuhM3FPzyDee/psCTwkrhLLP C1XBv7aJjgQfvkpYwMW13vgVJziluH4bJKFHPANP9bdoxitCb1bbER4bxMPJ53QqAZYt 2pJX0iDEddBOfzJZdNiaZA2SMdtHdTHIuqjWl/j/cxF6iNrMLpkAB9emM6QQgy9Jls2F LDg4/008NaIDfyKxUYknBPHgRnL32dCdnbfODnjWN+d6qwnMArs7qd2r72h9AXPBgr8R hYJ+WXp2e7KRBcj73EJVxwYMnZA7OpbavbugnVH1/gxZHEyh/s/CCS5/F5PRb1WjNSq0 bjLQ== X-Forwarded-Encrypted: i=1; AJvYcCW8a49CLSJJIfytqpUH6zFHivRgDlY9HYHBn583ycOtCadLfcXTL4jwPux8lso0le3b/pjAlxyBG3v1O/3UUzM=@vger.kernel.org X-Gm-Message-State: AOJu0YwXipaTXGqta0ODmOk3uIXmECFjj/bpDwL42oNDzpexiQnPfNxk tU1NxpAGj2HCYf0hiGa8ysCGuyBV9DLPQLJokw+HazmREl61m0pracuV1lNqEOiGwH0n5MVI+VB GrGiVWsJGEQ== X-Google-Smtp-Source: AGHT+IGMX6sUMZFB6kcF1FLDPNy7JKgv9mVpVnHmQkgAM/qSvu5gFbpVA6vpmtah98EUgiAhA5SqxJEjJc185A== X-Received: from wmbg23.prod.google.com ([2002:a05:600c:a417:b0:439:95b9:9200]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:450b:b0:439:9225:2f50 with SMTP id 5b1f17b1804b1-43999db0139mr80231185e9.16.1740063822867; Thu, 20 Feb 2025 07:03:42 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:14 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-2-9bbf57d64463@google.com> Subject: [PATCH 2/6] selftests/mm: Fix assumption that sudo is present From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman If we are root, sudo isn't needed. If we are not root, we need sudo, so skip the test if it isn't present. We already do this for on-fault-limit, but this uses separate infrastructure since that is specifically for sudo-ing to the nobody user. Note this ptrace_skip configuration still fails if that file doesn't exist, but in that case the test is still fine, so this just prints an error but doesn't break anything. I suspect that's probably deliberate. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/run_vmtests.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index da7e266681031d2772fb0c4139648904a18e0bf9..9c963f50927ab2b10c3f942cedd087087d4d0def 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -89,6 +89,17 @@ RUN_ALL=false RUN_DESTRUCTIVE=false TAP_PREFIX="# " +# We can do stuff as root either if we are already root, or if sudo exists. +if [ "$(id -u)" == 0 ]; then + HAVE_SUDO_ROOT=true + SUDO_ROOT= +elif command -v sudo >/dev/null 2>&1; then + HAVE_SUDO_ROOT=true + SUDO_ROOT=sudo +else + HAVE_SUDO_ROOT=false +fi + while getopts "aht:n" OPT; do case ${OPT} in "a") RUN_ALL=true ;; @@ -384,10 +395,13 @@ CATEGORY="madv_guard" run_test ./guard-pages # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests CATEGORY="madv_populate" run_test ./madv_populate -if [ -x ./memfd_secret ] -then -(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix -CATEGORY="memfd_secret" run_test ./memfd_secret +if [ -x ./memfd_secret ]; then + if $HAVE_SUDO_ROOT; then + (echo 0 | $SUDO_ROOT tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix + CATEGORY="memfd_secret" run_test ./memfd_secret + else + echo "# SKIP ./memfd_secret" + fi fi # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100 From patchwork Thu Feb 20 15:03:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984105 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.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 49D461FF1DF for ; Thu, 20 Feb 2025 15:03:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063827; cv=none; b=AS5TseB1ER3ktJuDq8YaZN1//BLq5XHcqsDdabnKsjzjZn9nokSfA+sVBCj8RNojT56IF7EOoLX5rc2sD/44o5WdRiBzB55K8w/3KxlE+I3U3vBchsT6hkZhgJQ51nWa/w0Q70y0HrMhNGuwxPt1v1eRgRXEU27Ok9pJqwmUU28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063827; c=relaxed/simple; bh=9/O8tij2wirjK4B8U/5x/9fVjzo452E6485tV+fUgJM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iyrFVxqhIDP3bhCfq9nneizylp/6otAsqdfxbKtxXnRTs09KK0448LnDfFVT64gavVmZWuTMWxLt14jdtwG4DX86Hk5hpcIHi3MWnU7sFjpDmUf30GKHf+AzgDsArwMXy2B6qke/YEcCs+Bj+EGcZsEQgn52a70pxD5bIhJzKDA= 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=D4qL/pqf; arc=none smtp.client-ip=209.85.221.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="D4qL/pqf" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-38f338525e1so539544f8f.3 for ; Thu, 20 Feb 2025 07:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063824; x=1740668624; 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=Pfnk8jRZQRXvEGJgMo7kX45MXuk74eHKcJOVD1/hcv8=; b=D4qL/pqfz7t6i5X9OGWOI/i6vUeNz4tquOFDin4XQLG9mcFZL3bV8eKrUhycSpYz7R PChUVwVxLugpvqnba4cbcBe+RaXB81Qy7G8qmRB5SyAl63nRkqlhLc8EjD5WvMixXESH 1rBiSj481MKpTon1Awim9nqbzlIaxPGMGs4XZFE1bhQMoED0bBdZF6aqHCH75hUzCvBf R4HtebUll1A48MZVtxtEuJYF6nDDyCGcuITyEBOoPsWBlMH4AI/X2Of7qkxxXtM5pD+b BrZMiRQy/b7QJvC6Cq4vRzXCfU8d2vq8ZD2pEmVE7RIkODVxauiFHBJEBA5ugL5FOaap DYCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063824; x=1740668624; 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=Pfnk8jRZQRXvEGJgMo7kX45MXuk74eHKcJOVD1/hcv8=; b=iu6L8Tjn0+xr5KSndw8sLOA3dyPyldb1I0/IadPNiCUE4D8MyD5sjEEOjMnGwwv7gC pDLEwbp+HbFSGYctF/CXn678Ks3n+j/gAkFoU1A3vB38zr31SO3Pb1ry6OMsdoxBVmcz DX2Rgc5zo49IJg2RESHXH9ifWOnwN2MbqlZMoFgjGIykvuDYNWFTskWfR1OxoXASx024 ctuIoEwVciW8EaydbcML1jLY+qvvKySX0dRzaJB8lg/GufbkusQuyadMaQy7/aGjwsgw +7fAMXK3aQk8p4CHAAWHxCCf9N7GuVS6oxX5AwHP+G+GJ1yfqKSEKd3nwPhyQJ/AojK0 dAQA== X-Forwarded-Encrypted: i=1; AJvYcCVg70ig5zHq+SPFBm7aZ9nQ0VydguLv8ouYYMRYLuzLUIelkLd4E1DFlSdJx/PlbKOy64/0yMd8jP89A22OtGo=@vger.kernel.org X-Gm-Message-State: AOJu0YzzPhB2BcTksNAG1cCdMJfzO5Z0SjDU0+gzmxcu0A5Qmd/mvfh8 2NyzR2TgGLaCWljRYTfm1OV7GIeRR9f/hpUKVXF1vpoMJngWW4nqZ4CkrxSd084CkPiGKff13Tc 6LsY9LRJSwQ== X-Google-Smtp-Source: AGHT+IEZkoGqvABvYTvvXiRtV+S/mpL0J7HYkw5xP36OjVJpS+4DgqAiy+8j1WNNFXzaMG5CNB+I1Lj8O+cs0A== X-Received: from wrbfu21.prod.google.com ([2002:a05:6000:25f5:b0:38f:3cf0:aac7]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2c6:b0:38f:3344:361e with SMTP id ffacd0b85a97d-38f33f2e954mr20711279f8f.23.1740063824704; Thu, 20 Feb 2025 07:03:44 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:15 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-3-9bbf57d64463@google.com> Subject: [PATCH 3/6] selftests/mm: Skip uffd-stress if userfaultfd not available From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , 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..db5366b4766e5bfa2d1150d2f3c2d32469a6e28b 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 avialable features (%d)\n", errno); test_uffdio_wp = test_uffdio_wp && (features & UFFD_FEATURE_PAGEFAULT_FLAG_WP); From patchwork Thu Feb 20 15:03:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984106 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.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 42DCF204855 for ; Thu, 20 Feb 2025 15:03:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063830; cv=none; b=AbFCOvIkhSjaOxQIaOAEPTpUJIPPl7mvnDRnCmt2UWQ6VyZd98e91bO3jgAfa4twhIEdKEtMmKMtyvK4LxgKtXrkiEPrnkRFDgFvaiZdLJj8Ow1kKt3EYZFfj9V0urHwH33cWy6q7CstIYsbqvzuqqL5rvjeoF4/jGQXaqskxwA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063830; c=relaxed/simple; bh=Se/GydgHH9nLLIGfdGGZR9s2IiE5I/RUbIaLvfmjrag=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Pis3jzEjofF/354ZXrR/REJ1aX9YwGk2tyFkMaOEO4wlFHw1d1IRXf4U7JCM1mF0ylpU0A0Xkqzt60CaVHcxm7bOj1fe2kYAhHoBwXgf5yppHh3Tt3jfeqyIjaSu42vonQJ/eMhroMPcIe5bxSUoMZogisWJFOKgdj9rtdfWXZs= 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=qz2lb2jc; arc=none smtp.client-ip=209.85.221.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="qz2lb2jc" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-38f62a0ec3fso678861f8f.2 for ; Thu, 20 Feb 2025 07:03:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063826; x=1740668626; 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=y0OlocBh0Rs8sEPgodfZSsh3pCn2jLgGhmAgomJhmE4=; b=qz2lb2jcxfwkhdfoOfo9B878dvkifMzWIFPKKRGP8cmDCdnz8WN1DSrdSwM8MEdzXt 4CTF+SxaF7CpeMY9yolDSYEfH2TY5H0s1QoKk1+roTraYawOhkddRlsmQhYehNfnf0x7 0pAq/Zi3ltCMA0W+WecLmyQQIjcXIKHY/5cm5Gj94SWVIf+mjIdX7y7+vvWcYlnnT2pu gs0w6jdtoU4lvrMrVF4AKHYlrNfLYcStyZM5RnnsAp9D1DLNyPhQ9Vy0s1oGlFR/Vlzr l7gdmCE0sKphXNOQXnAQp/E11WLP2/OXfn41kt2Tgaj3AsXQT38wJ9+vebM/IkPEMlQd MRkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063826; x=1740668626; 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=y0OlocBh0Rs8sEPgodfZSsh3pCn2jLgGhmAgomJhmE4=; b=EZ/kF1+BMTalDFdU71pfi2baRRQZPOXAlaTKg+N48kdvIVpbaUa40IQhk9kHVqYqQ6 A85npoDxXuK7beONocKqX2rGi6fsGhAxevsIuqG0se7Xx67OdspfQu4OhS98TPWANfwB kiMrKz7b2z2YNAFonFyDBHJep3BYKw8T+2bK25Bi+Fi64J5MXo43+O/RRA6dz+uORp/d DhEL2xq0my/k5oEKr+DRY3NTbc7v+3fj0wfsXamRkSkYQBzHSI7n/bxOTJZRA/rliCne OMZAZ2T4vWgueRvMwl28U6Evzntj3FvtGEiZJlcj5yH4FIN+vd6A7nKCnWu7DCH45HP7 Ld3w== X-Forwarded-Encrypted: i=1; AJvYcCVqI7lyVAoU2s09daMqj1VtowyNcE6dyJ3CoH2/1e5vMmTqJOK40e+LiBNYOwsSIeawbr1EfKCVh4MI71urJhQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+/zkthpWJkzUJSrgura6EVB9DLl99zOmKBhb9vVBs4Yj1lShB TMSmju1t8rQucPhYv2gHgkh/UWMLjx96jV/mkAHI4bhZUFXTDoCnciu1xWKDAVr8BYK9Gw634lV f9Xf23ucDIA== X-Google-Smtp-Source: AGHT+IFsGg82gKlzl8tWzntDHJFghDx2t08uXQ7P5idCDRgaVqvqc920eCUSioT9wAdKGGY50Zw9lE7MF0GKww== X-Received: from wmbez7.prod.google.com ([2002:a05:600c:83c7:b0:439:67c6:5642]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:47a7:0:b0:38f:4b15:32fc with SMTP id ffacd0b85a97d-38f4b153521mr12347926f8f.8.1740063826684; Thu, 20 Feb 2025 07:03:46 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:16 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-4-9bbf57d64463@google.com> Subject: [PATCH 4/6] selftests/mm: Skip uffd-wp-mremap if userfaultfd not available From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman It's obvious that this should fail in that case, but still, save the reader the effort of figuring out that they've run into this by just SKIPping Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/uffd-wp-mremap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/uffd-wp-mremap.c b/tools/testing/selftests/mm/uffd-wp-mremap.c index 2c4f984bd73caa17e12b9f4a5bb71e7fdf5d8554..c2ba7d46c7b4581a3c32a6b6acd148e3e89c2172 100644 --- a/tools/testing/selftests/mm/uffd-wp-mremap.c +++ b/tools/testing/selftests/mm/uffd-wp-mremap.c @@ -182,7 +182,10 @@ static void test_one_folio(size_t size, bool private, bool swapout, bool hugetlb /* Register range for uffd-wp. */ if (userfaultfd_open(&features)) { - ksft_test_result_fail("userfaultfd_open() failed\n"); + if (errno == ENOENT) + ksft_test_result_skip("userfaultfd not available\n"); + else + ksft_test_result_fail("userfaultfd_open() failed\n"); goto out; } if (uffd_register(uffd, mem, size, false, true, false)) { From patchwork Thu Feb 20 15:03:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984107 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 50A94204F95 for ; Thu, 20 Feb 2025 15:03:50 +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=1740063832; cv=none; b=SvOVhyUMVg+AxaPfXNRr3jnQm6CbngT33e5+ZRiNTny2lZDI+zqO+7r503wrITzuqeBFV0mkj6I6Z7+CtvSdGTLoEHiDu89e52ORZ2kXr6VhNxO+9aIlQqQLAz5l3h+n9HowWV7TwdJU9NwUND1QOm4YrcFv80AZj1bEP/F2zwc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063832; c=relaxed/simple; bh=6us0OPPk/bMiyXUbfdqsVWAztptDhX3dd4CerV72Gpc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=YfNOVX6yNyI0howwy42BxsAhLJX40I++Pj3SlSYqdjaAS8ro3MGsA1zT8gwPD45XUwKSgoDJY9a8FYOSGyELI/jEotoq+Gys/uimdQ7XfErKVTTKNkHpw16PF1pche7ORnzoYjog8WZsHzsB4pXqh4g4zAUB5pmKo0sBunw1vBc= 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=Ilp8yF2m; 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="Ilp8yF2m" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-439385b08d1so6851235e9.1 for ; Thu, 20 Feb 2025 07:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063828; x=1740668628; 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=n5anIIX08DH7I1Pe1I+Cw11KP1w7s/U6PELcC7zyacQ=; b=Ilp8yF2mhlguBz/pE42gDVU1Yv/8+JSRN4l1WY/AAnGP4Zvv9c6sVxXWZh7iTWc8tU BP8ZaZYjDnamyCYu4jDggFLG9NR3oCX8gGbubvw95jehcPWodq7by1FFqhP1OeZsc4Fk md20EeZ1XdzV/tIakH6kWPPFyzxkH81I2DVU3DLBYCHyP/XBDB4/yU/iWqsWGLDLbHHH RmuyZFXDSR5M5KAZudeNQ1uMhRaE0P3OulnLdIWCLRKW6ZrDvYDesGEtmkmdjK6fepad oMCtXnFQFeN3MDpCmuHtdYal4irDfMDWGx7/nIehKlFLlJ9I6/GqDI/KQ1JhQb+oHnz5 FpBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063828; x=1740668628; 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=n5anIIX08DH7I1Pe1I+Cw11KP1w7s/U6PELcC7zyacQ=; b=NhR2ftzeTqWyGDscQHWEBRjdL/OHpQKQVi3FkXGc3EBvoGCRzYIvHX2OuSVNJzLQ6B +GtO6BN2gNPDkBQpGUflCmWRGqlmeVbGPiWJZZ/OdA8Ca3ItnIWlT+dAlUmSvTL6luo0 zZc+6st629wnz5esjczIc7/Q0eAOa13whhDGT9eTnqc0lxtxC7wrCgwcBd3FwzZcAQ3N LcgShjx7BLTbgq51/+JVeETTv1As30cNNWGslSqmSgCMfnnlqS2iX48tOzfSaXE7uEa/ 4tU4a8M+WZSlqIhndXNP+bHpe11IzytiiNuWyVPO2YZqtHtvPNwT0+oG4/uhSmqhrCCW fi+g== X-Forwarded-Encrypted: i=1; AJvYcCUgKWPpv70PE+igTDDdeDEY+xStepruXIkploSaxBJuCaZG5YS5fMCT9eig8RDmFaglP2/MevAt1ErA6ru0awA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2aP8lV7Zw9lYwS/2iXrB4UkWAOX8QmExoL6nw1J0SNgMVaMdh CkAaZY7h0PldZ+9KHNdi2g9MWB5eEW7TA9HomcAXFikWTy+5NZA0it0aYTWYCLW0ST5VHd9xRpG KGP2v9Raehg== X-Google-Smtp-Source: AGHT+IGIpi/Y/94IOaJbe0uGO6m//Yh2Wsky4Ip3Q/V6kyqLVCBH3J882rU0thH0J4Ub/her4q4G/B/xr6R6VQ== X-Received: from wmbfk5.prod.google.com ([2002:a05:600c:cc5:b0:439:89d1:bf88]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b26:b0:439:985b:17d6 with SMTP id 5b1f17b1804b1-43999ddaa0bmr75459345e9.27.1740063828632; Thu, 20 Feb 2025 07:03:48 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:17 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-5-9bbf57d64463@google.com> Subject: [PATCH 5/6] selftests/mm: Print some details when uffd-stress gets bad params From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman So this can be debugged more easily. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/uffd-stress.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index db5366b4766e5bfa2d1150d2f3c2d32469a6e28b..1facfb79e09aa4113e344d7d90dec06a37264058 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -456,7 +456,8 @@ int main(int argc, char **argv) nr_pages_per_cpu = bytes / page_size / nr_cpus; if (!nr_pages_per_cpu) { - _err("invalid MiB"); + _err("invalid MiB %lu (%lu / %lu / %lu)", + nr_pages_per_cpu, bytes, page_size, nr_cpus); usage(); } From patchwork Thu Feb 20 15:03:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984108 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 26D1520C010 for ; Thu, 20 Feb 2025 15:03:52 +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=1740063833; cv=none; b=nhvaEwa6ev80H53M3K2w+IYoFu79GP+a8OdFkDMJowUQQNqso684TeI8qk1IexVTBSaeOO+q4Pt1I5Gb68AlRO8w9FrJMNJH5pCbMwdVb1qgWfUDLHk/oWwYvJoezQjt6lJEXBnykLaiqF87Xzkwub2rzwK/O/UezUbGWXc+CY4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740063833; c=relaxed/simple; bh=W4mj1z3uEq947HIkExuSIBSOsvPwRxwjgNUnGwTjvA4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Qq8vaTJDjZVlm1cJNo/GG+g3t9U1KIgAnHP3UeS4QvTMTYwwbz2jd/JN6NYxwBjKiNWeYkqyWcfBATGqZpPyinQAWkeZDJ++LyQBBeA0NdbqMRXhRlD80pUX7BhtuaqNz8pdQG5XuHvRms0ta89e998/80eFBwd51ofCMCo3cXw= 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=KovFf0YR; 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="KovFf0YR" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4388eee7073so9933665e9.0 for ; Thu, 20 Feb 2025 07:03:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063831; x=1740668631; 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=xbBII2vXo7U0fvcYEVnofRQGig0kHut1fyAo0nfwDbE=; b=KovFf0YRRr+aSy7IFePApN2u1PY8usv/WOA7D13UUU4bpr3YH34guHZzP27VltJJ7f yfsxCyu5KZfu2gSWsTqyFkOAjrQjngVmkr64SwfWUze/Z02eabKZovhgD/5+9KKe1xeM y4tmGAJQ9T02CWWw1LerY4Lp8Gr7MksvV/fBT6IN0Zw2rAsKlyXkaAkOQeE3pWL7nHRy qMCBRDaEARV/wq96m8yKcTcI/XW3UotTA0ioSqFS1yE88wH0szgukNiE2IqFEwEXD8ni WGW2Bjqdm7I01kMFFzBiIXRs+LmJY0xgrNiDahSSA83yQgybN8wwJ+qaw/EpgnC/ZoEn pNMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063831; x=1740668631; 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=xbBII2vXo7U0fvcYEVnofRQGig0kHut1fyAo0nfwDbE=; b=Iz3kOj9deA8qeTb9ol/gLcuwKAYQH9vEikKO3f9z2zZc+mFvMVjVFH5MoQMr11RC5v jCfcv1wFxDid6BTIdMj37H/4LqKFoQnY0/p8zBp5Cp/ofTepNgbz4i7vC7M20f94zPIK I4tDy4mUj3jg71EQJFOKG5KgK2dZSMIvB15bknX28zZ6yIC/85oc0g286TM+Jiu43q6P cNRPCxctvPCRkKFrDPaKlUdYTw5D3yYl55AGaqnVNPG974UIyPpm/Bb1pAH7+vNSEiPd GzJb3WzRHXxusbdr51o1KNVkKJLJJq5LH937N0lrbHcQ1gB6NXpmJ6XuOg9PVlxccmXr TNUQ== X-Forwarded-Encrypted: i=1; AJvYcCVyLgdxOLo4of+cXDfjsI6cwTTabn3+7bdwArc25trvNDZjsg2WeVxOjb8SHUjDEL6oWY4TDnsbv7kWU8Xspeo=@vger.kernel.org X-Gm-Message-State: AOJu0YxawksYQYhOiEJ+ekAGc+tk7c1O6TuMEXR4HmRJJVjFPJn1bL1s 5rXaP6+kOXS4DDgUq2UzeDVjxRZykZT9M2aWQxVYiyUTfI89IfgYrAoMDEeVkkgoJzGtj1x2Aye W57vNtl6BjA== X-Google-Smtp-Source: AGHT+IE7Haql4kRMGhVIrFouZcnUmxPrPTorpBWL1U181AADTVynYOoCOjR/I6BHdrXJEH2hvn+bGdgYYdY0eQ== X-Received: from wmbay10.prod.google.com ([2002:a05:600c:1e0a:b0:439:8715:690e]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:1f8f:b0:38d:b8fd:591f with SMTP id ffacd0b85a97d-38f614991e7mr3002810f8f.5.1740063830609; Thu, 20 Feb 2025 07:03:50 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:18 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-6-9bbf57d64463@google.com> Subject: [PATCH 6/6] selftests/mm: Don't fail uffd-stress if too many CPUs From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index 1facfb79e09aa4113e344d7d90dec06a37264058..f306accbef255c79bc3eeba8b9e42161a88fc10e 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -453,6 +453,10 @@ int main(int argc, char **argv) } nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); + if (nr_cpus > 32) { + /* Don't let calculation below go to zero. */ + nr_cpus = 32; + } nr_pages_per_cpu = bytes / page_size / nr_cpus; if (!nr_pages_per_cpu) {