From patchwork Fri Feb 21 18:25:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986156 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 08AE3C021B6 for ; Fri, 21 Feb 2025 18:25:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D7CE280014; Fri, 21 Feb 2025 13:25:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 55C3228000C; Fri, 21 Feb 2025 13:25:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FD74280014; Fri, 21 Feb 2025 13:25:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1B10528000C for ; Fri, 21 Feb 2025 13:25:53 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BFAB7161E58 for ; Fri, 21 Feb 2025 18:25:52 +0000 (UTC) X-FDA: 83144780544.07.FD09FF3 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf17.hostedemail.com (Postfix) with ESMTP id E774F40014 for ; Fri, 21 Feb 2025 18:25:50 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sv8jGcUg; spf=pass (imf17.hostedemail.com: domain of 3LcW4ZwgKCN4JACKMANBGOOGLE.COMLINUX-MMKVACK.ORG@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3LcW4ZwgKCN4JACKMANBGOOGLE.COMLINUX-MMKVACK.ORG@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=1740162351; 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=hk2q4ahcZVTOKS3B3OzgKX2VwvrQ5wObjbXK4TuFM6g=; b=HqsVR+36mMPDabrMJheOHA/n11CoEyCYNV9C5ewUh04Wr0cKhqwnx41kACfRPcHeh8FS/A GbRF5ccC3f1nFZNtME6MBTJskmPAxFJCeWq48MPO8EiwUpSiA08zzgTbxs1u9Nr2wVgQkg j8BZHH4Tl7szCch+ZubqHJl4kpaCg+Q= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=sv8jGcUg; spf=pass (imf17.hostedemail.com: domain of 3LcW4ZwgKCN4JACKMANBGOOGLE.COMLINUX-MMKVACK.ORG@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3LcW4ZwgKCN4JACKMANBGOOGLE.COMLINUX-MMKVACK.ORG@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162351; a=rsa-sha256; cv=none; b=MvfOFOhx4gJSwUPc5NsbDfE8f72BnMVaDJDOLTqM8k6I2c0JpYwVxQGUbyt19OowQsYzuJ ul+ZnkTJ3bGjIoWZEsT/xjAafI+AgDZYyLB6o2T8pzxbv0QVqybBx/TNm4XjGS2x30mWr5 /ORxaJ5ODxyeVFSKW6T6bR10jXBIY8s= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4398e841963so24764055e9.3 for ; Fri, 21 Feb 2025 10:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162349; x=1740767149; 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=hk2q4ahcZVTOKS3B3OzgKX2VwvrQ5wObjbXK4TuFM6g=; b=sv8jGcUgv/FFWbrm+iiDp131w6mcxX1x+4EheQyJZoM0WTm7ciMsZIE7zYDmIiUioI YuA/V6ECNdz+vc50wn/HzBbS0T/m6G7ob9j9ieA93tkCpt2EI0g9YMgmnAKgO6KDtBsA svjd5V3mnWtTyb0oGGBdc5Fz4P7XsmXX+Lg6JBGwlCUv1vpKKEmP1wzQSJ0F2oRNYjKE bv5jyoKnjHWnAMHY9GquG1zGk1SXj6fDTr6Te57l8/1x8Wgf6G5oBZIjr644MQa8ICTG pxAqoWmICUpHxT4+FWxi+8pML7mFTd+2pfmfMfqHtWUreji++jnq4NxvgKWCV398/Huj izIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162349; x=1740767149; 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=hk2q4ahcZVTOKS3B3OzgKX2VwvrQ5wObjbXK4TuFM6g=; b=hGk30kKGhAwLdGPBYnn9iboMkvXpi5hGUlJz+yirMnq2zEtve/Ifnk3aNWWIWkztdo Xi42MqKFYSVUp1gS65hoFjMNs7Yh7QbuVd6KERPBhYlvLVpMxD6ee2G83vin+NV24udX 1c4uPU2Q6WX9Z19+xsm1MPx1epSLruQYfxmXCB0b8G/nAWgZWCPe5OHn+hcQRYzSJcY3 E6l6IMzqlYMdJ+TJz6sAh9kg4qnCuCjwcdv1CqQ6smLhv3jol3wSwRKSmVKWlq2VfCzO 4nZwZ8VwTPz+juHOPfV51GrRonMFXA8azdM4GQjhPy2qZIq9YvttZiNC3o15rTHuwcS5 wddg== X-Forwarded-Encrypted: i=1; AJvYcCUhye6iYXyS0kBKp2Ny9IXC7pTAVtivPluGOF4Zv78LReHCpkN70tadc9L5MGcMf/Kyn0aOBritDg==@kvack.org X-Gm-Message-State: AOJu0YxGbAlUMQS6JOFnZULbf9aQQSohYsjNj8M0u4Axlb5F1pkF+h8T m5zZwwslour9O/A07/MDjVscBo+8IgJ1355eYgdjK854PgzkfbzB0ba7aO6SvOm0VPsyZ6sEH8g XLCHn3Fw7xA== X-Google-Smtp-Source: AGHT+IEEX+9NDAYtaEsuvzkkpt2t6wfcS1DgyAfislLJA+1+8RZByMs7UTp84Gy/Woac1f/+GF5PHTZ0HNJ1aQ== X-Received: from wmsp4.prod.google.com ([2002:a05:600c:1d84:b0:439:942c:b180]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3b09:b0:439:9e13:2dd7 with SMTP id 5b1f17b1804b1-439aeae1c7emr34111985e9.2.1740162349573; Fri, 21 Feb 2025 10:25:49 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:40 +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-1-28c4d66383c5@google.com> Subject: [PATCH v2 1/9] selftests/mm: Report errno when things fail in gup_longterm 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-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E774F40014 X-Stat-Signature: xb94syqds49y4k15rxuq771bjcrsiffh X-Rspam-User: X-HE-Tag: 1740162350-226707 X-HE-Meta: U2FsdGVkX19+yXDYSmDDMQwbbx/dsKSVuMFIOpCLKM2HgdgQMcdkDXINtJwIf2WFGLT4Z79unZZ2xcv0XUNCsnmPdE19aN5d7P8s8UvmthRb4KqZjDHG732/oApPsUPYXZ9eVoyAIpXG6sKLA512EZqXRH3YbbuvHJfudjZb65HU06pXf+il+iKgyCq+3ZeLm9agtzts0sLvVP2N0+rzo74z8s4sDDpdN0M9scWDZz87+SVkPGZrCOeupF+driq4nrX6ZCgkYSYQ6t3KkLTWhGyXF3h8b1c6I0SS9AXT/2UrsyhaBSHFIgp6KsAoQ0AZmJ1iznnaF6K5DBnMM5w/28EgZft4at3LwtLl/yyMwEwHj9bE/DJJ+00N38dCpzBIQjwpKKaUPRsnpmcRrQ6i6T3zAB/YD/kwqmiczs3i9u+lvxglQ5dpW6/eMKb2X+mNwuTp6A+eIJsq+iFdCz+76zQP48jdrLHG0P5kXJps7T67jjJGYJQVBXBCNRwSlVYqCMx0k/sWf8Yjh0/r22haFp/HrA3aNXIZ8MDLpV+tekFWoa3Q05GaK5AWtuZSnG5r/l88QCHwQuyT+nDKqfKCG9r/8CUf7fUHQAW8aEPUDt9Bx1SF3fpz/QOEQ8mrwY0O9+58tsZlSSIMqd+WEYYcPS8tCP0eePZ+0t+OM3SAF4lCCEDxwIBUAo/x2RgylkFdJxQHA3DYy8v4xCl4bH5Ni4KpQMoTdFhjLv6etiEXeVGfEJIoJKIe5MVOTxfMmbndFIrFgepe3rvSOKlFYH5i12crn8BY3hq2bXOS+eihzoz88VfiSCFqCMFW2KUYWQqHsJ6NBPIvDlTMHrBdxvObd5uRY7I9Xafw7/zbqh5nneE+JfhBSvwzZkpRqJw9EIImgcY52U6LGrYffXYj+P8S/hrox0KXRdGFIgm93n5GFlvN2iqzfd/wtJPszgwH4n+J4eNrlnFaVjl9AATCYwa Hnrix2tP QDF4uyc55OaHSbL4/pzRXlgB0R+Mr3Q2ssPFEwoaLScn4k8n94KjxViE+Eq0TtHxIpWOxhvRt9WLB3bGi7SQxaOJ4rX28Sm9oN3Fgyirho7GjDoBnO++wyZFnVKTDYNeHzl0E7GdMRoJzjxEFaAxHLvqOQFGoaQP04LVxvBEkNST3Dn3oUpD7DvScB3G84XWcca9ptPmI0XidDzQfB/98LpX26IhIjztdnw4P7fAUJzQcyenkoHF4RXJs6LQ14LN7JFYtiAvmLHz4GIfjxsfWLak3O6TnUTN6Ttno2MSIDMw1WSSdESxEYprTRbOfOb/tcg0ng5XUooXDf7s3qd/owwbjeL0rJMliJzZBGOxVrmdUqnf4KJApLiCZD6LySKdsIwqq0C6b08XHDt+dwg0aZfkAXi3ZApMbBvCscWj5QCMGoys1Sjo/l2xbpHl2NPHSwXV+8q1wefw9iqWVkuKcQJ5otutvrDJDVXtrh5059m4nlOonJe+hPYEf50432Y3upAFPDsNN2lxP/V2+GehyYGLxd0uzT0rhU3jNm88OTr0Pa/VUNfmRZP7itBuZNdB0Ed0oNbv8rcFW60+QPFMZmCyArbOLU71BmBlu X-Bogosity: Ham, tests=bogofilter, spamicity=0.004549, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 | 37 ++++++++++++++++++------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/mm/gup_longterm.c b/tools/testing/selftests/mm/gup_longterm.c index 9423ad439a6140163bdef2974615bb86406a8c14..879e9e4e8cce8127656fabe098abf7db5f6c5e23 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 (%s)\n", strerror(errno)); return; } if (fallocate(fd, 0, 0, size)) { if (size == pagesize) - ksft_test_result_fail("fallocate() failed\n"); + ksft_test_result_fail("fallocate() failed (%s)\n", strerror(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 (%s)\n", strerror(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 (%s)\n", strerror(errno)); goto munmap; } /* FALLTHROUGH */ @@ -165,18 +165,20 @@ 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 (%s)\n", + strerror(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 (%s)\n", + strerror(errno)); /* * TODO: if the kernel ever supports long-term R/W pinning on @@ -202,7 +204,8 @@ 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 (%s)\n", + strerror(errno)); break; } /* @@ -215,13 +218,15 @@ 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 (%s)\n", + strerror(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 (%s)\n", + strerror(errno)); } else { ksft_test_result(should_work, "Should have worked\n"); io_uring_unregister_buffers(&ring); @@ -249,7 +254,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 (%s)\n", strerror(errno)); return; } @@ -266,13 +271,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 (%s)\n", strerror(errno)); return; } fd = fileno(file); if (fd < 0) { - ksft_test_result_fail("fileno() failed\n"); + ksft_test_result_fail("fileno() failed (%s)\n", strerror(errno)); goto close; } @@ -290,12 +295,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 (%s)\n", strerror(errno)); return; } if (unlink(filename)) { - ksft_test_result_fail("unlink() failed\n"); + ksft_test_result_fail("unlink() failed (%s)\n", strerror(errno)); goto close; } @@ -317,7 +322,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 (%s)\n", strerror(errno)); return; } From patchwork Fri Feb 21 18:25:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986157 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 25515C021B3 for ; Fri, 21 Feb 2025 18:25:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22B5A280016; Fri, 21 Feb 2025 13:25:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B6D328000C; Fri, 21 Feb 2025 13:25:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00704280016; Fri, 21 Feb 2025 13:25:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CBB1928000C for ; Fri, 21 Feb 2025 13:25:54 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6333E121DB7 for ; Fri, 21 Feb 2025 18:25:54 +0000 (UTC) X-FDA: 83144780628.13.4ECED2C Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf02.hostedemail.com (Postfix) with ESMTP id 8A30E80011 for ; Fri, 21 Feb 2025 18:25:52 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=GyA5QJp1; spf=pass (imf02.hostedemail.com: domain of 3L8W4ZwgKCOALCEMOCPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jackmanb.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3L8W4ZwgKCOALCEMOCPDIQQING.EQONKPWZ-OOMXCEM.QTI@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=1740162352; 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=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=S1VDGUsD1BSd4qOtEKAlU96Aj3L2CM//jS6batnVOHHgi/oMR2lM7hlI0qbudCIcJ+lMSr hbZRncv2MldkhUoN1/nO0xFFVEJSjUzEPS68dlJz6NY3JKMOyXRh+HwfrFgWGsjokCAYKd x7kxdhEEtREb2KwZBYvbYK/sVVsfDoU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=GyA5QJp1; spf=pass (imf02.hostedemail.com: domain of 3L8W4ZwgKCOALCEMOCPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jackmanb.bounces.google.com designates 209.85.221.74 as permitted sender) smtp.mailfrom=3L8W4ZwgKCOALCEMOCPDIQQING.EQONKPWZ-OOMXCEM.QTI@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162352; a=rsa-sha256; cv=none; b=5Ax8IS1p5xphfJFUZQKWV4KzE+D1SIL34wXrG4k0pFfqZTE5NK0kVqX1hcY1yWmHDfnh4k IOsh7w+P90QeoBinoM5O/33IGlbgRi0E3SN2SclDKeSCKebA49Nj6HJ1yEJtiOFdJEprPo 5TJ83dOB9lGiypKQjCTjOowY4ar7rik= Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-38f62a0ec3fso2441047f8f.2 for ; Fri, 21 Feb 2025 10:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162351; x=1740767151; 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=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=GyA5QJp1G3MKTwkmnhHVhT2DKcW8K5MEZe6luoHGVSeftgNH4lGkUUw0bKuUddnYMc 3vCnSX4xkblkh2BP3G6zaUm0E6Y2i6UeV/119fmLACAHY/vy/c7GvcbOKxiQ0UMn+S/b ncL4x0+Egsp0QytMlJgHby32wceN0NhMZyAXyKEgtaY1WmYaesW1RYx6jataaM52mRoc X/TRdUtGveie8oyDYkXYcGImFOKK4gArZXqxO0tTMZRqb9zqXu6XEPhzVPm0kB/hTy0y ssQNy/i7HiSyyxuGD+HvQsS0OMXzkrGswRCi6R2YJ7bGT2iehCOMCff773LApBDw+DmL UdiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162351; x=1740767151; 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=A5XwgBM66xw3RBmYpF0O9ptszzLzLkwF22h0StlYShmWgAG7c8eH07/2GsttI4qBbO jCaVno1ptq5UER/ZsV8TkHpzQUkrNVi7/xiEVyrGeBiEbsNxWl1ZrIEIa8r7YZjcJGoe dyDI0rB9VUTsrnZ/3ymz51O87k4zfwuodrue3gIRW53o7utI9HjVLTk4wy71m1Lze7YK sWWhTFIxjn6rx2awiR1n06a2TEPi9N+HOoLPrhu9OFuhFKPE36PZw97vvB5wIR5q7TPu Nw67+JCmEt3Nrb4OfjUNjgttjzBjGLyprwEf32DbyI/bbrQhzcfXPne9t6EgBcX5rQee U5Hw== X-Forwarded-Encrypted: i=1; AJvYcCUsZWkCGwnSW84wO9QvYpm9lWBZw1xEYAGp2mJQIQL/utlkOrQOdgzCkK84YxfY/ujRBlxunRFHXA==@kvack.org X-Gm-Message-State: AOJu0YywWsZUb4Xvb3Gp7/1oH+5/1uy+KAfa4DbLb2TYROx1RD5PV6tA MD55LvkTvJ0O0kHhvZobuvifS9GFIm934+f0YyjyN9Ktsolquhk44YuWCQvqclzT/X77myG9aZh cgZsjoRZwCQ== X-Google-Smtp-Source: AGHT+IHvtIB+srUjpk6uvB7EZGmO0/DSJFR+7wDmYyQaFCKzvAqVW3z1wzUI9oGP+GeG2cFpYZzpIvgbccRs1A== X-Received: from wrbcc7.prod.google.com ([2002:a5d:5c07:0:b0:38f:476c:40ec]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:5985:0:b0:38d:d3e2:db32 with SMTP id ffacd0b85a97d-38f70783f03mr2572158f8f.7.1740162351365; Fri, 21 Feb 2025 10:25:51 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:41 +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-2-28c4d66383c5@google.com> Subject: [PATCH v2 2/9] selftests/mm: Fix assumption that sudo is present 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: rspam11 X-Rspamd-Queue-Id: 8A30E80011 X-Stat-Signature: 6t46q7donoaxc46hb4c7wb1db88z6j6j X-HE-Tag: 1740162352-389287 X-HE-Meta: U2FsdGVkX18LJZ9sbHtSfl/AyIFveFBq1bA1UJpjoGQvnFWDf+MLew8eTie7Xgz+eG85+mwAFLIgYrkDirLZxU6AI/e7TIktqAkVJSohypMPVbTOHUYreRoR0fTGOMgoDBC8GWCUi9l4T8JJEFRoa/CTU+3SR9gyEvyz4QG3//fRyFtCFKFWT4XwBZw7Dab70P4X3trykwiFatNhT4VAATG6LY+1YtSdBWFXydt0r40iPfKJJhkUbC8vkh1uHX416HVwjU/29kSWQHok6Jzd77gYcowzlmn+AVmidJRZKTxs+9IKeALxTDEQ8xzFLnuHB8duZjNwudD+kON3TykEflujXdrqjGbl1yy8VgiG7cd9ABvTpU/Gftt7BIAtn6sdiUHdHHtHRyKfBO7EuHBF66bR2LyVCjN2myF9E0/smNam8FXrlKP0nLFxZ5hawZIZvoIMv9kjTQc75h48CY3FzwiUkhicASEar3GcIHviMVdus6//QnPIPvMHmAzDlVAJnrrxY7eMTwqG2HZHzi1o/Lkw06vTQQZ2PNvjTTPfgtbvHycZ2rE6ECWLgH7F51i9o7etqfzPrLfJvXO+4iANb2y5/HxiXkBB+8/rnt8PZEu9bekAZ4VGTZkow/XWd8FXRMCLxBsW0779P9WQgGN5mA1JmhLjdq9uDiPh67M7iYWZe+zmUwJJeaUPr14MTGWTewfIu4JDbzS3X+YqfwoWFHVlD+4IrYj16HbGnzp5yoXodQVy0grO22+Ys5OS41+GFCgw+7r4Vkjm9gd4oXEe4zGW1zgjcfgB0FRBExL7lSoFMZSec6MTWPpw4VrR/HvIBsu6YcgV6m4SLHtqHbK08FRRNEYnQcdsKBiCbOMDcK2NrgzWq4+Fq2l04TkGYcuhrKp3NU33HLo+TDbEPaV+qNh7EZABV1YYdC8cka9SffCPldtzxUtqX5NvzFS6jjEgxsrbwD0nVxoZyOO+twP Ce+9k+z+ UP/qeEPz/9ICiVWW0UyKA949s2uKaJLLQoNkPiqj2KJhPKyc8BiFx4Ydfq72hNdAHLfRoE5xpqTrKSATlVWY9ZHEdbq1I+sA9stP6SWr5k9Gw4cKdr/6BeU2sx76xrZ5E13U8dn2xsbszJR3ATKS9KzZgFTR4Zpo47WpFZiM3+SP1vvtDtewB6x2+LtrRx6JapZvfroutwgt/yM1FAr0pGaFg0hvL7PShpjZQ+Gvh06Qg0fp+zRPAZrJNL16ByryC9b0dhvWb8aTojvkpL5m3tx5FcANenq8ja/ziwOREnPyA/rX9POmC6SpJ4cbDiB4M0vNsHRKi2Al0JNs46Xn2lmWISd3ZarGvcfuRhutHk/XNjP1mP/anQXFb0JmaVWO9l5gK7pevwNYAtZXPznKX5AiSU0MW9UAKi3SRLaSSOSV8D0BCrKpBTA46NXetaQBMc5G+2MI+BoaYXAw9lMDMdNh916AGq4y2CSmBtyON4GVilA3fm7tQyXUVVPn3aceuNWGG9IRY3LALTrwZhmbXez7NhAthUb2mePUSFZ80RzAgiVu72FPLQ/Jljw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.071699, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Fri Feb 21 18:25:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986158 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 8744EC021B5 for ; Fri, 21 Feb 2025 18:25:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F558280019; Fri, 21 Feb 2025 13:25:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 087AF28000C; Fri, 21 Feb 2025 13:25:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3C5B280019; Fri, 21 Feb 2025 13:25:56 -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 B775628000C for ; Fri, 21 Feb 2025 13:25:56 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B893C1B9D for ; Fri, 21 Feb 2025 18:25:56 +0000 (UTC) X-FDA: 83144780712.07.3CBD8C8 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf29.hostedemail.com (Postfix) with ESMTP id 74359120007 for ; Fri, 21 Feb 2025 18:25:54 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tVMBNaMz; spf=pass (imf29.hostedemail.com: domain of 3McW4ZwgKCOINEGOQERFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3McW4ZwgKCOINEGOQERFKSSKPI.GSQPMRYb-QQOZEGO.SVK@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=1740162354; 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=cTcycxfD9DCcL+mqAzEBCNl+Z24hIPU7/F5XNHmMRAA=; b=lvFZPm3R+Srf7/D5nWm2HCw/f66IJCGg1e6Rud1mMJt2dU1kzODS2fppjH9cVQ6F+670La o/lAkSfm9+vzxDquo5uWcGG1pG1q7KHolrMBGp4jtl4O/8pE9xngkncph8dEd3zq72kFlP gVgTke84vDhhXLdnu8pGgHowpRRaaiI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=tVMBNaMz; spf=pass (imf29.hostedemail.com: domain of 3McW4ZwgKCOINEGOQERFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3McW4ZwgKCOINEGOQERFKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162354; a=rsa-sha256; cv=none; b=r23UNtJfqhINmaLtw2ptb5oK3Yd88NUvkYN9yDYIgQRSyD65jgMtjv9UZJ/BbkLZ9sx8eH 5erpNAickFlqct2AFLBADFFTqrAhClCPcCZCcFpUVgxNbMrvw/dG11dIXzz0VtOsDVTR3l xkYQ7rMaKNFHzgAumERsmjPMK8TKlHw= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4393ed818ccso16380935e9.3 for ; Fri, 21 Feb 2025 10:25:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162353; x=1740767153; 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=cTcycxfD9DCcL+mqAzEBCNl+Z24hIPU7/F5XNHmMRAA=; b=tVMBNaMzce1Qws9ll6ZKi5ELXKShyZWMkWHa+rCY7XWYvi+H/cPJtndgf/gI370xoq FOZf/MVFuqC03AhGLGOJosEuJUDs8Ok9LTqkI6wfsMO+ZQomHvqRvDPsIxY5zAPcE8hJ 4MjzZfe5XY1HWkoe/oktVmJEt+InwQD7DJ29S+DALmD3QEJvDPbzoHTHJOoeP6udbkVH Vf1DBCmPG7S7OOiwe99tLXWWcFhdKo3gy8zXoERQ0KkD5fLzM7O38OYu5LdQXZlWVpm+ 4uB7qyNUek7oZHEtpX/A7YGiE38vMZrfOyINgS/cNlA12kSMbwXI8R3vXEEw3uLL/ai8 WO2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162353; x=1740767153; 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=cTcycxfD9DCcL+mqAzEBCNl+Z24hIPU7/F5XNHmMRAA=; b=iIiilg/3X0YDEcBEuwvR5y1NVf3tuFJvLGdolbeJnpToGXiwF9/ZeRduFDPahg+zKL 1aYiRbeIUWRVO8TUhSF8yY5afVU4IUWWhq8JihPUYrNbIERGoK9U8BG3ZpAkP7ao+bT2 hYGhJiDmdUmDRzIbrA5TwQq/aKPyTis7uQmUxHiFuycyqJJMfkWhyxD+r7/eKnA1q0S7 hUSj3ch3Lbohet4CHjyT1feNYXlDwbbrcX05BlY+p3mXr5c2pSCTseju1fyjOrjMPNn4 v/Oo1P8X2U2zKkPmSy8FXECAEDUhMa0CWXUpQ6VbGKd1CHc1TWa6zewYb047jNB2VqRV MJXA== X-Forwarded-Encrypted: i=1; AJvYcCWEKdYREqyEi1I2CmeIK2cvPvN6Agow5H2JIb+5/TX88dIdhW+mArWTHZu+Y7Eqox4Z3pu73YD/8w==@kvack.org X-Gm-Message-State: AOJu0YzxFQhuYpggbgXE8sxBmeJfxfVMIk6ixkGTCp+kFW4cD1HeGBsx UDUCyVh55m8VodNk4+ylGgCICAqXComPxWM2AnOGZF1dgliIf1o2qw13vIrXR+elfI6wDTJ6H5l baFzxbVc7dg== X-Google-Smtp-Source: AGHT+IEszNIJhkJzwGv9AsQzVYAac3pftoItIw5cS1KOScI8cPLKnS0ZHcBEzvcUimaonjHx8RHsIBeFDU35jw== X-Received: from wmsp4.prod.google.com ([2002:a05:600c:1d84:b0:439:942c:b180]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f86:b0:439:59cf:8e16 with SMTP id 5b1f17b1804b1-439ae21644cmr37029575e9.23.1740162353265; Fri, 21 Feb 2025 10:25:53 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:42 +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-3-28c4d66383c5@google.com> Subject: [PATCH v2 3/9] 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 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 74359120007 X-Stat-Signature: 38ksd7xgxt8wyy9hbjbk681ahnz6pkfw X-Rspam-User: X-HE-Tag: 1740162354-160820 X-HE-Meta: U2FsdGVkX1/1fTh+JCV3ds4H01NTLSWq7XeMIlArqjgdTzPTcKogtLusrt+xDBHz8PD5RLcnVUVFwNxpCxPns0wN1tZ4T73m/NWbxnXzB3N99NFbdmRLE5rB8JFYNkM9as+Du7EMLvhx5x2LpB/WMlm8RT/o63Fwfu+Dt81DqDGvC6/w6mDFWxL71QJUlxq2goFhCmIG9lYW60cwqYXxBpHK8JnElWlVBdb4Dv09XalR9O/dhBouvxzL6tA0U9+M9szW5YAt208dPgM+uUq2ooFHsebN8fQRKsCaKPbpzFhLkHsFhKl0eWskukcoBHCJWgzeZZ479X6lAtZGOeIbJquW5yBAlPWLLz40V3X+TlxQWJYK9TGX/GKhJiaYDrpT6h727qwB7LQdZrt7xUdT+4rao2ZumH0ilmFEk/EueOH8XtTP7YLagBbsNRgwntM2j2UUXAnxEY7GCHHo+YebwZkLe/01LJhSV187HQGLHDJSQmzG7X4wFl3tyd8/neRP3jd43bJPzxil79aooIn8kx3/lczvVBC1T2SnMmu9ff/p22HTVw0tlyMoAU7Ins8IoiEpJ7HCEs6kVVbhX8yQmodB9odwLU3+fK5NLUd4kR8QRFdnJ5Ipe1zdUO457+xxhXyO3yLYxlQpcJYXpl8ko8GnizD1oAx0STzxen53L1ni6BxPm1dMkj6Sav5vyag/RddlkGQ88opla/OFvsSTJdtFfcE9zk6WwScPz7ypfIFStEWmI/bjrPUwelp37jNxwumfp5q/SxW5L0PxlXE70rS2EmA828+zIHf4fKn6swuG1KyWR7cI8sFXdJVPjQTMpcC7BVNCSHUZbEMt2yrI3sjuE9fFSyxlgfembAp9YW4jA3exis6/23wFDU7O+fiZF1YVSHqNAZ/7I9xy3mdx+aXq+lBm0PZv0u17ehyxEyuPVYHaEWcR0chvBM+L+b/OZEolA0o9/3tLPfiHcmY yo30ksTi YtqB4W07kFRZuANf2TuCSvyk+Zg4Sh5apRYuzwo2o14pM0n9WkapclbBU2XEZSJJPky6JpDqMb5jggh7iUej1QDHxiE9rJQHBYdRYWpvOqnxxH2chPCbXCdC7xL/SWHFe9DAAdYOtRI7DWLHS5/Zg/6vcTc4Vdm98f6oX4VxeX2zGYR5AqQDnxpDRXmuvsUDzuLKlIvQn3lz2LgjLCs05YnnQS7BYxzVtOdhhJUNHJeNHTTVY7mtpCpU3pThbR9CweoUsdJ1JDqA25YnH1h7lxf8zxwDQAGGgd/tYWX3Jy/B33KMndRl0Cdxy59Z17hiIGSs0/1aEcQzlnNqo1+lHdTnQqI1P4J/yjHvjRcu2immJlpZdJc9jCX1N7NNLVoHVO0fFA20AGbSj6H0U168T3gbBbKZYvxMv95h3MI8wC+SY3vyda+U4jn7db0x9cfs3rpryyNSOvqFHr1GfCsNb71QapIWTQ4mN4JuBT7cgXwWLjAxwZay+AkX9wxGD5qXFnt3+ASQk5Gk4a4t0iYz7ynMKgcvuVX/oTgkcBDYGQi0MGJ+ynVbtQQUeeQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.270505, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 21 18:25:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986159 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 4C15BC021B3 for ; Fri, 21 Feb 2025 18:26:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 313A228001A; Fri, 21 Feb 2025 13:25:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 29E3C28000C; Fri, 21 Feb 2025 13:25:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0EEEC28001A; Fri, 21 Feb 2025 13:25:59 -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 D9A9228000C for ; Fri, 21 Feb 2025 13:25:58 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 93F98C1DCE for ; Fri, 21 Feb 2025 18:25:58 +0000 (UTC) X-FDA: 83144780796.29.91AA9E1 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf08.hostedemail.com (Postfix) with ESMTP id 8D2E7160010 for ; Fri, 21 Feb 2025 18:25:56 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=azukqte7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3M8W4ZwgKCOQPGIQSGTHMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3M8W4ZwgKCOQPGIQSGTHMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--jackmanb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162356; a=rsa-sha256; cv=none; b=lDljEUyIs1yk785dqQ9fjaQa13ZySftqTAalCTdZzTY6L1XlI53qtuANIsUHr/WWIJ1Po5 jttwTKq6O67hBJKl2zZBUd49qioYKr95+vwn0la6CSy+pkW3sra9Xf2j7N2pbyEZ9JR8cL iLEBQOy8sf8X42bziAi51ICD6RuAwfA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=azukqte7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3M8W4ZwgKCOQPGIQSGTHMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3M8W4ZwgKCOQPGIQSGTHMUUMRK.IUSROTad-SSQbGIQ.UXM@flex--jackmanb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740162356; 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=y0OlocBh0Rs8sEPgodfZSsh3pCn2jLgGhmAgomJhmE4=; b=G4oJeVMZEpwgibY7dFVubt/rX12kbxD2h4SQgoF4BwXbk8WQxSxwIcyw0xAFGrEiCQPB+p y7sUdJbHEk9Yuz9CiiPwahHoKY0MlTh3l4ZOqowyJPx3IxpfLYctWZmRd9nlNbMKIAGpqB M7Z/nJezrCqNvJGFv25KC7DW+Xcal3A= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-38f455a8fcaso1625178f8f.2 for ; Fri, 21 Feb 2025 10:25:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162355; x=1740767155; 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=y0OlocBh0Rs8sEPgodfZSsh3pCn2jLgGhmAgomJhmE4=; b=azukqte7DL/nTVu80xC2ROSh4h8tin0vikDvdJbDNkeF9QkDN5x1xr2r0g+aFfmgUb AmhkZQkEeQwHoZXGQyUPwOLduEjAvpC8mpDDWCgB200WUP/sLI97ZRHlDZ9RKB9iZjco DWXo5p/c4oquv8VSVnJ2gZLBE5WttdiA8u4fFoU9lggy1OS7hJaXpnLNMOC0i6Cut3Yd u7CApOyjV3eEaLaU9l/r+Jfgvdmqhj2JpIacS95kxuh09V0KoLSeCFoglG/ksFdlzLO5 rXsIg7+pjcijhKjW160d/hFwjgiuiKIWvCW27dKa2qB/MMa9/ed7w2uiNCcfXdBbyiyI Gu4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162355; x=1740767155; 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=vCrHmDlXv5ZOnmIQju9fU5JGluEvDeQDA5xD0jnxL3BmabRTWR5NcJQmfJoAx9X5cV Y0gNFhvtCjkwqvlhQ8rj3JZcPHUwBeDYGpPEBBCSHBmsxmAGBiwU55RwPhNofLZmRZMM NKkaAUmWrKbYfyvO2tB8WGwLhCnr+g7gFYLIU1STLxqX+ba4qYbJVwThmw6cjRvXGnVH RdJ39ogWRRA5iLfSd4jv5jJOubTV5LuPYrvw1UxjgBCvRTqsGLWASfNlJiwFT8YUeoev 5XjqysNUcT/FqGERqFWjniblrMg4tSOrlPiavoK+vrEwJxUV7xslEnWsUhtRdtEIxl/y rPAQ== X-Forwarded-Encrypted: i=1; AJvYcCVnX2dQ/UOzL94WejIp2oAKEgQBvhqYpJ1TTiqg1OnpdiKGIPlp1zLCMT/Xa3PWVVIldyc2/ntnzw==@kvack.org X-Gm-Message-State: AOJu0YyckZx+tOn2lhyBjMiUZnPL79uerZDFxevY8Ec6pjAdRY8Rmklb pxsLjABA0x4tjp3kDr0xeMvKM7veUuub4XC1Q6oSe9PkqsG2hdPpcKW1tlt7g1Dm+17hBuQaCgK uRfo+0RcloA== X-Google-Smtp-Source: AGHT+IHF00NYCWo/+nsUyTvFt7hFdbCjIyIp1GC7s9p832mqevEFRq+xbxahQieU1de9AeZKv94BIe2ilx4pmg== X-Received: from wrbed10.prod.google.com ([2002:a05:6000:20ca:b0:38f:59c8:7f1d]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2c6:b0:38f:23ed:2c7 with SMTP id ffacd0b85a97d-38f6e95af22mr4581182f8f.14.1740162355261; Fri, 21 Feb 2025 10:25:55 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:43 +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-4-28c4d66383c5@google.com> Subject: [PATCH v2 4/9] selftests/mm: Skip uffd-wp-mremap 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 X-Rspam-User: X-Rspamd-Queue-Id: 8D2E7160010 X-Rspamd-Server: rspam12 X-Stat-Signature: 88y7jampabzf1kwgoohmfietab5ugo45 X-HE-Tag: 1740162356-649760 X-HE-Meta: U2FsdGVkX19S3DH3/tL6Y2W3v+2bDyk6rn1nikQEkDkxJCwBjGXsae2BxVr2vCll2/T0/NKIQ5qwk+AOkzMNvqBqkHEgZ8ESoTVoGt6BhQk/mmwhIzncKnYiW5tlv1Leh68zJchMTTD2lAxLxYLhWcv2lM09XaCfAUhBUDoRySpWZXZUhnztdGcMaow8g5dG/XOwm46BhBElFN0VGsoT0JEMceF9JLeUAYzsq3snn39EBnsjlDghM1w3sAw4q+IeDCXyaTLuJ8WLknGEWsyBREB//LhmUELS4Osdxx35RiQ6Kmeah6uuC9MmVaRU1UUVOhITE78wczKsiVqeuKF1zPAv+QdzlYjJeoXp3J10BcG6ykhUtfLebDlwvnKwsVM2TwLRHX0swSB8RQWB127ye92gRJcjBozLPAcOin57KQd1NYWaAHjFMhzpijCrmx05jr1PEZtArNTLLt8Fc5/x6DM6NPQz0FS60B8rNERSbcny1IS+AChx3SvF2fuPe5YKojn2eDbbcumxlYByyKWW2oLB0fdp10HccRzF15SzwAvv7ULqYCZp9xCnJQBk7BgodRi4ZtmrgK0nujMKPwOxTmJ9oB9k3d+71j2whR37mgTDKxQI7O7TnHuBvnjoEi2KK7Yl+CSkpesxuo86Bu63H7gNhtqvIHXfeW36ZiGtYGqMAqFTA0391j5ketUctYA4Hh7nsNZLEn3djvC+caRAqLk3OHs4glT3F54AG6GJxGEE7Ke9QKJVueqb/hWbvXHgAlar0OCWFMyJS40JfmjbEq/RnHFVjaZFfxtaVkZw1nK8MLF2iP+AzT33Fkrxt0CT2ZUjza1uc1iHYCae7XFZBVbacux3DXHmZ02Rs4GW2fBLsnx/+Re6gCZa/y7InLGrBEfqTa0z0TApUEQqMZy3Y7pe+DfNNrBdeYek+s7KPlbFbCJZRip3jPgQocFyCKREIGIiJS5oBlRI6kIEAOJ fKU34jVl ulaOoMG1UoJ4BMfs4FNeYfGaiwQFClg6HWL0x1HJlPdoQil9tgmQTyDEcU7pVhx9thh7+b+aA2cE2viI9NAdyp01/6EZCy5k26A92gMDDBUzdNJRuyZOJxtS1k+Hk1wgubqbCbmVi5THOU+g/GrjrQ8RhC1UcHtxfwoSKKxhcL24RBFDQD7oW0V1xcLlUZWqn0utZat80dZ5jSTO/0iZCKBwyBLAPI1gKVv2xYwrmHvmknnsY7YA3OqnbBjQG8M611TsD5uko9vuZZP9/DweF+EB+Lr+pYXOVCTtyl9Gdpj9f7ojKNbCnlekwf/hBQP5bj0vu6WARPgwHtXLDyE41BbJzq41CLi6gTYeayzdT6so0Y9ZEsJMhwOD0s5lzqmt0eFNd40H/PUS8mfP+I0p0iABbsUoVA+A/zSoralytyeAN8UlrGEfulLpen423smLFWOZHgVSXNOZt1z6a77s5SBFyZE6etG6ruB3kR9TjD2cutvWeFjGE/cHZ8LBJq1B8J19b6GbLfPA/+7v/jFfxQrynU/STh8py34eYA/hmxBo+3PyaCvLkFKyg8Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.212834, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 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; From patchwork Fri Feb 21 18:25:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986161 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 D5B4EC021B6 for ; Fri, 21 Feb 2025 18:26:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C34C28001C; Fri, 21 Feb 2025 13:26:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 42E8028000C; Fri, 21 Feb 2025 13:26:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2287228001C; Fri, 21 Feb 2025 13:26:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id EBF0028000C for ; Fri, 21 Feb 2025 13:26:02 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 983641A1D57 for ; Fri, 21 Feb 2025 18:26:02 +0000 (UTC) X-FDA: 83144780964.29.57C2544 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf21.hostedemail.com (Postfix) with ESMTP id A39A61C000C for ; Fri, 21 Feb 2025 18:26:00 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="zNROOO/B"; spf=pass (imf21.hostedemail.com: domain of 3N8W4ZwgKCOgTKMUWKXLQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jackmanb.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3N8W4ZwgKCOgTKMUWKXLQYYQVO.MYWVSXeh-WWUfKMU.YbQ@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=1740162360; 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=mTW4zFHgqMTpKYtsmp9+cjJMhtMM4lVL076gYjHeNng=; b=S1y5Ixh60UwptfgyBZDUD4dNXd3NYrQ7Z2nSOttGSYPe0q96WkMWagmFYaZkqsu6o5UKi/ ssyYI4O+d/6bisbPte2fxLIFuKYCqMsIDFjknjIIZ+QdaNndlJsxxwbCEr1gK4Ohj+8GOo Zj82+zhwmCxl05ORrPHdQXxRHPOCRJ0= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="zNROOO/B"; spf=pass (imf21.hostedemail.com: domain of 3N8W4ZwgKCOgTKMUWKXLQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jackmanb.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3N8W4ZwgKCOgTKMUWKXLQYYQVO.MYWVSXeh-WWUfKMU.YbQ@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162360; a=rsa-sha256; cv=none; b=s3c+RpABnyi8CeAfWF6IxB8kMCJUZVOsGNytJvtcApWPSjy2KnH2FUFfoH1s1l5109O4rC BXoTSfCsMsdrZexysXW9Pa/BJHO/A+rjxziYNiYJEGrOygxbjdVOgFuL/rSnpsdeQ+5IKQ PpgEQAnV1F4zW4tFWH0IYVMsQhad3/w= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4393e873962so12506885e9.3 for ; Fri, 21 Feb 2025 10:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162359; x=1740767159; 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=mTW4zFHgqMTpKYtsmp9+cjJMhtMM4lVL076gYjHeNng=; b=zNROOO/BqCurYbhfQuyNQSkr08PoJg2/Qqa9gbkDxJIO44FgrAJRGyKrBXBS1rpooS /8P/98D+x9Q33xTCyogbh+gB5GYDfZXDuyMccrM+kO9aXMoYWAgY8Z3DxHDLNucLgBJ1 6+6tPplJmR23oQOSSaIL5n//vCdy2NSoXvG55J0WEWKCRRLDNXMWYziVgpka3KXGFXK3 T9iZjzrPGez3/iRsb6OL0GxyZSl9p3JtPVaI3WTSXciHXodbAn8Yzm1NhZJ35EO3oFGU QDFWrmaHAH9VIZCltFAOZKK+zcoVVJ6zxqTOie3gV6E35eNndOJr9F6n6m7ICJZ+SCdi qw5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162359; x=1740767159; 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=mTW4zFHgqMTpKYtsmp9+cjJMhtMM4lVL076gYjHeNng=; b=LPRqFPDNIoiIsc+v4Ju+lGMYzdxcSB8jBUnPOWPBZOVX0j53hkQD6Pv2nmFfU0lx6S CGykd5gJbRDFemSoNTJ8OtiNuO2y26loIOJzBBZ4tkHrbCyT/nMhCbdrC1Ncd7SSZfMf xal9SKYv6vLxWlwQmW6uduDocddwgktCUOj73fi/pBAj77f6S65pNY/N7YVcfDHnOrip ZmogfygKd/oibXGOjwYTgyZj6SjN8VfR0CHhudddqpa9T4ksbnfaVO95KToRL1Ij7UG0 Gy88G6xqXXXaQRHQcwdXNPcqM6bYjm2gkLxNi0plxoCi2Zou/zduhoQ7OtRqK8c2+tYc amlw== X-Forwarded-Encrypted: i=1; AJvYcCWU5vyS+mbAlGdcLxeCviOCsb6xPUwSBBKy+rlFLLC62fv83RMqg5QRmwzx9VkkYGfiiILa2Daagw==@kvack.org X-Gm-Message-State: AOJu0Yy1YiIp9ymzMhZ7riFtmBU8rqoq4TTrmgZb/x5fp9l/aHCl44FR TowrKVTEKdX9WomfHVxUHYwaOBp/pWopUZeXiRZJc2LI89Q9SA3iWIBSKvDcxXOQ5btll+0cA5V sW6oHQ7d6gw== X-Google-Smtp-Source: AGHT+IH+lec5x9erUgvTpG9GeO/CGpjb1ve0Ipn83JFb9w83c23OEehpnp+ZQ8agucCyadGiN7t3B4OuYtYozw== X-Received: from wmrs7.prod.google.com ([2002:a05:600c:3847:b0:439:80fc:8bc0]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:548a:b0:439:9a40:a9ff with SMTP id 5b1f17b1804b1-439ae1d7bb2mr32069955e9.1.1740162359413; Fri, 21 Feb 2025 10:25:59 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:45 +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-6-28c4d66383c5@google.com> Subject: [PATCH v2 6/9] selftests/mm: Print some details when uffd-stress gets bad params 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-Rspamd-Queue-Id: A39A61C000C X-Stat-Signature: nihqj4oi8kicchmec6rjwudbz9xt6nmd X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1740162360-189515 X-HE-Meta: U2FsdGVkX18iX9zj2h26PNFfvOCPihExJ41QAZXwkI+42T8cNzJNuLWY7TwyOfcNVL6nfTe/IA/CDZvROnJ1BpJQTa6L1NEyWKk3vO9z75FghijZZ8dLQNEpKndBeq46GcyLHz53oikJXNt3L7S6P38VilRDu72wr4L+cdbiqaz1Evx/ZyZVOp8g8xpeSDoWQ9dWkqwm34AoKKl5PTYlmJqKyTvPY5QyLgo4LNR3rpHX+DZ6gnXSQmW1sfnJhKCN8iQufmNRUSkzB85ZvzvuWYlHy3YBYYN4jC32c3ID6ZcWRzv/umqXN5OQCWrM4vQMl/I2fp5Fx/sDqwSHGgISXPPXUhPWy+8+Xl4+AXi9BjlIX8mBHPkVPu0nPIIngcZZJJVekReps+IS1rv0CqUV7cDlqG4poGtbyBg0cZEO1ryj6ybtjE7raFDU7oJDhCukLyKRJHAmNgCe9ZHpk3A3RW6vJjV8+hvVl713jDuEeqwhVxmVurLBl+cYAoXz0lIppBbBMF/sXxaj6sXT/iOKqZsyY4gTkLomvjMyICDmk/EOvmH0VE7EG/lRKe4gk9wKBx+xehiPxXX580ToIWf711bOyb7y96ufAfbjHzTXuLiguU2fyABvkDHTBuijqDmvhzWWtuJlelRVBh0krBIeX6dSN9N0i95UqeDochlbqV587LcG4tO7iw6s5aoIYluspVaGyCdNfNmS8anRX6HxU2AeuMz+/hUHaqTYzXkbYe4wBl1yKWuTt1XHMq2guKv90xPVjc7xJ34kOZJ2+zv51mgGTHhwPt8u9fDIuAn1DPyXKCQMUCO3IxDGzYFlTtngr5PoHWl2yguPtIWS4VwYxhXjy+ejuC+h12gm/Bnva8AjmH7ymmrZapeqquv3L7bOhvkhiNrQEbpi0Iqr8f9kko9J0IaLTCm+qsCcB1bSJVEgWOdpbLktiAUVbqMCTmD3t+9Bu+LmJGrR/VuviM4 a/zj3Qgy tIs9P7oSclDVzY8XlGem0VeaxT0sA2ymzFUIVjxnso+qrp1NdLd4ow9/w/LlJWc46XRiePro5eVfpWNgOBJYHZ7yzO9qhDoZKyyXI5xYM4ZvYLVidZyPvNYiMPNfcItvG4TZ+BNpQo97V/nx+/4Jze5Kg6at48jdsf6He97uegcawsHbwE8aQZhwTMkeY8T8n/PnVt9vPnPyJJbWcutJbs5RNwRmHiq2qbTjirJxtfpXIoG3JjfNmcIoftDtuio5AN7hkzWow63KrnOdsE0IoX2ZbygqTgtt4utv/YRlItmvXgMHbh/kfoHG8q3obHfoqPGYowxmgAE/njnnT0DFiC2SUZEbYimZh5sxOJXZlpQ1pmrBqIBcv09Wj+qXzD/63Dc54C145p8Hg7vTJRWQdvZOwHrriAKBtZiaP4qgllTCU9+qhjY/vC800vjy7FdhE+Ir8s0HwIynidQtdq+4P/LqjwsMP4LrhnpXlzgMeWTMkEsVuWkxpyejr604+k1ngwITd7BprduxHjMCdLFkVsr9AvDATv1fPa/t9Xrs2u2StBNYc9M3ERTnVnQ== X-Bogosity: Unsure, tests=bogofilter, spamicity=0.473534, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 ec842bbb9f18e291fa51de0ed8d1fbf9aaf14372..be0c93f24fccd618f52d54ff36d9a5540f420e46 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_threads; if (!nr_pages_per_cpu) { - _err("invalid MiB"); + _err("pages_per_cpu = 0, cannot test (%lu / %lu / %lu)", + nr_pages_per_cpu, bytes, page_size, nr_threads); usage(); } From patchwork Fri Feb 21 18:25:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986162 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 75FE6C021B3 for ; Fri, 21 Feb 2025 18:26:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B17028001D; Fri, 21 Feb 2025 13:26:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EBC328000C; Fri, 21 Feb 2025 13:26:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C8F228001D; Fri, 21 Feb 2025 13:26:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DA16428000C for ; Fri, 21 Feb 2025 13:26:04 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 99BCCB6FDF for ; Fri, 21 Feb 2025 18:26:04 +0000 (UTC) X-FDA: 83144781048.25.B5112D8 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf03.hostedemail.com (Postfix) with ESMTP id 9014A20006 for ; Fri, 21 Feb 2025 18:26:02 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LujyliJw; spf=pass (imf03.hostedemail.com: domain of 3OcW4ZwgKCOoVMOWYMZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3OcW4ZwgKCOoVMOWYMZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@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=1740162362; 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=UUbh6bo0YX556uViMnNFSN2+o8CrzMcR/+eYIWbI+KE=; b=TFaoVqjUOvywfyqp0GMq9+BwX0LRe2QFpb4fgZGpEdNIHvYQWkMUDXT1/dCUH3UWPLsff2 oNNHLyoqt6oO011EGE/6XZtwa29xP5hEfVSw1Rm+UoBkan+BAt7F4LviKZYS2+sNp9KH8I SVLBQ3cgPQf/AtrLcGHG6EhLsbA1F8k= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=LujyliJw; spf=pass (imf03.hostedemail.com: domain of 3OcW4ZwgKCOoVMOWYMZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3OcW4ZwgKCOoVMOWYMZNSaaSXQ.OaYXUZgj-YYWhMOW.adS@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162362; a=rsa-sha256; cv=none; b=qr8U3zGzs2YhReiEIQcRrg9CCtR5sIBT/8mkvHPC8GZcwb3BDMPGMqIeKHi3Eg/B9tRLRo ygT8ahUWpQ10CZ5D6STogurW7mR3C/Q/46K3yd5BqqulaRr7MSTddpoFFHrcRLuWIJstCk 0x5mNIHKrmV3CW1GPfx7f6Ubm0b8lkA= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-439858c5911so13232285e9.2 for ; Fri, 21 Feb 2025 10:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162361; x=1740767161; 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=UUbh6bo0YX556uViMnNFSN2+o8CrzMcR/+eYIWbI+KE=; b=LujyliJwYbux31Ui79hhJ+lncYkWoQGbC/jXwkSmgrQumEWp8ip1TOusXTax9cXsnH kDwzVQwddUf0An/ZufbkDnJQwCoLjIfVF8ycr40b50327VP3P1elqC7PgSa+7leqGLpn JxxJEqimncc+MIJEiyK5HMJBG+qJEdpItUFfoeXEe3Z2rD98UWQ95GyLe9rklyz06XGV Tr8lMcmFUM3D61LkWVQRsATqtHo2QJuQTErx/BsMuG1zN+8IqUZRlfUPXzqzuUGxZaaH biDiBSVhthcvfqyr+wDQWZj9aT5/LYg9skd/cUk7HcGfGrCh8M6EMl2aiN6IQ2SAIkly fvug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162361; x=1740767161; 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=UUbh6bo0YX556uViMnNFSN2+o8CrzMcR/+eYIWbI+KE=; b=ZArR3/KJIGtgS6Q27XF0lL3CXbNg63k91+R1tTmlM/dXONPqw4WHKl7HZ3J/efgPDi JyVy4Z0iv0QbtIZ7kSxniMpdP5D/ceedJ7688fUPlS830RVDtdV7n0mqqfLKfQQCf95j z90G8EVoHuXoZnHgBEU2vIm2wvThdKNg7bGcNjNb7dRt/jl0BAi36x0/I38ZzM3+Oi6T 1foZLMT1GHUs4+c1ugMKeVzIYpGOHFI+K5CyhjQnzO9xNCGQa7pc3ko0OkhQ8SXP6y4n HnOsIUvbP02YlXEiQJYJy3ylHCvCkALR2/8b5DNi6989301Mil5QI9P0F0vtnHsLs6VX i8FQ== X-Forwarded-Encrypted: i=1; AJvYcCWF4cY8qo6LpbMnTquuCMgv7K2ycGcfns9ON4EXdZyxDvjEwViUgfW87lTnQX6qx5QjvlhvQdVy6A==@kvack.org X-Gm-Message-State: AOJu0YwEmorVQZJsr2WWUWf+lOqbg7LJoqaZryiUcIaWhucn89/iynki 2PLi4j/Z7CW5X4Jo9FEBeeya6A+4Lccmh+CxKlsO8xczgKATUx4aLFVqlWTujShthafMsbMc5vZ RZxcMtrdT0Q== X-Google-Smtp-Source: AGHT+IE/bG8bUxR8y1P5xtIPuQD4Hhm3QWPdc3EgR4sjxsIVd86HrK8cKBFQtHlEYVxpNKR3bI3d8S9EnfxaWg== X-Received: from wmgg25.prod.google.com ([2002:a05:600d:19:b0:439:997a:8b94]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:584b:0:b0:38f:3b41:c952 with SMTP id ffacd0b85a97d-38f6e754b82mr3343613f8f.4.1740162361345; Fri, 21 Feb 2025 10:26:01 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:46 +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-7-28c4d66383c5@google.com> Subject: [PATCH v2 7/9] 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 X-Rspam-User: X-Stat-Signature: jmnw4fojawi9qfwhfre1sroqh9myanht X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 9014A20006 X-HE-Tag: 1740162362-460277 X-HE-Meta: U2FsdGVkX1/J4APnniLTba4LR5Pgrt0DkSxkfAGkmVuTMvomc/sNmnPsWqBYjWk014MUh4/n66BjGMWCKvtf2sikdUC06gNp2ohUr6MgEVOUvYtXG8/gtaCdwLcIj5E7WzRp+iPP34qIHvS+aAmPDkoMBjsaNNv19oYiKOrawsKMWWcwY9tXqCVCEmlg5gfn5jHc21V6idp/Qg7IkescK2h9BrDc+vsMiJB3VQpvbaMd4Yv8sI1E4oyfOTyoFaXbk+uSsPpNLtDxXHbtAXYNVyjB6yttWR568yM3WIISspM+/wqUrI2TThuKItWr8zQfwCW714wB2FpOdZ6zM98tf+0N2Gs0I+oy6qdf7fOlz+0WCkTpG5vGL5nzUM2YCiZOEKNKasxhFDQJ9lRQxzaS9tLBkU6atEfV8qhhrdH7AeJUV/i3G5e3WDdOKWRPy/Sg+P2WIHZ95PZnN6drWOyRH5wzxniJIAgfFAhD8xX9AlFR4FnL9yh7Jh8pseeoYv1542CQato6zzuqN932QTk6pJM+J/6ix3x7H9Qcd887nOLRLjftZJoPt/1/Rl6Koe1UYBP7lRL4HnTejImx4CuPTOdr+cfD0300QXxPLemIvxrcW9pfQulf7mrGDSOBM97/pASZlhz7YW5uwmALBIKPo74t7ZyrLXoQGcIskBf9pJAby1RyeCB8PBBfXdKdt1q+U0Ey7VnW3Pn3xGiGQLTGl/kkdBd/ho2T8l5ACGduQK1/xxOlRrBYB5vuylkEnMCg1f6uIz15vUZBKkJEybUb5ea2OW4fD+UKIp81lcqnLlX+pjfc3C2q+vlDLRrwTW3aGQUoYmRn7uYM6V+XL3gUo+N3eqEUtIr1KiAlzMoBlTW3vDdY2AuspgZV3LS0JyJ362iNJ2kV3VV1IVo0MiLJhNvJrA3eDzHchEIZztF8iRtl8ed9wC1U16mJ2KrynfPjFOHDpJy+Bm0xjmssaCP hJwXItsd niv5QlxLZwzGaIIStbT6bkwTU0E7bVjK3Dc7/ehuLOjRj/tplmPV9w9hStU0PwgSSDiYrkpVffjsMw55BgeySa3eQO/6uxnTXuRRhjdK7CiXnWZD1PBdhxRxHqWjkb6NHJ1guv5ZkLMGprjyDVSis1oQjKSJrxbrFBQnG2L/bmePHZJTAzMAh8cj1JLx24JGO5LD6FkHqppAc9wUDIAxUftSQd/IiClJRq2Ua488rKhmJJB7939b1ke6m82I4GT5VTMkRN/jr0jM3k1EFEZvqfn5KFvSkb3wnWMfAoom534IllNxQl9DFStjsvxGmlTYbPqAcrm/6i3sLJBLI5Woppja6voEXB82hjZ2Us1TfU3ljr97Q1vQ6meJmwnnnqaN+SiTmb9TqELhVXxzNtU6yrd3kELa5B7b6vLt9cOWs9I7AeuTMlcJGu/KxO2NByoszrYZ+Qz0+8pD/YF1qeIeblCA/7bSqJLnJtly/X/j2SSkYG4quDvkhgJPjAv0fa+TMSLtY21qKCw41bbFiM5VTIxAB2c2yWWBJC2JfkT3rk8ub1S2S7c7NgpfrZaxZecgi4ZWlq78vDjgFiuE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.115697, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 be0c93f24fccd618f52d54ff36d9a5540f420e46..cfadac801ed43e8b6dc331b343b6dc4030048f9b 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 21 18:25:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986163 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 35768C021B3 for ; Fri, 21 Feb 2025 18:26:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D4D6C28001E; Fri, 21 Feb 2025 13:26:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CD84028000C; Fri, 21 Feb 2025 13:26:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B051A28001E; Fri, 21 Feb 2025 13:26:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 892FF28000C for ; Fri, 21 Feb 2025 13:26:07 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 416041A1D22 for ; Fri, 21 Feb 2025 18:26:07 +0000 (UTC) X-FDA: 83144781174.22.0630890 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf24.hostedemail.com (Postfix) with ESMTP id 6CEAF18000D for ; Fri, 21 Feb 2025 18:26:04 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Md19y49o; spf=pass (imf24.hostedemail.com: domain of 3O8W4ZwgKCOwXOQYaObPUccUZS.QcaZWbil-aaYjOQY.cfU@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3O8W4ZwgKCOwXOQYaObPUccUZS.QcaZWbil-aaYjOQY.cfU@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=1740162364; 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=tBZNxOekeKV0LYb007rKOQkv4qSAcfWIVKd3wLeISbE=; b=vankM11QHDhHzvzQME776zY7sCqtAHUuVv1K0MT58x570y1F0FnU/auO5sRUyRh4B9wesq oZSRqs6iibDU9ebvmIGrg/MwFTPe++j1mm8Q0nAH6fksvlVOVQ2spNlijpw9v+QCiLV/DP rODuy2E1QEo9WjMNi/YOSjMuGZlslGk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Md19y49o; spf=pass (imf24.hostedemail.com: domain of 3O8W4ZwgKCOwXOQYaObPUccUZS.QcaZWbil-aaYjOQY.cfU@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3O8W4ZwgKCOwXOQYaObPUccUZS.QcaZWbil-aaYjOQY.cfU@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162364; a=rsa-sha256; cv=none; b=FHb5xqTwcUurnACCy/6HFmy+QxbjDUkHIZ+5ZlPa7glnnCyT3oE8Kz6q04KVZM5vPzoG0q dWLnmr3sIWnxm44L6Q3J5ch4T0p9Q+qL5+Am4ZtTb9dnLxR8KJO+oWtSuPK3Ky+gk8YOo4 sRZdz+FBjkhQJBoWu7Kk9D1hz/ePauU= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4399a5afc72so12232945e9.3 for ; Fri, 21 Feb 2025 10:26:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162363; x=1740767163; 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=tBZNxOekeKV0LYb007rKOQkv4qSAcfWIVKd3wLeISbE=; b=Md19y49oBnEfrjH//f91BtQNRRBT8NKDBtrg8W57F+TDI6jWRgVq4tO/TxZSKOUpMG AMkPPQlwtmnKVEUW8r4RONG/fC/aixnUrlCbvNhq7uvlWdGk4GP5pqqCnstKK3/jzUvi WdfCTfnmlyWEWoM2hAQvLGzjGQM7DopVTKpsJhq/5EBDhLmq4caeC31RgRj6C2YtyrkN 8rVQrcn/kgAsceAjgS/ewbDca5y3R6qhE/mcKQTteQAOet8P8z6mc5pRfhgha9PfYgTk 7xaos/iIeMWaH3zSBX6Yrs4LzuDktzaukPhgl94SCwy/L4YaqRr3maGcTgJBac3FC8tS EjRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162363; x=1740767163; 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=tBZNxOekeKV0LYb007rKOQkv4qSAcfWIVKd3wLeISbE=; b=juMMp/yPdPnn57pnXwWctnjZpFLOu6vNAqiuezO//LTCFz/6P/p/TE3F+nNwe2i4/5 Cau2iLWnCw8+caS0TJSFBpqeoCMId2eahs2jzRsgwlFQFcZ3BJvmGhf4IAl+U3LmuZEs 2Y2a6VAY/2E5nPV4ru0M109IBQsF8QnGP6ePzuzuvxNpZSHjyVI4Z+90Wg19tebYu7+V CkH6zU1irywHmLBHNe2NyYvf0Z2zdcpWGEvHqQcDZErFC/r9nBfJ+ve3Y7H+pBkhjZO5 nQgxX6nSL84IEbfNNxERmfe0BN5fnONF83VxxNeVWDLtr8R0RXilzTrDUed0bJ7gkGf6 BcPg== X-Forwarded-Encrypted: i=1; AJvYcCVJlEbQYTzfpJE9m0DUXhRk/mL1n9sR9z/OWTOmrRTDLJHg+pGcApX33AQQqPKzs4dZNTJYm3Q1Lg==@kvack.org X-Gm-Message-State: AOJu0YzCOzf06XUQR/ad+TX/K8q7Ax6SIewbFbGFeJt7POP2HPSO8r69 aR5Oaj0oDY6EMGDzdQ2XM8z0wMbHMYDXyj8ak1sOIMCyd7BNDOXXlLm20VXMe09pFwH6LcaSBGI uYyXfDgwoZQ== X-Google-Smtp-Source: AGHT+IExPP5BlXnuhegFwP5+f6OWmFBTfcOqXQgMBOZhO/TZNpjmVHE5y8AbHxBbpzzmIk1bu6Aq9tp7s4OWUQ== X-Received: from wmbay5.prod.google.com ([2002:a05:600c:1e05:b0:439:9541:1cf5]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4e06:b0:439:9274:81d0 with SMTP id 5b1f17b1804b1-439af0d5031mr28996635e9.1.1740162363271; Fri, 21 Feb 2025 10:26:03 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:47 +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-8-28c4d66383c5@google.com> Subject: [PATCH v2 8/9] selftests/mm: Skip map_populate 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 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6CEAF18000D X-Stat-Signature: hdo5has78uq19w7456u9za6p7zgp8nyx X-Rspam-User: X-HE-Tag: 1740162364-116538 X-HE-Meta: U2FsdGVkX1+8fNYmZjMAKFcgoBWEqZKTEH3KMPGy/+YrMyhxTAlXJ5C2pJ8+bCTZPaRHf+Nw9rFbsb7ncWoIJDN4Dy7SQefsCnuy6uShhIRbBLc1ePupl7Uif/ZATDRGJuvTF7ynmCsIZ6Lymzb/EiMKrYxZGr4XSu6wkFq/FvtNcPba29saWSV6jizXRdL5NjESvuBfEB1Vt966hfCIPXOdI5w10ppFSCARvEZmp4UxwS8djtQmXu63BLA0ycdzCWg5sVumP0wJjMOHB1T50bL/lsTxGeKsR8ErSKA3Wzoqtq78JBcThtacrbxePumrRA3AITw5cX3MGsKmSZgBA/o7SFH9y8drZJS++DXmIVaLcY4g9UuMHrgBOgx24GArCDFtVLL51C9SFyMQ5TxygY6ujLlR3J4TipuhMMUgGeLo15fobiy2tO9hlX+IAmrF33fLvDt8C3O3vnHJc3NIg4Yfp4VUXsATgvrwpB5GyfTx/mmp4rC9JFs6mitmxVMQvd3s8SiTYik7gukZ0zGpPwvCYiPK0fzcVDVRf0i1/MsiF+xNZLQGgZh3mP6y8dBpPINRueB6Y5MzioZ91/UB3Q5Nmmf55bcqCgMh7uPyWwj/zoxQ1Vl0DeMMO6XsP914fwS2YqGMr/SMax/DhCWWUMAm8zg65W9lo8H4qROY/IN2/V5PhU+FdXPDeoukUFuMqMDUVy/Qxb43AqE+cDw6aGPH/GpKEeky+lK5Okf/4GmZOvPVevhdRbJmS5Fwca9RsY5M19snfCLFeMFmhLWWcte7V+eLS0dFLEt3V9kGT+mXpzmzAUehZHj+QF4kcJrRa5oT12nucwswwIGSNwfjtYtOV+sCgReNdT/LcuCaQach0h/qbeWxTfeWB4Sud7+va1mlX8egM4kyxlHknzMFo4D55TZ+5oTbL5JsmOxUL1O89elF0QashgqU5AMX8QS8efQrDj8saxhwliIRfCZ CWUSBQvs Mpkl1DkgZ+7AzfESnu6Oxg+XlemnxZW9FFdi4AVJrPwq/54G2moCJFDTo5+GTIA6yxTvA0lIX4pQgYP0VP1SE7XzJoC6XfnecZHEPf+R6yaFE6oQuNXK1yfGkeiMS5n0Oicz2bYOT/0WxqQw1FGiN4AtQFY/vitahp47b0W+uosQfEDV+CMxvX9jJCIKUs4EaUXNbZH3jeDyaeJ/3JJWXDiyp359+td9YkXoSnHFExgI6M5J8TboDksZK4/Kvf3niWTfw/U3TpsMkUImFSOdOvVrgGqIHBGaFFb0jOMklKMCQqRlFhUmOxCzQzFc0ffS2fd3xm4ljwQDwy+Q+5z+RHF8VG5RML8T3sEMnHqGHu9GVZLhtePycAxfbX9FoizQrAasqBLGnC7YY2hw2wqerTg93RdwrkDkdK2W8Zw00VieIDTiO20mqqpUXfmnoqx4o8gjVphOd9cmJ8qZr2txd2FVZLmfANwJEvsxJk5dNCdE4zHPcsoIVptc60Aowzmdwk1qajY8Mz3wwy+M7TW0hZL/wEe7OAeuG8zjSrbgU5EF3WiCMnzbQrLYsoIgwYTrstgnLZ8/yiH93CL8ph2hZonl/z/qL9U/C7KclI6b4r6IoOuY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.300557, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: It seems that 9pfs does not allow truncating unlinked files, Mark Brown has noted that NFS may also behave this way. It doesn't seem quite right to call this a "bug" but it's probably a special enough case that it makes sense for the test to just SKIP if it happens. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/map_populate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/testing/selftests/mm/map_populate.c b/tools/testing/selftests/mm/map_populate.c index 5c8a53869b1bd287b09a250edf628a66c25c2439..cdd88531dd9fe98f2d25edf4878659767c919e8e 100644 --- a/tools/testing/selftests/mm/map_populate.c +++ b/tools/testing/selftests/mm/map_populate.c @@ -87,6 +87,13 @@ int main(int argc, char **argv) BUG_ON(!ftmp, "tmpfile()"); ret = ftruncate(fileno(ftmp), MMAP_SZ); + if (ret < 0 && errno == ENOENT) { + /* + * This probably means tmpfile() made a file on a filesystem + * that doesn't handle temporary files the way we want. + */ + ksft_exit_skip("ftruncate(fileno(tmpfile())) gave ENOENT, weird filesystem?"); + } BUG_ON(ret, "ftruncate()"); smap = mmap(0, MMAP_SZ, PROT_READ | PROT_WRITE, From patchwork Fri Feb 21 18:25:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13986164 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 9E360C021B3 for ; Fri, 21 Feb 2025 18:26:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5EA9280020; Fri, 21 Feb 2025 13:26:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DEAD528000C; Fri, 21 Feb 2025 13:26:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BCA3E280020; Fri, 21 Feb 2025 13:26:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 96E1C28000C for ; Fri, 21 Feb 2025 13:26:08 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 53B97C1DDD for ; Fri, 21 Feb 2025 18:26:08 +0000 (UTC) X-FDA: 83144781216.29.7CAB485 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.73]) by imf14.hostedemail.com (Postfix) with ESMTP id 7834210000B for ; Fri, 21 Feb 2025 18:26:06 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ws56lHYJ; spf=pass (imf14.hostedemail.com: domain of 3PcW4ZwgKCO4ZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3PcW4ZwgKCO4ZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@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=1740162366; 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=2e7w9nwzCjzPZWGspc8NxDnIM4geLXbTYJr2yLaA18Q=; b=LbCLEMRXuY+LYDTrCc3FA5Pd9E4wme0uSGK2Znb1217Sal3z4ko9Jt1EhKFeT5WqztNVE+ cHqCxAjTSNiN2ubkzKfIEQ1HaXdW5S8a9oN5iX+oAk07gEDC8gYia4ivSaP5WSDobD2+NM sAqtZxivt8850y/+3RVmGafTz1KEy6M= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=Ws56lHYJ; spf=pass (imf14.hostedemail.com: domain of 3PcW4ZwgKCO4ZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com designates 209.85.221.73 as permitted sender) smtp.mailfrom=3PcW4ZwgKCO4ZQSacQdRWeeWbU.SecbYdkn-ccalQSa.ehW@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740162366; a=rsa-sha256; cv=none; b=J5hFQFEZgY73q4JXyM7+aK0w7JWcD2R3qZAn+aMKtYOzqAw07gpb37Z5+F2T+v0WwlqsKc vck2JkjgDg1hV4Tbx0Af/8du7YgUG9GtnrICDpJgWhmVGNyQFBC/fpjtJ/PNe2Nhe+SEd9 QDKRIpylBVP81pRQUbMlhVd34rwsvFg= Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-38f37b4a72fso1778355f8f.1 for ; Fri, 21 Feb 2025 10:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740162365; x=1740767165; 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=2e7w9nwzCjzPZWGspc8NxDnIM4geLXbTYJr2yLaA18Q=; b=Ws56lHYJpgdaQFumxwdsinHenn6bY3IFyz5RwwC2gOzp1IPoYkyZGF4a+3j8wAy4zm rDMAi/BmBx/iaUC4EbUHJ47TQeSVpb9/v7NEhhvoxn4SKJg3dUeEWolHRWS5NolcllJX o7l8pWxVmsvN5vY/kqdVRqiqTCfbkzZPoIS2T9wvqEyRNCFqXNEzM71PFt4HoFIUA+6P lOV6QiwHseLj8YIY4XGr7c+zeTYAHBM3lY/FodctBMkGTfE2zhvFMLUHpHjvpXpxs521 f0EpWgqqjOv/wxBSPi5dxzaZA5umFYKlnjbGT/QvaXIIGI8GN5/s74g85A82qR+v++7N eOpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740162365; x=1740767165; 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=2e7w9nwzCjzPZWGspc8NxDnIM4geLXbTYJr2yLaA18Q=; b=kJqVacckpepvarEPvENJ890GHiONeAXPULxIeyamxeKtC+TuApag5N1F2WtzFHMR4D 8w/m0zjgIplEE0spAO7kNm6Oz/gkm5LqkCuHE8wEC5DUMtLwMOAH6dRa7w9A8sOfNe82 yJjMpeBcbSfdDNY7qQSVDzVJJ7s7ItQtfyDxi6Zyhkwm1kmhBAwFKJlBTAYYmYSQzGpk 49f8sIimlIu4tlsWYNfOonUGgyc46QNhEKmbTOJ/0cizZWGPFr2M1qm3x1rblGgZRu/9 B67PZyHicKxPksg7KA3bMxBalfT/yVpqFed3UVD3Egyi9xodksZoPhEqGPzVSC4/+Xnw uRTQ== X-Forwarded-Encrypted: i=1; AJvYcCX8mWvcJyjX7gtrYGhmYdU7YQ63mr/DLlS7obW2IDumI08mxfWRqD2ewpDivmUA6rdrPLffeicFjg==@kvack.org X-Gm-Message-State: AOJu0YzUldI3cZTRDSoIdjlxVOMf5IZCCE/Mp1g9ZKTTLpiCFNilqy/N WFaWFswrmJ4F739wy09fMma57h+CdsIOF3F+c8fvjww/MGROcYXGbHDXiCMtNz7HSuQ+4HpDTVM HStUa0TN4kA== X-Google-Smtp-Source: AGHT+IHKAN4X1WE6vOVXmZ8oqu4LMSySVfvQR6MA9h9oN5ISJfTl+vRicPSeLj0ewNqzdhKSvvV9TtuuixKmEw== X-Received: from wmbay18.prod.google.com ([2002:a05:600c:1e12:b0:439:7e67:ca7b]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:6486:0:b0:38d:dffc:c14f with SMTP id ffacd0b85a97d-38f6149915fmr7561482f8f.1.1740162365263; Fri, 21 Feb 2025 10:26:05 -0800 (PST) Date: Fri, 21 Feb 2025 18:25:48 +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-9-28c4d66383c5@google.com> Subject: [PATCH v2 9/9] 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 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 7834210000B X-Stat-Signature: jyz1tyxbc1kjz14b6qoyqcbhjmb5dbnq X-HE-Tag: 1740162366-400220 X-HE-Meta: U2FsdGVkX1+z9xj+JpeLs/YtNX2zLM3DuY+bKkuVcNo1bxU99p0zz85nguambUF93bjZp/HHErhxA592tdrTBudoAsEmDK0w9YgRSrhnunEyB18MB+brPCdtNd1lCeQiqNjfR8TSOANf3VpXU8Btjl26eqttywjIbOPBHWokfsUKwtamxmF4O/mCU8OAYITYhAE5rRbVC/27aSh1VnFPOwO3FilqfMRUyH/psChvXoyXXEcMXwikdHcTu/gzQXSJJ3W4v5tnbwYH+qlWJ9RXA83pXq9HLyLyttWv6QikXla9JjA0EkpoXiF73eCmdTscqWkRSg85MZlc4FTIIwtvYL8F2TAkRdQXQqt6b19DzPudDqQSz55pbhglID0UFhEqHXcckhnwl4GyRrAy3n7R8r25WhUJG8v/jxn2TvVXFar7VCQvPOGHva5bJELuAIH4LXP/ookU8Q24eyreNbG1Vnd3nf6sxK6LVqHn39k06sXZnS+PeQxWSbC7H2Nm7whwTMLkF4z3vXRqQ4LzdTngIxSEQBFsGZd7kUwUDJOON3FoKmaCshitw+QJlTwUcEqHHDm04Y6b9CVj10pwHc8I4IKT14TGPUD0j4QCnJcI1+0bzpq3iLKTerlKOP1XyH1KjyY+Oh4FEHg7HIl9i689S9BCXaam5uXu0lyXzH3HKYtOVtR1yJCEYd4yPsKzxHpdpusRJcp+sDaZWcOcJaHFrlEV3+3szmjIOxKN0oQd7I9+6QwoD9vov8YAcWqrpqz+xaNivN+BBhTNxOIbD0BdQllz1FQiHhjor0SaUf5MazU9CBMHzRt+tpJ/hDiEz+X2vTEgdoiNHUT8Vf/uLrmssP59tKgXk1BLfLBTRUx/Ju6dtuVxuelCYB4Qmaf21/fO94HixB4tSn50oxBrktb8OCzU9nIfv5rn82ClMjzBpVljM8bEj6q+erSMCzCFHceG/enhUX9cETR0n7xRF9H 1dJHRzgk DDapnniJwcWjx8XeQaEdKicCFhXaujm1cYo+s+1mJwMQ4aGPI7mGtwjLIu6bJw86oMdLYb+LclXzDAFBMJaDbvqNigb7Zx6fwQDBLXepwgIg2u0Yuv4lrvuY7P9zKELsY43awj+8QmnzaFNoMnGLg9hdrtT0yJPqOiiWnWG2AS5PXKUDWabURx9TKMRNyW22euxA+yEL7davZMT1DqztLAu9TelgGZvmbU62wZ75GQL5X043n7rWFHQOM2tntZxul4STzLHfPruJ28Dvf9tNRhPg7sRB76JFmVIYMdnguIGvvHgjy2/6ldCmorB2cdP8qlpP2N1oNV3ovom8y3qCYETtAosyVhRlsJZsozSKPDwcPLtKgaAXmsndqio01491NkwC8fCDeIJVUy3e1v21vZfIAgUmx6r5bjNdOgJmuT/5YQDN+BBJHyrDvii62l5igFIqLiEKPszjsvA/+KYyZoaBKXoXrl0ZM+QkD8Bc3c3V9CzHb1E2kOTPCoXgoNXSMyyEnS7Urt43zWyiLJVnDPnTFGDSGR2Gi6Mf8pWqOl1VZpDYsKuulx9hmpJBQPSex6QQcuTBl/qpxLqcvIw31fHrHCQlh/Sk0kAuv X-Bogosity: Ham, tests=bogofilter, spamicity=0.404822, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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..d2c33dd9da9cd43cc6666e5d9ffd3ff9e62dbb27 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"); + } else { + ksft_test_result_fail("ftruncate() failed (%s)\n", strerror(errno)); + } return; }