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 79557C19F4F for ; Tue, 7 May 2024 20:01:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D016B6B007B; Tue, 7 May 2024 16:01:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB1886B0083; Tue, 7 May 2024 16:01:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA06C6B0088; Tue, 7 May 2024 16:01:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 9AD3D6B007B for ; Tue, 7 May 2024 16:01:04 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 3D6E6A0D2D for ; Tue, 7 May 2024 20:01:04 +0000 (UTC) X-FDA: 82092668448.14.FEB7072 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 9BDEE1800C6 for ; Tue, 7 May 2024 20:00:49 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UPxdjYpp; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Ydoq+Y0K; spf=pass (imf06.hostedemail.com: domain of audra@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=audra@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715111884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=udTceohd6Xr0o0t6E07fDA2ozt9gdMnkrdCtTzzon0Y=; b=UPxdjYppxb8KqMDyHBPnjTvGxrNcUS4cDvPDr4M6BRhBqOlCNP0Gob6vkDiQlw9RbxbCWr N4CqIGjvnMOAj98uk7OqQjKZSqlH0MGpOo/qISeQ5f7fF+PREiuIkXZMpyW1rnv1yhlUGk xiZFWVW7bOzYIzXdo550HqeGWJy1yPE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715111977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=udTceohd6Xr0o0t6E07fDA2ozt9gdMnkrdCtTzzon0Y=; b=Ydoq+Y0KJq7Sjxze4VuZN1Dzwwx4FQVN0SPDvmoZ/StsiJYKTYwMjQ4EZnKrnNeepV9GaZ CIO0NpQaSQUi5Xu6ErxymQKQnkbXnM9hjEVDFHAoDYBQwPr5Zt9m+3ZtD8wYzfhWqHjdz7 q7NrI6BywmS0fzGgw80ZTCo879AxQmM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-1kGYvzdaMBCNdauAjag6xQ-1; Tue, 07 May 2024 15:55:17 -0400 X-MC-Unique: 1kGYvzdaMBCNdauAjag6xQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 524043803523; Tue, 7 May 2024 19:55:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.18.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16DA220B96E0; Tue, 7 May 2024 19:55:17 +0000 (UTC) From: Audra Mitchell To: viro@zeniv.linux.org.uk Cc: brauner@kernel.org, jack@suse.cz, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, raquini@redhat.com Subject: [PATCH 2/2] Update uffd-stress to handle EINVAL for unset config features Date: Tue, 7 May 2024 15:55:10 -0400 Message-ID: <20240507195510.283744-2-audra@redhat.com> In-Reply-To: <20240507195510.283744-1-audra@redhat.com> References: <20240507195510.283744-1-audra@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Rspamd-Queue-Id: 9BDEE1800C6 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 3u3hn91br1jrcnyaez4osnxaz7qr3gg9 X-HE-Tag: 1715112049-6811 X-HE-Meta: U2FsdGVkX1/115ABZyew8ut2k4lk7uNfxoFYJvTJxoNrtNwhD8cPttvE5f9VTCWHPvPbvW2Cple0tSxTHa3IFy9B09haDCDMzkdFJOhO2Uvl190mx9K0WFCnHCDv2doHx9nNos0o0SzacZJUgBUAoQti1cl40UBVB2nfEmqBPKu5OS/eWc4JbOnphXjqE4Diu6hgye7gqjfaU7jOuPXC/NUUj9s63i3KntlVABwA1onr3luuIllJCko54aPnBgh11hy6fQiD9HZDfJdKJMz2/NNjeLUnc2/XvhrDyHCkBvSh7EItC/WQnRf25aehLe9gdklBhQXbFKc3LzlR55zW27d3VLds3h/2mLprdB0qhxwUCQwNjKb9EYNP9+DT4kxHPWOf8ZSij4a/pCtCQHiauaUXwN9bGsWnoQS6v39F56/s2eLMcosy1b0rDRWWMJuo56TUnwMCRCBDhZGEkUJPItyRQ2Xoc6HuJupjw8GVMcajnEa8fFXokRgx0BDu3fOfFDappPnr1QwonIkixO1wG4Rysb8tIs5M8o5/0wzs+hg+TqfjmZMHkOmN+94cbqFP/8SH+O4u/GeI88Q76yBcbc1d8yP/8RPMPYvy7kqcWoAiz4kak+nkS45J2dSu/u3J1CTgRkRLwVzi+ahdWeetOTpa4bVrT0lxtO32B+jwzN2HcC1xwDk0w/QNJbvdAxvtwNE0lbAFN42AlB7Q5zn3uu919ugXDcvdhfn0ViflUSvXXdeLm2Mke+7oOhvtGAYE2Zxp+co3GGwQ8cWlPz/UIb84eGq/pMUyPI3BSFOZxpCJIVR+I4V1bZbzyZaZHL7NsFZcDgEBnyqx8OPojmM8v17ZalXe2dRcxHCZgKNgEyCSMAyH4/81q0KLdUQuxWpit5SzpvVYZInGELrAqPzehhaCd/zeVBbeRrU6d2wEGqNXx+rOd48Nqg9R7iSfVCDWTS8iCf318IgcPwkvhMS mqzTkm7q rp32RWay10Fz/ReaPytmi2Py1Z8zdyu1ZjlSr3Vea1AFUznFjE+MWmHqn57nlyTa1dMUzfMMnnBWF+YqWPP5taRO+B/y6WB5+nrNr3zKwqfQD3yiMshyQ+Sh1OWHbQaJGWnqUzQ1aZnXiJAZ8xL3LhaEiUSnxlOzHl16UoFDVNXlDPaaYMX+M1r2SaY4grfue9ZQohTcLrdx+V6YH246SkgjfHo2Sr4tfwX33/x23xkulJrNImjSwEjO+FWoYlPI/JoQpVyVq4GGe+6Ou8e71/D1QhUiwq75v97gb5hPxZWTdTGylOLpvMsCjXcEe5KNCv8QsEDiOAXHTxpXBFsjoUpb6jwre/VRCXGE6lFX1dUAY8xxDX1z++MSVqmHUrddd9Vf02pxXUhT4Qq3o57K+uKz589+KqgHmzYWVTCfepHh1dWruqRLo1E3OhqxpWaSS118b1nKew6D6Uwr5I6diO+pzcP2tT/DZTFUWqmiHsrlbCvtGYu0IwFE2vdZvKIXTrIDMuFoo5ltOLk/Pkq5cGdRpKKgGrtbEze2z0rGPUMWkUZnjizDX+WrN4FAcruo7fAdoN0N7OXSbQbU= 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: Now that we have updated userfaultfd_api to correctly return EIVAL when a feature is requested but not available, let's fix the uffd-stress test to only set the UFFD_FEATURE_WP_UNPOPULATED feature when the config is set. In addition, still run the test if the CONFIG_PTE_MARKER_UFFD_WP is not set, just dont use the corresponding UFFD_FEATURE_WP_UNPOPULATED feature. Signed-off-by: Audra Mitchell --- tools/testing/selftests/mm/uffd-stress.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c index f78bab0f3d45..b9b6d858eab8 100644 --- a/tools/testing/selftests/mm/uffd-stress.c +++ b/tools/testing/selftests/mm/uffd-stress.c @@ -38,6 +38,8 @@ #ifdef __NR_userfaultfd +uint64_t features; + #define BOUNCE_RANDOM (1<<0) #define BOUNCE_RACINGFAULTS (1<<1) #define BOUNCE_VERIFY (1<<2) @@ -247,10 +249,14 @@ static int userfaultfd_stress(void) unsigned long nr; struct uffd_args args[nr_cpus]; uint64_t mem_size = nr_pages * page_size; + int flags = 0; memset(args, 0, sizeof(struct uffd_args) * nr_cpus); - if (uffd_test_ctx_init(UFFD_FEATURE_WP_UNPOPULATED, NULL)) + if (features & UFFD_FEATURE_WP_UNPOPULATED && test_type == TEST_ANON) + flags = UFFD_FEATURE_WP_UNPOPULATED; + + if (uffd_test_ctx_init(flags, NULL)) err("context init failed"); if (posix_memalign(&area, page_size, page_size)) @@ -385,8 +391,6 @@ static void set_test_type(const char *type) static void parse_test_type_arg(const char *raw_type) { - uint64_t features = UFFD_API_FEATURES; - set_test_type(raw_type); if (!test_type) @@ -409,8 +413,8 @@ static void parse_test_type_arg(const char *raw_type) * feature. */ - if (userfaultfd_open(&features)) - err("Userfaultfd open failed"); + if (uffd_get_features(&features)) + err("failed to get available features"); test_uffdio_wp = test_uffdio_wp && (features & UFFD_FEATURE_PAGEFAULT_FLAG_WP); -- 2.44.0