From mboxrd@z Thu Jan 1 00:00:00 1970 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 DDAF1C369DC for ; Thu, 1 May 2025 16:40:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CEAEA6B0096; Thu, 1 May 2025 12:40:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C700C6B0098; Thu, 1 May 2025 12:40:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B11476B0099; Thu, 1 May 2025 12:40:33 -0400 (EDT) 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 918146B0096 for ; Thu, 1 May 2025 12:40:33 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B6DC2BD271 for ; Thu, 1 May 2025 16:40:33 +0000 (UTC) X-FDA: 83394902346.12.C2A6957 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf27.hostedemail.com (Postfix) with ESMTP id DADAE4000B for ; Thu, 1 May 2025 16:40:31 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="iZO/9CRK"; spf=pass (imf27.hostedemail.com: domain of ujwal.kundur@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ujwal.kundur@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746117631; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vgPGTCQFUFW1kU3FlNW3yK7JtTBlo5vps0nfxBSj1K4=; b=gt2DXcbyMf8E6NuaqMwhb2nwOxBcxFj1fTI63bJw3pdnv1Xj0AH4OHZrRHhffXDnyaXXaB XvLv112OL4L2FrfA9JTq4TuwEZfLJWf7k5NLaK/EpKYQ4kpuOH1/OCRjCWex+0sWRVuJ+A ThVTr22I/nlEbq4eRUNemoEW1nFqcNU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="iZO/9CRK"; spf=pass (imf27.hostedemail.com: domain of ujwal.kundur@gmail.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=ujwal.kundur@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746117631; a=rsa-sha256; cv=none; b=SeO/Gqs+D6xKkSOF/4BYAeayMejuNgazWt1Z6jys5mcMgJgAB8p9L0XJRD60QNoNeZ1nub EkdxifKc4viv4Yh1opPPro2aOSAGjzGQyc0b4i1VL4wmZ4Hq9zWHXg5AzZdkRtkPjDAMAn 879KXHkPmSiJLp5NVGbyLcWboQR98X8= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22c33e5013aso13723575ad.0 for ; Thu, 01 May 2025 09:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746117631; x=1746722431; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vgPGTCQFUFW1kU3FlNW3yK7JtTBlo5vps0nfxBSj1K4=; b=iZO/9CRKevDH5t5b5u/nIhliYqgXAkcC90sEP1wLCElNcykduTETbHywscHsXG8FcS TmoGYNknh86vNQ1k0IXlSE/4aj3/MyMEocLV0QxhnylV+aCu055MPpfjsECtYY77UbaZ 05UuWPExwHAjEY8tV4pvWQpBfl8Rp7Lif1b9cZzzsm3ziTV779pAkBx9da9Y8pLqEuwe 0/b26gPX3pjXHFTkZZfFk5ucb/bMCcijKzedkn9QwwjY8hVoCXSZ/xCoZCBGqcIIhH4H AjmnY1eBf+ENnzdK+KYqeuwGW/faqm3pSjO9AhhAig2QlpmdyKt0oo8KxIb5w9CemwxV TQPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746117631; x=1746722431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vgPGTCQFUFW1kU3FlNW3yK7JtTBlo5vps0nfxBSj1K4=; b=h7ceAPCH1LfVZ+TSVIZuPOtCdA1uM7eBZshODSFLQ6QerqWxtp/zxkx2d3g/hTmwhi 6aUOIBLUnQloT0EFmGU9kWUHeA1SpjhV1iw+rxm8kbCRjhta3vQJmqfagWaNZ8cCOy+n K8LjFUhEErzI3y4To49iSVYM5r506T3LOauTId/ujri+G+YsqV3+4TktyhsL4oHbdo7Z 2qmRX30rnC3HqR2NCIDvGdNQ+h2GQSA8ZH/ozGjQPrOKx4vl8E72KnAkiJ2tV2bQwj3l pg7RVYAAggjuHCI6smpgSj3+Esy3HYuhc7Po7c2tZSc4oSi9NIC1LaJdaPElX4MrAguy /4qQ== X-Gm-Message-State: AOJu0YzcEL4k3hi4IZXQvhLdjjQIVQahHqyH8/f0hinL+UeU0NadOXe3 3lRVqs2jzG8D/A3iUSFgyI6QZzdqyFVOjpHN6emmK9TVkKEk+KVebVzFpGVFGw== X-Gm-Gg: ASbGncvYm0NQhg28677WuTnV1dzrPq4gxea2j90E47zU7DvzGGQTDEiJf59ZR/sXHR3 /1Kl6JzoiXnbEOX/tH5J3Bm8oHqGDG3yHBUJvlYjUSKAuQ+JvANAYNH0id3aoip7nk+6ArfhMva OMFdWx1uboUDM/TfmnTEkQoIMUuCCD67g1f6QJFkrWlqZxwbFxChvWdJz1Ot8SVi3lU/4dFHRut Kw/9QYCSt95+Grcg6X7o+2Pu8XDUq250t8mWmB8/5kcqFwr0lS6fBrLREefgXLVcFS6eXmxDlHs 0v/KdI/fXVAlctG/FLsC2/lG7SxcxuU5XsacU9FCwRYhws/3EAx3DONF6GvR X-Google-Smtp-Source: AGHT+IGfA4+30n/veK7qPrC5roeakakzXs1CCl29OolxjuG2a7TLj+Et6zwpS35yrIvta2uRaadkVQ== X-Received: by 2002:a17:903:11d0:b0:223:53fb:e1dd with SMTP id d9443c01a7336-22e040b014cmr48138075ad.9.1746117630722; Thu, 01 May 2025 09:40:30 -0700 (PDT) Received: from debian.ujwal.com ([223.185.132.49]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e0bc6e678sm8797525ad.132.2025.05.01.09.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 May 2025 09:40:30 -0700 (PDT) From: Ujwal Kundur To: akpm@linux-foundation.org, peterx@redhat.com, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Ujwal Kundur Subject: [PATCH 4/4] selftests/mm/uffd: Swap global variables with global test opts Date: Thu, 1 May 2025 22:08:27 +0530 Message-Id: <20250501163827.2598-5-ujwal.kundur@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20250501163827.2598-1-ujwal.kundur@gmail.com> References: <20250501163827.2598-1-ujwal.kundur@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 49ky3pqgmen6iqxepgiryh8pa96csxu4 X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: DADAE4000B X-Rspam-User: X-HE-Tag: 1746117631-804713 X-HE-Meta: U2FsdGVkX18Y5wJuIMvMMTYDGpwO01ebs9LZ92v4qBNk2D2u8l9PWx6UBfUs9845nyxU6pU86uXSnwaoRp9cKsffHq53ZWdY9wRhu+Z/8kLBr8Dkf7cNFBwiSRElz7ae/9Uy2G3b8KE+9q0ucKBO9mxx9Br5cnT5+f7ZVHtofWyrYUjl2S3gyQPHj4pRjYLUGao8jmRI/eF2oVQ+M3BpjBgIK5EAKfQOuy7ZnXwQhirPRWaV/aP7V5U+phqAYXb382nPPCq3Ljxo345OcpcTsQ93feMqpSj4Terzmvgr4gnEmMXFWyFNtLLOgq/AKDQ2dNwHoC+Ftc1FziXhitTjUyBimDR8Cog1yhGgvTtYxHEgI4dkRGiL1MJ2/w6KRRDywjoSd19mU4IXNiFQLeZ+N5XgHgZEoGK2xKsqyBCC7h8/mZ5uwYHdFq5CfyOC3ba4oSg/MIeo7/fRiL8mNKRgorWDVC9VAx+dOYnd4zIXWLksvuZX9m+2qawFlFavST2WV0z/Bl1aMBNukSaIVXyBcvQlttAxnDk8nUJJr/pN/MMupQ0NMvbIbcU3Uv9lMTGNAAzOWP/wIZ6mcs6Ag0LYFT5j4VJwwKV5C7CrHc+1+tIz8NpUksWdRxruY66C/vDSaIlnJbU/Uo8FACdAg+Bvo2tJYDDorAH01ZUmw0QPBKBQK3xAlqDo+ONCnFF8CvRzMWDnXbgv8WJ0Adu0xb+H/1de0xoXzOoWg+6QiINWIS19U3wZFdTZykwI1ej2EBgiK0s7Y4vYLlJ30FX0/wwfHPQcMvDh24MUfvU0tjIrQHGv+dlN7HBxq3IiOGfpBrK4yOozvfTCHo5lo0R9eM2XVtz1EDYLsuawiGDDDAYU1rU66sd8Vvt/w192yXCxTKACX+kYhJnDi6+3Hh61bTEQtzyt94TLSiOieVE/hVmb5IUOc0fYuUO9c06HcZf6HH65+xJyeSBAgnP4TYmbIz2 Xjrln496 w0MkWSZwZVQBD7VN8S9SwYsqHZajpLtwkLirinLHwne5zBBFDJvFeLoq1sPQ853i/Hfec2VEVnwEu8A+PfyeP52mCl0bgTYTHzU96IpKTo2yjBV4gQcw6gKhR/02/WOUSbpYcRUJhXMtOENawhLAyCIGWRj7zMmNmKRzdbMZFthXZ8cdydLUUkvBIpFok9/IeTPTJgYIzL8YXHLtYUZIW3e7DuvlZbd9V4Ddwp6N92e91eoEsWkDh6LzODEMfiCYKpN1vy/mhmUOhLL5hkMFm7hJcYZehVsjZowlAjhLPTgEtDU+hmiavAHq+Ezkr6IcPgPn//XoQEwl+5gJ/R9nz5ntC91YjLlCjhA2eHlJZwhj7T6sw7OQAyRQkMrYM+ZvlEIIR785yisfroETt3EUPmXpGGnAuYlx6NjfI02eo6MteFjUJEeyTkz4saGUMykcA1XRf5p7cONdvZLJcJavgwRi6Wh2d6nO9fhPm X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We use the refactored uffd_global_test_opts instead of global variables for uffd-wp-mremap tests. Signed-off-by: Ujwal Kundur --- tools/testing/selftests/mm/uffd-wp-mremap.c | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-wp-mremap.c b/tools/testing/selftests/mm/uffd-wp-mremap.c index c2ba7d46c7b4..a24f35728ac3 100644 --- a/tools/testing/selftests/mm/uffd-wp-mremap.c +++ b/tools/testing/selftests/mm/uffd-wp-mremap.c @@ -157,7 +157,11 @@ static bool range_is_swapped(void *addr, size_t size) return true; } -static void test_one_folio(size_t size, bool private, bool swapout, bool hugetlb) +static void test_one_folio(uffd_global_test_opts_t *gopts, + size_t size, + bool private, + bool swapout, + bool hugetlb) { struct uffdio_writeprotect wp_prms; uint64_t features = 0; @@ -181,21 +185,21 @@ static void test_one_folio(size_t size, bool private, bool swapout, bool hugetlb } /* Register range for uffd-wp. */ - if (userfaultfd_open(&features)) { + if (userfaultfd_open(gopts, &features)) { 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)) { + if (uffd_register(gopts->uffd, mem, size, false, true, false)) { ksft_test_result_fail("uffd_register() failed\n"); goto out; } wp_prms.mode = UFFDIO_WRITEPROTECT_MODE_WP; wp_prms.range.start = (uintptr_t)mem; wp_prms.range.len = size; - if (ioctl(uffd, UFFDIO_WRITEPROTECT, &wp_prms)) { + if (ioctl(gopts->uffd, UFFDIO_WRITEPROTECT, &wp_prms)) { ksft_test_result_fail("ioctl(UFFDIO_WRITEPROTECT) failed\n"); goto out; } @@ -242,9 +246,9 @@ static void test_one_folio(size_t size, bool private, bool swapout, bool hugetlb out: if (mem) munmap(mem, size); - if (uffd >= 0) { - close(uffd); - uffd = -1; + if (gopts->uffd >= 0) { + close(gopts->uffd); + gopts->uffd = -1; } } @@ -336,6 +340,7 @@ static const struct testcase testcases[] = { int main(int argc, char **argv) { + uffd_global_test_opts_t gopts; struct thp_settings settings; int i, j, plan = 0; @@ -367,8 +372,8 @@ int main(int argc, char **argv) const struct testcase *tc = &testcases[i]; for (j = 0; j < *tc->nr_sizes; j++) - test_one_folio(tc->sizes[j], tc->private, tc->swapout, - tc->hugetlb); + test_one_folio(&gopts, tc->sizes[j], tc->private, + tc->swapout, tc->hugetlb); } /* If THP is supported, restore original THP settings. */ -- 2.20.1