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 8932EC7EE2A for ; Tue, 24 Jun 2025 08:07:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C9DD6B00A7; Tue, 24 Jun 2025 04:07:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 17A746B00AA; Tue, 24 Jun 2025 04:07:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 069AD6B00AC; Tue, 24 Jun 2025 04:07:37 -0400 (EDT) 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 D93276B00A7 for ; Tue, 24 Jun 2025 04:07:36 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 89F9D1A1186 for ; Tue, 24 Jun 2025 08:07:36 +0000 (UTC) X-FDA: 83589564912.23.2B218E7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 2B29C180004 for ; Tue, 24 Jun 2025 08:07:33 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Rmtmp0WD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750752454; a=rsa-sha256; cv=none; b=ZzEl6eoOp9KMsrKK/BVv6ltfkuHNEqX2evN6QuhfHYWt278L2UYcg2axr4Y2jFiHB3uXSN m0uCVKSclKmrk9acxCKqzFv200pAc8wffdtVlhRgZ612Q1GFeJJrB1FRJ6S+26mlf5ic63 895lDpQDXPyMQSAyd23pfwQ9o1qxfh0= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Rmtmp0WD; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750752454; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=GM43lz0QpDgErZ/vodO3xCp9zFB0TdFSlvRYH8M5tN0=; b=hQcySUo8LY3OJR3O9PETplMp+EU9sI824aSaa8vC2MwS3Xc74IEMDF65gzs7EKKRIR2NFF KUow3r7WnNKhS7OrHR9ErHwrEzqidSzeb9Bq9lLqwHpHBPpKqhRuDpoISFZi9XJhahgsuo L7wYmksbqEzLDd+UwFUR0kDKzqxppc8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750752453; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=GM43lz0QpDgErZ/vodO3xCp9zFB0TdFSlvRYH8M5tN0=; b=Rmtmp0WD3ARuQgbEQRk/82nRX7NiGdACXvfyW7V9Cs26WSU0PLnxxMNk8W7TYGheG+s1xs tPuta1+t+nhvVJIlzCN+sHR5ZAV61BE5F2Y82x+hslGhVwtQgZTUecMe6AmnWsLEr9NQUZ OHXYTFHNrRH71pS3TUHgY3s682m1T9I= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-119-LW-Tno1yPSOYuxqLf__JOw-1; Tue, 24 Jun 2025 04:07:32 -0400 X-MC-Unique: LW-Tno1yPSOYuxqLf__JOw-1 X-Mimecast-MFC-AGG-ID: LW-Tno1yPSOYuxqLf__JOw_1750752451 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a578958000so1822980f8f.3 for ; Tue, 24 Jun 2025 01:07:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750752451; x=1751357251; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=GM43lz0QpDgErZ/vodO3xCp9zFB0TdFSlvRYH8M5tN0=; b=Wt+kAySon2tc+rPepOAsxCX+ci0qjNhWpMPiSml80Ic2EM7hR0kSEnx4XqU94ErGDZ Ix69CDkbsPExrpAketQzQnlmGTlWiTP4L/U/To6WY9IWClHay2IUgYnmPQXhMplzG6/G lM69k0cQjsyN/5qYh4OC1TLiboRWPReBxhoDIE+2lGWLbo/UYX2MKeFou/OHYPumuMD1 BqFEEusIpwiH69zWAGb7UEmj0F9E1zQBbzk7WcKKmxI2znzytvmFLp7dbJmv/vDGeXJO hOcIv3EyFpkMMgbY7oB9nFCEJtn+kOmrlt6mAnE8Jt1W3IB+oMZGExUnevWQZ1AR38Ri wSCA== X-Forwarded-Encrypted: i=1; AJvYcCUmJzL/G664T3JEWpP91aoXhErQvIglEQBcZixwmHWQGrG6BzKc1sVMU0hVPB7ZTRgzZ1LZDvUpWQ==@kvack.org X-Gm-Message-State: AOJu0YwmOiw3diZ3XvMp7ktN0e9F4jI78fnUyUFm6WQh1fhZee57k+wf XPTNeFQvnvl1BIrA+AXrDS250h3O2WCWW8kpJdQ//bF3d8Ov3UZC8lzwdGDbNyK4mXhp8M+vN4Z lTC6OsX5Zhn62FD1QBp6UYsIaEqi9wvOSrAZTsUyDLIxIUndnk/hs X-Gm-Gg: ASbGnctpauoiuD7+iDWndooWYI7/vEr2UizpOQ/BNNtUl7x9BJxpoes3tc76Osv4jOf xhElymqocx1f4orCv3cTorKlqjxGf+K3QeRLwatO4C11AqFxI4IQ+IUbqUEkqEGpfDDdrHKC2C2 p9mGBXHEL1A54nYUC0sFCd+7BxcbYk1JetDbY7AA2H4al1IO2TAQx0bza+NMV76aUz9cCO+lKwz KmwicBngiR5pJ+Ezct9wvQo/FJW+wLdyZe2Xq5wDwrfGdrX2D2yvZIVmTcfSyawYN+3dpHisVli 3HtBPhlOiEqcL0VgOW8T3r6PqYuECwvKEMOU X-Received: by 2002:a05:6000:20c1:b0:3a6:d93e:5282 with SMTP id ffacd0b85a97d-3a6d93e56fdmr6158552f8f.59.1750752450838; Tue, 24 Jun 2025 01:07:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5D9U8DXo9QlBSJgRT7e5NhRpK+cBv0LT+I7AaevAPYPmS1KrfSBpaAuJgjXp8k1Kqwnjs6w== X-Received: by 2002:a05:6000:20c1:b0:3a6:d93e:5282 with SMTP id ffacd0b85a97d-3a6d93e56fdmr6158516f8f.59.1750752450393; Tue, 24 Jun 2025 01:07:30 -0700 (PDT) Received: from ?IPV6:2a09:80c0:84::108? (mischulz23.caps.cit.tum.de. [2a09:80c0:84::108]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6e8113b00sm1283411f8f.96.2025.06.24.01.07.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 Jun 2025 01:07:29 -0700 (PDT) Message-ID: Date: Tue, 24 Jun 2025 10:07:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] selftests/mm: Fix UFFDIO_API usage with proper two-step feature negotiation To: Li Wang , akpm@linux-foundation.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Aruna Ramakrishna , Bagas Sanjaya , Catalin Marinas , Dave Hansen , Joey Gouly , Johannes Weiner , Keith Lucas , Ryan Roberts , Shuah Khan References: <20250622081035.378164-1-liwang@redhat.com> <20250624042411.395285-1-liwang@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250624042411.395285-1-liwang@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: B6tTJZ3J6aoxTRBRWCEBqcgdE5hiHcLAcXOdiXgLKGA_1750752451 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 2B29C180004 X-Rspamd-Server: rspam10 X-Stat-Signature: b68xz4z99w47gg4skhgmiygn5qhbzehr X-HE-Tag: 1750752453-190511 X-HE-Meta: U2FsdGVkX1+FRCCpXwW+vmvpwVU78518r0ezdc66HDRCQsJZvH+v5K+qH+eIvhuOxEmziBEd17kdw4gg3aiTdTAT4qYAxSCRC0/G0RpkwhwYl7150+hY0c1al6l8dX67nB24+dVqJ/z0uvoF6G5Zi0ti0DNYH0CdoHNLV2Qx5BWr1Yqxqm6UaJ2whYNHFNRsac3WSqB3pYS7ymA35zqOzdHizBRvvSFB0GNYlKkNa0JsnV7q2GcT8Bm++MXOtPjJKdWt9VST1jWxt86dHgFWJh3wH2NtP4uEV9hJXTDcmIvmuSR4BUUIPLQRm33kSzsePXvzEWu1hkmNokoljWblYrd742bSKD1kMuGxtVCQoFWHhIR/lEWou5xNkCY9Fx4OnebZ10SNm+ci60BrjjKErh4KlDGuc73eLfXoGHiw+sPVUSUfkJ++TqDFfBYBt/7qT0R/cQkTHYDIAF4c/dhuzKYZPxi2bvWwulgBPQDYVJYWfAYQ3jKZ20/qcexkSAJlsWB4yRRi/9f42Aa1oqGBD4WZEBrbi4BqHyhvy+okobF0PJo+JumYIbK03KTy45PCgwEo+3Cg2AYaCXQDO3WWdVbyaHNUCDEH+Zskn2ZyfyKZtCGl8yec+AFwYVhbsjqHMHEQbdQ2w9VI1tRymcve5HiAIO1cShKjhxPjMgQsE7zJKqxL8zTKdjFtErRWamv91zEUZhayFymwTuXbsk3a93xDIuv5ZuHER8aS1sE+86Gci6Lau8cSPoT1DIxdT3PQACpKLwJnbLeg7KZ9sofvuc5Z9HeG//0i0bCuk1Q3zSJz/Upxvi8pH5Z/rvpq0QvaYZXPABcfQo4pJua3pDgLlVc6Xv6VWtaK5fWAcFwdZu9BlRwNuH9iIr4MIsQLdZh5il9sjiZAOAgDcMtybO77BYgyaYO6FYOsYaVZKxPHp2/LjGNtvWIqNwOPZmwQh5qPbvKNIVrhPRpUTzZqX6F s3o4ucEX K7OHYyon3lWvoXVI36CTdP1YGkQnQ+D4JusEfNZyeqPH/3bw8cyen+qmN2uakK9YMYFklSfphuYUM0oDcv6TV3PH58/QkR8TNUlNSOarjN+S9vIdPfAjJVS3NeqMUfeA25DH8dnvVb9IjeFmlhiPGEia5xP3Sji89OpQSDD6XEBGoU3L1hjPJCKe/LoCo9i4n6H9J0iH3YyDKKwkx/QbvIuFVjXwjiYXoDxxpM3/2DNKnjMlCXQxjTVehpbU2W+A07Ar9ultC+g3oBh81T80wZJAKLeez58HYbQNJz5tPooXfjwEdyDYL6AS7DPk12Qv9XcDm25DHzSRLyiXy57okzP2ckgg6KvebGK2ox4h6zb5CyqbClAKiHdy19GvL/w12Y9GHFeeO1SPl4+GifmtpJi3VcrZV8110iGxHfAHdDH5HjF5LzVGU0axf7GnmdJCVtLY05+Fwf/6Cq+KLAS0xhSz6ZM9MOIzz0NaIDsTmdODovNh2DJlybK36F/6zRfbHIdgROhYstlRe+QvUAQMk+uqcmqv7qP3S1+jbIJydZefyKP/pYHAsG/PwPXvXB6vTSrAFBNOMl253Ds2Bin5Tm4bRs8nsYERFzo+xEcJGW0Gqvg229lTKlSEk1E1+UPLKKg3r2a7JqLFRocfoYq01lrIPIzNvwbFwo/lkom/LRBNgwB4hEKREf3tVzSnmSfBnWb5IXgZXC3ot5Zw= 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: On 24.06.25 06:24, Li Wang wrote: > The current implementation of test_unmerge_uffd_wp() explicitly sets > `uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP` before calling > UFFDIO_API. This can cause the ioctl() call to fail with EINVAL on kernels > that do not support UFFD-WP, leading the test to fail unnecessarily: > > # ------------------------------ > # running ./ksm_functional_tests > # ------------------------------ > # TAP version 13 > # 1..9 > # # [RUN] test_unmerge > # ok 1 Pages were unmerged > # # [RUN] test_unmerge_zero_pages > # ok 2 KSM zero pages were unmerged > # # [RUN] test_unmerge_discarded > # ok 3 Pages were unmerged > # # [RUN] test_unmerge_uffd_wp > # not ok 4 UFFDIO_API failed <----- > # # [RUN] test_prot_none > # ok 5 Pages were unmerged > # # [RUN] test_prctl > # ok 6 Setting/clearing PR_SET_MEMORY_MERGE works > # # [RUN] test_prctl_fork > # # No pages got merged > # # [RUN] test_prctl_fork_exec > # ok 7 PR_SET_MEMORY_MERGE value is inherited > # # [RUN] test_prctl_unmerge > # ok 8 Pages were unmerged > # Bail out! 1 out of 8 tests failed > # # Planned tests != run tests (9 != 8) > # # Totals: pass:7 fail:1 xfail:0 xpass:0 skip:0 error:0 > # [FAIL] > > This patch improves compatibility and robustness of the UFFD-WP test > (test_unmerge_uffd_wp) by correctly implementing the UFFDIO_API > two-step handshake as recommended by the userfaultfd(2) man page. > > Key changes: > > 1. Use features=0 in the initial UFFDIO_API call to query supported > feature bits, rather than immediately requesting WP support. > > 2. Skip the test gracefully if: > - UFFDIO_API fails with EINVAL (e.g. unsupported API version), or > - UFFD_FEATURE_PAGEFAULT_FLAG_WP is not advertised by the kernel. > > 3. Close the initial userfaultfd and create a new one before enabling > the required feature, since UFFDIO_API can only be called once per fd. > > 4. Improve diagnostics by distinguishing between expected and unexpected > failures, using strerror() to report errors. > > This ensures the test behaves correctly across a wider range of kernel > versions and configurations, while preserving the intended behavior on > kernels that support UFFD-WP. > > Suggestted-by: David Hildenbrand > Signed-off-by: Li Wang > Cc: Aruna Ramakrishna > Cc: Bagas Sanjaya > Cc: Catalin Marinas > Cc: Dave Hansen > Cc: Joey Gouly > Cc: Johannes Weiner > Cc: Keith Lucas > Cc: Ryan Roberts > Cc: Shuah Khan > --- > > Notes: > v1 --> v2: > * Close the original userfaultfd and open a new one before enabling features > * Reworked UFFDIO_API negotiation to follow the official two-step handshake > > .../selftests/mm/ksm_functional_tests.c | 28 +++++++++++++++++-- > 1 file changed, 26 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c > index b61803e36d1c..19e5b741893a 100644 > --- a/tools/testing/selftests/mm/ksm_functional_tests.c > +++ b/tools/testing/selftests/mm/ksm_functional_tests.c > @@ -393,9 +393,13 @@ static void test_unmerge_uffd_wp(void) > > /* See if UFFD-WP is around. */ > uffdio_api.api = UFFD_API; > - uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP; > + uffdio_api.features = 0; > if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) { > - ksft_test_result_fail("UFFDIO_API failed\n"); > + if (errno == EINVAL) > + ksft_test_result_skip("The API version requested is not supported\n"); > + else > + ksft_test_result_fail("UFFDIO_API failed: %s\n", strerror(errno)); > + Not sure if that is really required. If UFFDIO_API failed after __NR_userfaultfd worked something unexpected is happening. > goto close_uffd; > } > if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) { > @@ -403,6 +407,26 @@ static void test_unmerge_uffd_wp(void) > goto close_uffd; > } > > + /* > + * UFFDIO_API must only be called once to enable features. > + * So we close the old userfaultfd and create a new one to > + * actually enable UFFD_FEATURE_PAGEFAULT_FLAG_WP. > + */ > + close(uffd); Is that actually required? The man page explicitly documents: " EINVAL A previous UFFDIO_API call already enabled one or more features for this userfaultfd. Calling UFF‐ DIO_API twice, the first time with no features set, is explicitly allowed as per the two-step feature detection handshake. " So if that doesn't work, something might be broken. -- Cheers, David / dhildenb