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 0ED3BC77B6E for ; Wed, 12 Apr 2023 16:42:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9B8CA280006; Wed, 12 Apr 2023 12:42:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 968A2280001; Wed, 12 Apr 2023 12:42:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8094D280006; Wed, 12 Apr 2023 12:42:46 -0400 (EDT) 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 713D6280001 for ; Wed, 12 Apr 2023 12:42:46 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 527CFC0159 for ; Wed, 12 Apr 2023 16:42:46 +0000 (UTC) X-FDA: 80673307932.13.261A154 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 259331A0021 for ; Wed, 12 Apr 2023 16:42:43 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YL0AxIK7; spf=pass (imf19.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@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=1681317764; 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=1TTsACSLiRja1XbqXldcznrpQfU/7XLsecI/fn7kMpU=; b=uRGyzeQKX1+Gj3goOMmHZ/O4ZY8bdt5nbBFiLCST6EzpEHlq/Q1sKgxWZAvaga4Xbn/SZT b9VEek2CTepgVt+8D0dmkNCfboK8uv3Z//DHdCrrTF95ViXb73CTzMOZhrqFSBekVuc1NG VZk0MsXZbUQNyjuOa3xVnAtPyDlDrAc= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YL0AxIK7; spf=pass (imf19.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681317764; a=rsa-sha256; cv=none; b=Q4sy6PgLdXDs8OXBtg6RbCrIt5e+FzjIwmhSONqdf3STOxajtP4zR/39F3PR6wdMi4aRDn su6ej1T3Gb3HSrjqZMXrSBT1Ci4eMtDpLX7d3d7QM4jKUQvdqLSs0xnahG2hnZ16ZBE2nq nSwzzWydb7bm158HYOLOotzfdSQxCrw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681317763; 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; bh=1TTsACSLiRja1XbqXldcznrpQfU/7XLsecI/fn7kMpU=; b=YL0AxIK7cBppSQ2s0I73bkAnUabf3cAzXss8/lbKNyhWq9AYs15QKbKR5ryIhwbCzXmEov jq5fea688DahipUX2T9GyQzBUKeiekpK0nvpLPMYSH9YIgM+5dbADjc+GeL8J5CuUcSYff V0XEZKj21JqkcTopdfYm7JzYu9dhk+c= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-193-wRBJIVOPP_2_LIfn0UB4-A-1; Wed, 12 Apr 2023 12:42:42 -0400 X-MC-Unique: wRBJIVOPP_2_LIfn0UB4-A-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-74a25fcda05so77598885a.1 for ; Wed, 12 Apr 2023 09:42:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681317762; x=1683909762; 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=1TTsACSLiRja1XbqXldcznrpQfU/7XLsecI/fn7kMpU=; b=ErrvlNkoDJdfHq6S7vOoq6whFSu3jOhqaVIstf/GR27TPyQEUu7bD6fWirfRn7WtKM 6yM7ZS4D0x4V81rMdFxVAhXL2IR1SA+zXrdAyqz3vRLSdR/GNcEhjOftPwDpKbjUqTXH wvSctg+qGDKgMpgoCPYBKipjxo9PM6d1wEi9jgv2lamipcggKZ0IkELo8/OnJtmNZNMr vJFw3nnaIo153gqilxK2eg72PSTIYszfzlozq/BwdFNvERgcOTZtTWi61Wut5PvKg+Nc j5Ut8yTDnfzUIcZHWMB/ek1cZhhJ/iCU2jXHPOLx93KuG78iyHzOJsjvZeCJJe+DFSED NN7w== X-Gm-Message-State: AAQBX9eWWQ9Y1wRfHnh1CUvXOMmQCnfWfhgJQ8L8gv+MymhuZlCxKnrQ Sb+Xb6dj1w8tdG8z4LAhYQbGZHJ/OgNSexU2B7VAr6dNSz0j7p5lg3xPBMccwKfgwdA65TaebJP GOPox4NXA7KY= X-Received: by 2002:a05:6214:5192:b0:5e8:e6ac:591a with SMTP id kl18-20020a056214519200b005e8e6ac591amr4458276qvb.2.1681317761899; Wed, 12 Apr 2023 09:42:41 -0700 (PDT) X-Google-Smtp-Source: AKy350YBsQS6JYJjxqfbIX08K5h2eIXR2P+DncIxdAAKOWLtDWxM+vNCtIyUP4FvBHNvZ8jfexZ/kA== X-Received: by 2002:a05:6214:5192:b0:5e8:e6ac:591a with SMTP id kl18-20020a056214519200b005e8e6ac591amr4458247qvb.2.1681317761589; Wed, 12 Apr 2023 09:42:41 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-40-70-52-229-124.dsl.bell.ca. [70.52.229.124]) by smtp.gmail.com with ESMTPSA id mf18-20020a0562145d9200b005dd8b934579sm3676547qvb.17.2023.04.12.09.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 09:42:40 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Andrew Morton , Andrea Arcangeli , Mike Kravetz , Nadav Amit , David Hildenbrand , Mike Rapoport , Axel Rasmussen , Leonardo Bras Soares Passos , peterx@redhat.com, Mike Rapoport Subject: [PATCH v2 11/31] selftests/mm: Drop test_uffdio_zeropage_eexist Date: Wed, 12 Apr 2023 12:42:38 -0400 Message-Id: <20230412164238.328238-1-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230412163922.327282-1-peterx@redhat.com> References: <20230412163922.327282-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: rey5fagubkef8txbx1u4eay8bdpx7fz1 X-Rspamd-Queue-Id: 259331A0021 X-HE-Tag: 1681317763-998856 X-HE-Meta: U2FsdGVkX18m33q/q4GqfMLG31B9V1BO/5S65TQcqWUplVLgoAm+X1OujgwaHr/s/q6F5uX+VTCd06rSvx57IvU6/FNaxEo2NIvvTk/klr6X7a14rEgDdEmgcSi8tpaR+OPCNwanbwGHafL2vkZC1kC/3LidEowCmsBN7DTeHYyfhub+lVgBdrDiRsMsW2NxGGNhx2Aal+kLQtI1UK7wOyXMNuFf68iPkCI7QbISez8W7wQvT7E+UAQJHM9mSkCUwRVrNsmQQMJcm2CJ+/fO0em0OIEfBEU4hpeV6LpPhrrQN8t405S6MrV28TVdKllPkIbsE4iXi5+wiOLG4f0I7v8B5PHWS33huPHw0WqG5DGOGUpnn3KHPy2fREwjLgUZr2or9t03iRlMmBcWa7rpN6Iu8EGNofXGQvUTNAVKvCMbUH1heNn/nQyukTkbRyTyc4PK3UibrxVKlc9lIh20TzBVm0RuXeOCVAKHC35TYR4yhUJW2TaStJONY8XxEefThTfWAy9hysBunz6ZM0g6zJ4mKZdD4gzRt8UvKVBKoj3CMi3WSRL3UcvTdM2cShYKO4KgpnIgr2osMOyxiiZH/oY6uzKvPKItz3a5FkEVNl7b204yFULr9dqiZDHFH8SF0ruxXZFWKjfxJg8vfux3NVrwzQwk12M+lGlV1HuqSMxrBwJtxE8xUKg02dQvQpq63n3lTVJZprGZ1Xlnh+5sJKOlEHseopJ9al2/oY2heqckeux7+boO8uRl2rzDoSZm36CrjMQjNZkCh5eIOYmioADAVR2V+egbOA7VNGM5vRqKT9gSWLx/l4ZLu8y/UqKEDLBhkb0YTTdXsEoWg/J3CsxbGcivBemC4osQyEFQjhtPRw7C3f7dEZnJeORa/N3c96pm2CWdwsfmVuWDOfYuioJZbnBDSlNPfoZdvnli3M48JknAKlfCei44fI5VDV6EouF1iSjje1YCFJQh1cD 9vwTKQKc cbNZiYNh0XM8XmpHXdzil1/8CFdaCSiqmrCT6VXXSbjq8QqoN0d1rJQnbiAO2RByLjwkEFJo+buabw/YKNtb35EJfVFog32LBwdWuI0Bqx9x+ZEBC5BcJzwBbjktlgTT/RW5rsQ+zfZKO+sIu3iJknx0aSx0WvrPJ/jM8ouW2Mepq0eOUZSnGgbl0mvoNDcI5T1Cac3cmzIIbe5nRr+2JW7vZKiFG2BT0vXYjhKvs3+80+t+W7Shwnt6jqa3XEf63CvHCzFljPoErPhUcwvRyjTPj3lluqZ54UeBOIhNA5xmkB0MGX3iyBru5W5lRS5gidQR6hga1xFD1GJG3tvj/eV7A8B9bmkJmBjFfBS3/pbg31aX+3P8bS28sd1kxLlL6kUNgOGXpS9JU6vc2A87RxnAFj1DSQkZ/dGs1M5IIQtHxpQCMceFZKsx2cH7QOkhOMD+eiU4oZ06m5l1mMySq8IuI9Jb2Z88avqSfeI+SRLWdD+u7DIztr0J+5OUbklpb92WFToYzvWxYt/umW+KvaGUdnzd8Sds4E93y3ukGlqHPbLLRfdHF+tzZdVndM9cCMtwSuGEznPKhbB2x0L8afSYuvqdrV5YnC9vw 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: The idea was trying to flip this var in the alarm handler from time to time to test -EEXIST of UFFDIO_ZEROPAGE, but firstly it's only used in the zeropage test so probably only used once, meanwhile we passed "retry==false" so it'll never got tested anyway. Drop both sides so we always test UFFDIO_ZEROPAGE retries if has_zeropage is set (!hugetlb). One more thing to do is doing UFFDIO_REGISTER for the alias buffer too, because otherwise the test won't even pass! We were just lucky that this test never really got ran at all. Reviewed-by: Mike Kravetz Reviewed-by: David Hildenbrand Reviewed-by: Mike Rapoport (IBM) Signed-off-by: Peter Xu --- tools/testing/selftests/mm/userfaultfd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c index d724f1c78847..3487ec0bfcc8 100644 --- a/tools/testing/selftests/mm/userfaultfd.c +++ b/tools/testing/selftests/mm/userfaultfd.c @@ -88,7 +88,6 @@ static bool test_dev_userfaultfd; /* exercise the test_uffdio_*_eexist every ALARM_INTERVAL_SECS */ #define ALARM_INTERVAL_SECS 10 static volatile bool test_uffdio_copy_eexist = true; -static volatile bool test_uffdio_zeropage_eexist = true; /* Whether to test uffd write-protection */ static bool test_uffdio_wp = true; /* Whether to test uffd minor faults */ @@ -1114,7 +1113,7 @@ static void retry_uffdio_zeropage(int ufd, } } -static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry) +static int __uffdio_zeropage(int ufd, unsigned long offset) { struct uffdio_zeropage uffdio_zeropage; int ret; @@ -1138,11 +1137,8 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry) if (res != page_size) { err("UFFDIO_ZEROPAGE unexpected size"); } else { - if (test_uffdio_zeropage_eexist && retry) { - test_uffdio_zeropage_eexist = false; - retry_uffdio_zeropage(ufd, &uffdio_zeropage, - offset); - } + retry_uffdio_zeropage(ufd, &uffdio_zeropage, + offset); return 1; } } else @@ -1153,7 +1149,7 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry) static int uffdio_zeropage(int ufd, unsigned long offset) { - return __uffdio_zeropage(ufd, offset, false); + return __uffdio_zeropage(ufd, offset); } /* exercise UFFDIO_ZEROPAGE */ @@ -1177,6 +1173,13 @@ static int userfaultfd_zeropage_test(void) assert_expected_ioctls_present( uffdio_register.mode, uffdio_register.ioctls); + if (area_dst_alias) { + /* Needed this to test zeropage-retry on shared memory */ + uffdio_register.range.start = (unsigned long) area_dst_alias; + if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register)) + err("register failure"); + } + if (uffdio_zeropage(uffd, 0)) if (my_bcmp(area_dst, zeropage, page_size)) err("zeropage is not zero"); @@ -1763,7 +1766,6 @@ static void sigalrm(int sig) if (sig != SIGALRM) abort(); test_uffdio_copy_eexist = true; - test_uffdio_zeropage_eexist = true; alarm(ALARM_INTERVAL_SECS); } -- 2.39.1