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 73F56C76196 for ; Tue, 11 Apr 2023 11:02:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC7E66B0072; Tue, 11 Apr 2023 07:02:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E7759900006; Tue, 11 Apr 2023 07:02:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D4052900002; Tue, 11 Apr 2023 07:02:42 -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 C6AC16B0072 for ; Tue, 11 Apr 2023 07:02:42 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 864891A0BE6 for ; Tue, 11 Apr 2023 11:02:42 +0000 (UTC) X-FDA: 80668822164.29.C409456 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf20.hostedemail.com (Postfix) with ESMTP id 3DB4F1C0023 for ; Tue, 11 Apr 2023 11:02:40 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=fieGiU9W; spf=pass (imf20.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.158.5 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=1681210960; 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=Do4XJnKmSYUZbGItdbXdmslVNxT1JsiWs1F6hMXqmm4=; b=jOXy+In8JhYKEBhmpruxVP1DuVlK3pjSHNVeSQKrShCF9fD9hQliT3+mIt+Mvt06AvUHuP yicpRqXX3+uAZo8b4/lKscXeR6nVRaGxorXQ5sheLyMdcAOdpeIPgLJPG1BtS7EDssfc6/ 3hClylqMpZIM9jhLJrmZ7wOepVnaG6w= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=fieGiU9W; spf=pass (imf20.hostedemail.com: domain of rppt@linux.ibm.com designates 148.163.158.5 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=1681210960; a=rsa-sha256; cv=none; b=T654SZJAoZ708x0tTMEjZPbTp2xBN+dxmrA6clWK6y5glfg+6Jm3j5ETiFC1Yj461Kfot0 R/mK/yQn42kbuTpykuzeF4o+k4Xzgj8Q++IeQLgptT/RoJ6HOBbihGVY+oHxNdZB7J428H IlwYmls9+cbTwmzTVvq39Le+VeoDN2E= Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33BAaARY024808; Tue, 11 Apr 2023 11:02:39 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=Do4XJnKmSYUZbGItdbXdmslVNxT1JsiWs1F6hMXqmm4=; b=fieGiU9W5wo7z+XyXevFP0+SSwp7aucdrtQARlMY61iCmkd0YsYhn8H0kb6wkbHPeVbE JcOsQBAtGFa4B+VR+ogp7nJ5SiQOG8/iqQ/AnM866p1ZO5L/MYQeL2/9FjP4IAS3ffYR nNiVUaFNYkgksyOFYKh0+ExfcaCHBSu3GcB7sU4ItdM84/rWReoR/KF/5MeBmFAm2AQB xipufrLjJqPNQpJVecR50lZh9DAaBcbI3xRcs5HDJUMGYlImZqBkUVchPxTS4EKD/HUU G9lbNzs31Vgg32zPU9AacKgHUY/4CvQqC1xD2HKYTAADStmVArsIJI6LVbPt1UtMW0av og== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pw5xg0shm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:02:39 +0000 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 33BAbWc5031103; Tue, 11 Apr 2023 11:02:38 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pw5xg0sgu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:02:38 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33B3CudD001745; Tue, 11 Apr 2023 11:02:36 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3pu0fvsdqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Apr 2023 11:02:36 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33BB2YEW19595956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Apr 2023 11:02:34 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 354DF2004B; Tue, 11 Apr 2023 11:02:34 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B8FDB20040; Tue, 11 Apr 2023 11:02:32 +0000 (GMT) Received: from linux.ibm.com (unknown [9.179.16.229]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 11 Apr 2023 11:02:32 +0000 (GMT) Date: Tue, 11 Apr 2023 14:02:30 +0300 From: Mike Rapoport To: Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mike Kravetz , Mike Rapoport , Andrea Arcangeli , Leonardo Bras Soares Passos , Andrew Morton , David Hildenbrand , Axel Rasmussen , Nadav Amit Subject: Re: [PATCH 20/29] selftests/mm: Allow allocate_area() to fail properly Message-ID: References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160815.3107534-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330160815.3107534-1-peterx@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: noFJAxATTJTU8tBnr-sTq67Hrt1MyBof X-Proofpoint-ORIG-GUID: 3e3sBqJ7ZSqYAc96oiwIueLexn7BSzdN 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-11_06,2023-04-11_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 mlxlogscore=999 impostorscore=0 phishscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 priorityscore=1501 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304110099 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 3DB4F1C0023 X-Stat-Signature: usikzorbfbape9799fab7rp4c483nxfa X-Rspam-User: X-HE-Tag: 1681210960-680148 X-HE-Meta: U2FsdGVkX18obaA74kcGaMEaQtQyxdTIanlOkB/7GH042bb22RRfBRSvRWh7IcRAqDev4J3kSikieqJ02rBTlrlsUV4ZW0fg4s/B7V5px3Z9/iTTZZojyFAwjJ6d8DA2nwHAhi07Mel3LXSZ0hwCsAvuH1M+SMoXX/Q7VvJMNhnIcZzdXkUIj6hdcaHL8SKgdDXz/U1GDfodfBZzX9VeIUJr/GHgeVlnyxEDQ25YcNfF7bPRj3VyCdKPNR+E57oR+9CFvLsS5uKm258JNkZuaVKYg1SPx4AgIViaeV7hUFcHGFgSQrDHc2DQiaL/mQvlNAT29NXf55XWd/wYbWliOIJjOy2p8olsUkyYAvUeWxkgkDIPRxJC03+9WVaR33XC8gNRVrZxG0NZJL+DTQMnvtzwW+OwrJTPsTt1GItC5/vRsNUkA2R2vmUAWrbnfeZJXzK+C5ngFcJ+Cu3lofeWDXYtLqbMmXQtLV5QqgZFEuW+74tUqbY9y2ATob8bIYISTOfGPZQej0V3zuCXvKt5xNP3hpUhudl9S47vxutv7n6awX0gXQv3JtYWFI0flW7r7jc+Pv5uUFzAF66xgcQIDqPwrN1cpd8j5FCaES8SBoz+38kBB4byRE0Xm/3zL8+4206h8rTQ1d7zqCBe28gC8xSG8ewCg7t4vhfOkCGX3w1ddBZc+fQ+etTy9LlJ7WQ5ekSEEBjSwaQ5ns4WuppOhbruRkXURgUQjy1vSLW2BKriqs08xpSL8z2aPVtzl/x7xH7oiGCmXxWcd2khKSzzZQMSS9HAwwxOui5GKRpD/QE2C6S0dE98htzxDmSGuBk6Ch7LNov/HBo/eyQpCGKY5hqdnc3g5DUt3eyUzzXhNIuSzsk2LOyvMt90EBvzJ634o8X7o31ivLpw/KcV+Nj6CghaVOiWhdB3WXjGJo2RzGrHccGLPLDXs7ASCZ8MkxsFcMtFoxU3CHtXKiHrQSJ /wA2+FRO NWPUhnwJ9kkyF5HitcU/0L6pMLxdUHHyz9ujvHuc5cmez3QDqFGYG1NHyqrGXxt93vTA+3fzjZz2DU4SUYQ3uK8JvZJSojGofMe9mtNn1+mS7hoFxBZShjfFG4TR81RWRy8/5rL4CJ8PHQ6Jw81gBJXmWt0OgaUJqq6mXjfZoORl5GYu5yV9+Xzw19TA69gBHtpejEqRYFyTzuikaa+SB/TBfIl1cVpiZS74+ZJTurYcCi3MulUi/xCeMH9xrODhWoris9R1ekuvP+QXP53hMK3GI03/tJxpfnN+T 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:08:15PM -0400, Peter Xu wrote: > Mostly to detect hugetlb allocation errors and skip hugetlb tests when > pages are not allocated. Wouldn't we want to skip anon and shmem tests as well for consistency? > Signed-off-by: Peter Xu > --- > tools/testing/selftests/mm/uffd-common.c | 32 +++++++++++++++++------- > tools/testing/selftests/mm/uffd-common.h | 4 +-- > 2 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c > index 92b7e00efa8a..ae6b61144b53 100644 > --- a/tools/testing/selftests/mm/uffd-common.c > +++ b/tools/testing/selftests/mm/uffd-common.c > @@ -44,10 +44,13 @@ static void anon_release_pages(char *rel_area) > err("madvise(MADV_DONTNEED) failed"); > } > > -static void anon_allocate_area(void **alloc_area, bool is_src) > +static int anon_allocate_area(void **alloc_area, bool is_src) > { > *alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE, > MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); > + if (*alloc_area == MAP_FAILED) > + err("ENOMEM"); > + return 0; > } > > static void noop_alias_mapping(__u64 *start, size_t len, unsigned long offset) > @@ -65,7 +68,7 @@ static void hugetlb_release_pages(char *rel_area) > } > } > > -static void hugetlb_allocate_area(void **alloc_area, bool is_src) > +static int hugetlb_allocate_area(void **alloc_area, bool is_src) > { > off_t size = nr_pages * page_size; > off_t offset = is_src ? 0 : size; > @@ -77,14 +80,16 @@ static void hugetlb_allocate_area(void **alloc_area, bool is_src) > (map_shared ? MAP_SHARED : MAP_PRIVATE) | > (is_src ? 0 : MAP_NORESERVE), > mem_fd, offset); > - if (*alloc_area == MAP_FAILED) > - err("mmap of hugetlbfs file failed"); > + if (*alloc_area == MAP_FAILED) { > + *alloc_area = NULL; > + return -errno; > + } > > if (map_shared) { > area_alias = mmap(NULL, size, PROT_READ | PROT_WRITE, > MAP_SHARED, mem_fd, offset); > if (area_alias == MAP_FAILED) > - err("mmap of hugetlb file alias failed"); > + return -errno; > } > > if (is_src) { > @@ -96,6 +101,7 @@ static void hugetlb_allocate_area(void **alloc_area, bool is_src) > *alloc_area_alias = area_alias; > > close(mem_fd); > + return 0; > } > > static void hugetlb_alias_mapping(__u64 *start, size_t len, unsigned long offset) > @@ -112,7 +118,7 @@ static void shmem_release_pages(char *rel_area) > err("madvise(MADV_REMOVE) failed"); > } > > -static void shmem_allocate_area(void **alloc_area, bool is_src) > +static int shmem_allocate_area(void **alloc_area, bool is_src) > { > void *area_alias = NULL; > size_t bytes = nr_pages * page_size, hpage_size = read_pmd_pagesize(); > @@ -150,6 +156,7 @@ static void shmem_allocate_area(void **alloc_area, bool is_src) > area_dst_alias = area_alias; > > close(mem_fd); > + return 0; > } > > static void shmem_alias_mapping(__u64 *start, size_t len, unsigned long offset) > @@ -282,14 +289,19 @@ static void uffd_test_ctx_clear(void) > munmap_area((void **)&area_remap); > } > > -void uffd_test_ctx_init(uint64_t features) > +int uffd_test_ctx_init(uint64_t features) > { > unsigned long nr, cpu; > + int ret; > > uffd_test_ctx_clear(); > > - uffd_test_ops->allocate_area((void **)&area_src, true); > - uffd_test_ops->allocate_area((void **)&area_dst, false); > + ret = uffd_test_ops->allocate_area((void **)&area_src, true); > + if (ret) > + return ret; > + ret = uffd_test_ops->allocate_area((void **)&area_dst, false); > + if (ret) > + return ret; > > userfaultfd_open(&features); > > @@ -337,6 +349,8 @@ void uffd_test_ctx_init(uint64_t features) > for (cpu = 0; cpu < nr_cpus; cpu++) > if (pipe2(&pipefd[cpu * 2], O_CLOEXEC | O_NONBLOCK)) > err("pipe"); > + > + return 0; > } > > void wp_range(int ufd, __u64 start, __u64 len, bool wp) > diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h > index f4bc73ce3b48..51ec75f6d0c1 100644 > --- a/tools/testing/selftests/mm/uffd-common.h > +++ b/tools/testing/selftests/mm/uffd-common.h > @@ -80,7 +80,7 @@ struct uffd_stats { > }; > > struct uffd_test_ops { > - void (*allocate_area)(void **alloc_area, bool is_src); > + int (*allocate_area)(void **alloc_area, bool is_src); > void (*release_pages)(char *rel_area); > void (*alias_mapping)(__u64 *start, size_t len, unsigned long offset); > void (*check_pmd_mapping)(void *p, int expect_nr_hpages); > @@ -101,7 +101,7 @@ extern uffd_test_ops_t hugetlb_uffd_test_ops; > extern uffd_test_ops_t *uffd_test_ops; > > void uffd_stats_report(struct uffd_stats *stats, int n_cpus); > -void uffd_test_ctx_init(uint64_t features); > +int uffd_test_ctx_init(uint64_t features); > void userfaultfd_open(uint64_t *features); > int uffd_read_msg(int ufd, struct uffd_msg *msg); > void wp_range(int ufd, __u64 start, __u64 len, bool wp); > -- > 2.39.1 > -- Sincerely yours, Mike.