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 EBABCC6FD1D for ; Fri, 7 Apr 2023 09:32:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 83EC0900003; Fri, 7 Apr 2023 05:32:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EF0C900002; Fri, 7 Apr 2023 05:32:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B6E3900003; Fri, 7 Apr 2023 05:32:58 -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 57DA6900002 for ; Fri, 7 Apr 2023 05:32:58 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 399D5A014D for ; Fri, 7 Apr 2023 09:32:58 +0000 (UTC) X-FDA: 80654080836.04.013587F Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf29.hostedemail.com (Postfix) with ESMTP id E0FCC12000E for ; Fri, 7 Apr 2023 09:32:55 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="ro/qxl/u"; spf=pass (imf29.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=1680859976; 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=JMskfpgSNxhFM88ByW1D/aC4AKoFFyWINNCHKHhAu+w=; b=Ub8WFRE+HZQksGEjjdzQiRcGv1gJ4E0KvzLvu6h/GiPQeFHBnL3o2eymHNexnWNh9hIu7V hLn/gaFlComD9XLi2v6imO+ZYvtC7lLAjjty1GaIOMahTxPiUw4H9WcjDlBdvBALc5ya6E dLUbzEmRTWXd2gDyGlqo45YDNhlY7NU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="ro/qxl/u"; spf=pass (imf29.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=1680859976; a=rsa-sha256; cv=none; b=R78TP63RPmpkRuPCourqZmSkh4ooZbjhYmRwkSk9GlymgDPEcYB4tVZ9/Pd088i0tPOmAB We8aIVYESh6yj0k/0WNGslbe3/mjPIE0ftiFgCiv4ZGiDDknlOTHIJj5XQ3MUUOsaTYteP iNEdcuRftr3UpTD3PGFNIIo7gZTX2Qs= Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3378FBmk000351; Fri, 7 Apr 2023 09:32:55 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=JMskfpgSNxhFM88ByW1D/aC4AKoFFyWINNCHKHhAu+w=; b=ro/qxl/uN9w7s494364wdq/tk8wULCJFmdH90OjRzPmzisjWnpHG5sSf3xDInv2TF3E6 /W9xXUvKWdx71a9KPe6WCWrvVf6akzM8qNcBUomSlKaZXgRWj0NSEeS9z4p5mREdGJwp H81Dcwm6eiFSK0l79SLY7WUMbdv0ckxLVx+hqO8iXlR5+LLaDQVajRxBSgGhef/YsUKR NwPgmqYY2p0RzwEFwCJutmM/BLgreVTKI3TOmznMnyxfjJZFkAcZe7spJ0Zy3nQ0dwvJ oXvs94gTWFVxJH8c5ZoYM/e8Q/hF8LR35wHZrxqI9GUNHMzsuAWpa6GztHTdYtXL8yQH WQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ptc41dph2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:32:54 +0000 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3378sKxS012858; Fri, 7 Apr 2023 09:32:54 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ptc41dpgh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:32:54 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33706g8l028613; Fri, 7 Apr 2023 09:32:52 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3ppbvg4v37-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:32:52 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3379WnMk13173306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Apr 2023 09:32:49 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A68B620043; Fri, 7 Apr 2023 09:32:49 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6E0D420040; Fri, 7 Apr 2023 09:32:48 +0000 (GMT) Received: from linux.ibm.com (unknown [9.171.71.120]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTPS; Fri, 7 Apr 2023 09:32:48 +0000 (GMT) Date: Fri, 7 Apr 2023 12:32:46 +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 09/29] selftests/mm: Reuse pagemap_get_entry() in vm_util.h Message-ID: References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160711.3106988-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330160711.3106988-1-peterx@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: -gTDymuNKYVWuKToG9sVUASKA2dnCsaQ X-Proofpoint-GUID: 5xRx1OLWsQfKdcxYKAAR3FJwvUQxqgfV 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_05,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 impostorscore=0 bulkscore=0 phishscore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 mlxscore=0 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304070084 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E0FCC12000E X-Stat-Signature: oz7du9ibfprdc8rrpsk8e8weqyymz89h X-HE-Tag: 1680859975-366360 X-HE-Meta: U2FsdGVkX19ahF1+X/EbyxLrMxu8pCvKX4sh7eQM26jyCSlM7P+mb6Eh1xnlVdI/rlkHeJX84Rl+lj/5zH2hADq45MUt64KK4PApT1tyGw1zQyt+BgBTsZgyBKxmhtwUzJnWUwXw+j51/DvSD4552DGbXvYMa6yhrh6Jrpl/AtPKaGLpQx7VMEzyV2fhJeIiZ+2qV/J9AspdxXfULJr2M3IbXnrQpw/sQgUpz/6K+SPf1GWISIlBm9ZJ6v8kbAaYQtaW+lScSleMm4TPEnXtfPCXkVYIoHkM8pWuvyGCmkK3pc7BVTWebwd0ymEi0j7fN3u5OkkO+Fx+VVLmYPtC8xypMXE4Pr0LmjhZIjrxhzvLYjnNISycyI6v+4wklpZnAO4Zsge7yZMQFs5M3zJ8t/IOrU5Almk9EinvW39LqXTuVmmcF7inEg1DqA54QFRP0NL98BV+zs88FRXw7XXutdQlUb8kQcHC2QArzEQ+uJmm8LuGJtDrMUJZ/cvFJjk8Pv6nOnRYlcskqpvYAJQ9KgrNyhhWVRcV7eudXUJWL1PpJj0nQU0+4Xcdi2M+pxZ+fBksSL28m8xQWT3QBSixVIYxOa93o99pmEhtGPocF/BbPEilhe3evnqokINb8xGznBDud40cUYjMBQMe5+sMmL/37e24Yx732DUFZcGjIUs1b8rtRSF10zrZW5upF4hcBEkpZVx7/5ZXguGtNccyWwKkJrT6X7kF4Jx9R4mPEliyPr8qyt2Ns19niez0NUkhFD+ppaO99W8cpI0PJhH/Z2hfuZI/GpkGtkgGKLVcHVxFfgj8jMdSh6uVFGPrQQvXK5QxTyaNDcbSsvXqgvQLepPpi/NMJ1we/Rks2e+BmDUAL86nMF7r94KV0XkzHoAswdRHIlBnkvBY8S79n6A6uvw5c+pTOt87Ss3KbOasITSHIGYjH95PM1gfLo2cmkrtD0dimTRp9n4QelyxGYO n4Sw+N8o TUy5bubce8U6rwEfAALujtkKDSHQdXVj0bQfidE68I1KK80jXEZgKzmC0KA/Ow3d2MjL5YcSuMuDe79crrIuiz/ZcVaDMA53Ub+LnY4vI796vygawrwQOnlo3fNF4m8wLU4LdLFpQ4qpyQDDK5FY/MkHvO+PgIGiMtdqI7JARHeua1StDx9v1NSok6OW7zvkcS7K+SC8iwSwrB1FFw2RM98yrd9ReB1WTxE9wsBjHAVE6Suur/QDwq92PZaB2c41C+HsTNrRKu023rGvkhM1LNS9S5MjDG9H/e88j3+JlXya1tt6r4QX/94FA6l2hPuOCIjrwwDCMYV0bPC7I6VFyixCquMH1JUOYN7C0 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:11PM -0400, Peter Xu wrote: > Subject: selftests/mm: Reuse pagemap_get_entry() in vm_util.h Nit: selftests/mm/uffd: > Meanwhile drop pagemap_read_vaddr(). > > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > tools/testing/selftests/mm/userfaultfd.c | 31 +++++++----------------- > 1 file changed, 9 insertions(+), 22 deletions(-) > > diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c > index 7e841f7e2884..795fbc4d84f8 100644 > --- a/tools/testing/selftests/mm/userfaultfd.c > +++ b/tools/testing/selftests/mm/userfaultfd.c > @@ -1399,19 +1399,6 @@ static int pagemap_open(void) > return fd; > } > > -static uint64_t pagemap_read_vaddr(int fd, void *vaddr) > -{ > - uint64_t value; > - int ret; > - > - ret = pread(fd, &value, sizeof(uint64_t), > - ((uint64_t)vaddr >> 12) * sizeof(uint64_t)); > - if (ret != sizeof(uint64_t)) > - err("pread() on pagemap failed"); > - > - return value; > -} > - > /* This macro let __LINE__ works in err() */ > #define pagemap_check_wp(value, wp) do { \ > if (!!(value & PM_UFFD_WP) != wp) \ > @@ -1427,7 +1414,7 @@ static int pagemap_test_fork(bool present) > if (!child) { > /* Open the pagemap fd of the child itself */ > fd = pagemap_open(); > - value = pagemap_read_vaddr(fd, area_dst); > + value = pagemap_get_entry(fd, area_dst); > /* > * After fork() uffd-wp bit should be gone as long as we're > * without UFFD_FEATURE_EVENT_FORK > @@ -1446,24 +1433,24 @@ static void userfaultfd_wp_unpopulated_test(int pagemap_fd) > > /* Test applying pte marker to anon unpopulated */ > wp_range(uffd, (uint64_t)area_dst, page_size, true); > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, true); > > /* Test unprotect on anon pte marker */ > wp_range(uffd, (uint64_t)area_dst, page_size, false); > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, false); > > /* Test zap on anon marker */ > wp_range(uffd, (uint64_t)area_dst, page_size, true); > if (madvise(area_dst, page_size, MADV_DONTNEED)) > err("madvise(MADV_DONTNEED) failed"); > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, false); > > /* Test fault in after marker removed */ > *area_dst = 1; > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, false); > /* Drop it to make pte none again */ > if (madvise(area_dst, page_size, MADV_DONTNEED)) > @@ -1522,7 +1509,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) > /* Touch the page */ > *area_dst = 1; > wp_range(uffd, (uint64_t)area_dst, test_pgsize, true); > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, true); > /* Make sure uffd-wp bit dropped when fork */ > if (pagemap_test_fork(true)) > @@ -1536,7 +1523,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) > err("madvise(MADV_PAGEOUT) failed"); > > /* Uffd-wp should persist even swapped out */ > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, true); > /* Make sure uffd-wp bit dropped when fork */ > if (pagemap_test_fork(false)) > @@ -1544,12 +1531,12 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) > > /* Unprotect; this tests swap pte modifications */ > wp_range(uffd, (uint64_t)area_dst, page_size, false); > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, false); > > /* Fault in the page from disk */ > *area_dst = 2; > - value = pagemap_read_vaddr(pagemap_fd, area_dst); > + value = pagemap_get_entry(pagemap_fd, area_dst); > pagemap_check_wp(value, false); > > close(pagemap_fd); > -- > 2.39.1 > -- Sincerely yours, Mike.