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 173BAC76196 for ; Fri, 7 Apr 2023 09:48:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A084D900003; Fri, 7 Apr 2023 05:48:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 990DD900002; Fri, 7 Apr 2023 05:48:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80AEB900003; Fri, 7 Apr 2023 05:48:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6B3B3900002 for ; Fri, 7 Apr 2023 05:48:46 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D5618141360 for ; Fri, 7 Apr 2023 09:48:45 +0000 (UTC) X-FDA: 80654120610.21.C93E71F Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf29.hostedemail.com (Postfix) with ESMTP id 44B8C12000C for ; Fri, 7 Apr 2023 09:48:42 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=p9Imjw3x; spf=pass (imf29.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680860923; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=a9/I6uT/f1k53LCbt8zh9iPllgd0t7qxghTmYs61v00=; b=v7chztFZ42jTVhyXX94KccCgF2wolNaY71Zooe78bGn63/CSSuqEZ8TS2LdQNgL2Ol2raW nkC0n8Yr2tVFYZ6xbLFqj5yWHhgCCzeszsnjyEO3xqXH3rDNbzj+ueRyAbxY9hhVNu+2E8 4++40kcDspYledsjO3ckAZZlvAqrFds= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=p9Imjw3x; spf=pass (imf29.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=rppt@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680860923; a=rsa-sha256; cv=none; b=ncExBAmsnJ+TcgHGwNvpbrtmFSQUU5PV+r1uOloiVq+uStLt0CkEzFkg91kpeXCMTk3evV BzwMcs/4XZ4wrM4Ph4Z/9y9NjiFDOSKNBpuowmT6yXpv3igISt9VtZQrvxDEuC+UOvqXWj 6C1Lm4DPS/4WVD6RUSv7CP8n1oflWJo= Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3379f7O8023708; Fri, 7 Apr 2023 09:48:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=pp1; bh=a9/I6uT/f1k53LCbt8zh9iPllgd0t7qxghTmYs61v00=; b=p9Imjw3xw68Bw+c1SC9HgveI81hs+n1Kgj1NnuSv+6U7BnGauetOb9PmZfl/CW9Ek6kT 1eIzUOCzrnvotXmu5jjvA+vTSEhQ3T+GUqeO55I54kcdaJrJfqYGAnmxxOTNTzOmCd67 86ysgJAwF8OL+jzqXbiOnvkA9f1TEUaf5LjhXb+4o3PQscf1L8lxaS6ch7K8nsPai5sD LorEgeSTaW9+4t2cP2n8U9R0XszqCUphhqDFaskxbvIDd8uWil4/6M/rU2BNiJauOc2e 3KHl842tZURIZHC0DwUHIaUblrSC8l2GYnfsdptXKkzYMrRSoJ6TvdosCtLwd8LC9/lr Dg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ptf6w208c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:48:41 +0000 Received: from m0098409.ppops.net (m0098409.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3379gAOi026183; Fri, 7 Apr 2023 09:48:41 GMT Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ptf6w207t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:48:40 +0000 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3379S3Vd008294; Fri, 7 Apr 2023 09:48:38 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma06fra.de.ibm.com (PPS) with ESMTPS id 3ppbvfupf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:48:38 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3379mZmN56951116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Apr 2023 09:48:35 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B11E620040; Fri, 7 Apr 2023 09:48:35 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C14E20043; Fri, 7 Apr 2023 09:48:34 +0000 (GMT) Received: from linux.ibm.com (unknown [9.171.71.120]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTPS; Fri, 7 Apr 2023 09:48:34 +0000 (GMT) Date: Fri, 7 Apr 2023 12:48:32 +0300 From: Mike Rapoport To: Peter Xu Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand , Andrew Morton , Andrea Arcangeli , Axel Rasmussen , Mike Kravetz , Leonardo Bras Soares Passos , Mike Rapoport , Nadav Amit Subject: Re: [PATCH 11/29] selftests/mm: Drop test_uffdio_zeropage_eexist Message-ID: References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160717.3107010-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330160717.3107010-1-peterx@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: UDO9rXuD7kbJGrGXR0XHY1B_6hZ71K3j X-Proofpoint-ORIG-GUID: sRngXHgF38OkD0VxP46iji9Z4kqLVBUV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-07_06,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 adultscore=0 priorityscore=1501 phishscore=0 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304070088 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 44B8C12000C X-Stat-Signature: gg31rzc53k4omjiimcip9igk61tdgmue X-Rspam-User: X-HE-Tag: 1680860922-327050 X-HE-Meta: U2FsdGVkX1+WVzpSIf4LWiZTVGruvJQFSM2RRs14tf4g7c/Isy7vngCgtd1RQWip/zTchWJ0+eoM7c/53lOYgRNr1KwKdc9uqNepsLSbYlf0+GMLabPbKBtpb/bSf4Mnam8EhatkOy7X2qSfHZP+3yGG2DnoJZS3zEXr7q4rwhcc40WUzEzvEDI2PU/v9FWstLWq1YSR29EJ3USK5YqegColGvMST/5B1rAnTUIAd6O9wp5ZOtgIN7tv+nbEuwj574PFjFcvh+9lhqaiM6ZR/vPkb2N/zBtaMrXWxFJN3bfEOIWLSc7ffhm7i36qIULZTg3rlj2Z4BYlcaDBcn+Uhsr602wdps2Sf2mPgi2fV55toV2vMHGrSflkhLPpgQS+BhBJ0nYTBwhRers99VILE2ZdwKlt80c4sllSsyBgbWp+fKUbcYW/sX37BitGtGedImgDpBrEo47enPpG4YGpw09hzve52dWFJ3benWi9JyiWw475r4VT/YUbM9cLENF5KhYkI1DVinDWWhsn8RuzNrzSFMMX/G4/g40CEEA3oebdi8UA7+rJimoi7SGXekMDrfUkgQ69e6Z0NYdznJmcERHk4bqPnmRve/MVE2pwiuBoQZuBmDcmeOto8HQ+PD7oZDTv4purb4qu7z1GzrkegqR2yDwmrv0fmGldKNuh3Q4wVTVTZdJZdE7nyzzY8gCJSn2H8tnk/aQU+Iqc/I/9czrFBZwsG7/WWjnsw7HZTW3hHlBGY1MEoPzFHn9Ng7+O0muOCj2IQMVPFEPihSjjOOy11BCYLl4vysXxaznwwAMyDnN6/ceLpqm0HYJB9r/WiF/tD+smhH8XQ7jjE1slsQeBGzvA01ljSXCi5WTWJa5cLqcoKWjY07exKmH9Y5Hby0yhj3jtiBdsoBSmGgkCU44AUtxtiADBh+1fXpTf+4PkPuR9EsTBMdsQ65mfhrt0Uvrp3KcsnhOBk5Z+M6q HqlRtzDW ynpdfsdvhJFW+/kqYWwxm77foOJBS56jzefWGKmoHQfP705+/SQCoRtjqOPbLvdxMx++9laiv0DEP8rgUSx4wzgyGr083JFQLKQXp/3RggNldyJ+BN/EpadRIWXQMUZYntxDobtzhwLLlEdYUDTb3ygJwF8TNbjB+itHv7b6Yki1RT8Hxz7LM/lK7j8hN6HBp/0IynoXD1VZbXqspu6gE1EJ4zCnPa006hi1t18hx0NWqTViHhn5iiLqlnFUl7rfNpabCrRRcXjQ9dxgbYmR5djgzr6eiMCuxt276BgBWSfrhWVFKxgtiX0aSOXthkqAvZg5mnA49nkV+HfgllzxmJhUY7zXRR6UTAcIP 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: On Thu, Mar 30, 2023 at 12:07:17PM -0400, Peter Xu wrote: > 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. > > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > 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 > -- Sincerely yours, Mike.