From patchwork Wed Jun 26 13:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Audra Mitchell X-Patchwork-Id: 13712886 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 A5D38C27C4F for ; Wed, 26 Jun 2024 13:05:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AD246B0088; Wed, 26 Jun 2024 09:05:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 234D46B0089; Wed, 26 Jun 2024 09:05:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D5E86B008A; Wed, 26 Jun 2024 09:05:36 -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 E1E696B0088 for ; Wed, 26 Jun 2024 09:05:35 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A620D1C1D6E for ; Wed, 26 Jun 2024 13:05:33 +0000 (UTC) X-FDA: 82273061346.11.D455EB0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf21.hostedemail.com (Postfix) with ESMTP id B499D1C001D for ; Wed, 26 Jun 2024 13:05:31 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VBzKKOT4; spf=pass (imf21.hostedemail.com: domain of audra@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=audra@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719407123; a=rsa-sha256; cv=none; b=c1R9meRWJnHzmH6p6FPigErrYpEF0SO9QS50Dt1gWrH3D8BJtk3dtvrPc5swMWFga2cLOl ZR4aWUU3TN1r1ybEvRfekW7Ji6vDMJ5p7o3tN/R4sBxqzAhuikjl5ZGlqc6FvBfTPdQ7dA d2mkDXfHZ36TXyhbSvahUsWtP3PYkIE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VBzKKOT4; spf=pass (imf21.hostedemail.com: domain of audra@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=audra@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719407123; 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=udTceohd6Xr0o0t6E07fDA2ozt9gdMnkrdCtTzzon0Y=; b=6xQhpQhPCH63eK3MdpBzR0q0iIrAN5Uw7/CIvsIgZ6qtKneBt9/sj6FIWNFS5AsXOV0MIH vJoto4ZY0MVyY3MXD6kn+UaYr+ah6cxZZW/q6/GxSb/XVvSplMf3e49XqD3TMtxeb/Nt5g EaW9FXLPzOkTc7v23efNa4xJ8NEjtwE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719407131; 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=VBzKKOT4tfFHqWTc0B/LexHWT5jvPhdiYITFldlXIO5MzajaWhS2HozSPnlo24hz8iWO7g 74ike2upjO324Q95gMIitXNapDNCAM/hFunevdEsitEuAUIs0TCSGBu+O6KJAVWmG1K77h EPgtb7voi1ABva07aOPhu9Ig2EdWhU8= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-539-JMed5K9SNQyAZYFHgEAV9Q-1; Wed, 26 Jun 2024 09:05:25 -0400 X-MC-Unique: JMed5K9SNQyAZYFHgEAV9Q-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 61C3819560AB; Wed, 26 Jun 2024 13:05:23 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.34.168]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2CF111956050; Wed, 26 Jun 2024 13:05:21 +0000 (UTC) From: Audra Mitchell To: viro@zeniv.linux.org.uk Cc: brauner@kernel.org, jack@suse.cz, aarcange@redhat.com, akpm@linux-foundation.org, rppt@linux.vnet.ibm.com, shli@fb.com, peterx@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, shuah@kernel.org, linux-kselftest@vger.kernel.org, raquini@redhat.com, linux-mm@kvack.org Subject: [PATCH v3 2/3] Update uffd-stress to handle EINVAL for unset config features Date: Wed, 26 Jun 2024 09:05:12 -0400 Message-ID: <20240626130513.120193-2-audra@redhat.com> In-Reply-To: <20240626130513.120193-1-audra@redhat.com> References: <20240626130513.120193-1-audra@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Stat-Signature: d89zpzzsdpi1rqaryfjq6fdmocc8qq1i X-Rspamd-Queue-Id: B499D1C001D X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1719407131-581765 X-HE-Meta: U2FsdGVkX1/mhftvO7SFRmGlTh+uFxT9eKXLeZf0O8p3TZYr0vW6qdFs/CaTv7YLsJwQLqInKTyrJ4JIRky4GU/aKN6ypt4Tg70smu1rC/nAXAKeXH0vd1Ig2PlmwAbfYWjaYs4SF8zTjcHCOCR55koB+5Bzc32qePbwalFP4EMVLfCY8lrkF/WJHjgNCUr9LrC36VpMkLifAS6LyXTu+5xFqIrdeuSjnZ8Mc0lHydEPVHtP27e4R/7Vkcxq0igge1ZLRiVQtyaRWObjaDAqMQGFkAt4j2PL2iPVqgPSC0eHYkMhjlB3r9+HvwrupHo8K7wgcX2QMso9n8aslSrJuDNMqopfm6WAqq5oOhbd/tlu0+HlkqWe5ELiUGJSlsEy1RNukz0/dyv7T9buYfof9a9MJIwgk/89KNcnNrSwzAm1FujM0kXuU89jn9sFw0oiCfc1X2t2U2H/I6gBoAAHJDsNwI7+5NLLK/kXXuXNwGBo0eFgUJstUpXzlmFiSMxMtDzXhCgvzCfrzy8OnGa6Yq1GMpC+x0KgBgHStnk83YdMgNo0UueUCfXQXdIPsLQ8cMd0S7WFxGmwrTodcRr+iQYori83ps8S+One02/EbCGMOXLSz7j3SOVJlM2vHIdQSvGMap+KfqOkQYSXpuXRdwcVOOlfVAvCH6XSWIvcbzE/zaOnGf4unNghfGwPAmawHgchVc6tcVf+QXgFGIQanX2Fo8IsgDWH15+7iFR1KrdinVDrLBd1y/A0IxYfxRW2aF30s78WE+mOD11Z6R3yrP7ts/I9TfgYvQidRDBdMzABJ7wDmk+TQIinjdwhjEsomCJZSkbRVxF3P1m2z3ohnitbQbLEhAV8lsqvjhmaCmZv+OHlMxQI30/Mc8Cx2PP5JMgOdQa2Ad7Xzt7G548l9epepeITZp+8dWr2naHKmNhCnnOrfZ7ggL3Qj62nqk7D/TfT+VGKasq5U0kJC3j I/AXxand 5JKQB2/Tb6oQisk7E1V/SSdy15iYAU3zoRgu1IeqRqc1C7e7kSWYkHj2ZugfmNpj90fKsKbUMWqLwWD451BHydEnimKuzm0Kz3BG6BHLkOrah1E/JmeYRCrEFCrutzzESPqEJSulPf25ix2trzAYkvggFynGL4Q6skuilmqWm20NBIOqn7/IUpxQlrOT2vWgCExrFlECvWPAmUF4EYgPNsUEAnyEedQgpyOnDsJj8wDvY/uTDOEsDO/UYmG1VK7zxxbH1f0Y8GS8lgF8EW7Yh8rtkF51Oc88EzLRMgAcK+2//Qfc= 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);