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 EC5EAC6FD1D for ; Fri, 7 Apr 2023 09:28:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E322900003; Fri, 7 Apr 2023 05:28:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 69250900002; Fri, 7 Apr 2023 05:28:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55ABB900003; Fri, 7 Apr 2023 05:28:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 45985900002 for ; Fri, 7 Apr 2023 05:28:45 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 1B0AF1411CA for ; Fri, 7 Apr 2023 09:28:45 +0000 (UTC) X-FDA: 80654070210.27.3CC375B Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf11.hostedemail.com (Postfix) with ESMTP id D2B864000A for ; Fri, 7 Apr 2023 09:28:42 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=H1nDARj1; spf=pass (imf11.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=1680859722; 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=l6TIiiTzXpviYV8V+CDhVSL00O3KvbHlSgUHC+6wqNY=; b=kb56RsGG8dLXtDmDCSTHgFVKbU0uU0mpWBRmvzOv2+kbl6SNnfJ1jwxl2onABeZh9ug2OW f9k3/FHIe2Nzz+oJsw3GN+7liitzk1x1UDyS/eYpThSj6zyZ2ZEJwzBnQokTfNQQmGXkMq 7ooVKmjr/mPwnBQYwonVmilUu+jD12I= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=H1nDARj1; spf=pass (imf11.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=1680859722; a=rsa-sha256; cv=none; b=OGhgzeFXHAqngefcSDD97PDwe97fErllXpz0jU1uMoYiExP3kgh9u+FScM3w0uEL6ACYsq l4TK1WQ3W442Bl13YEjOj6il4doiRf0dze7yXgesCkoOsrln9JppI9/gRMSKOu7gy9SKkM Di8LEsmIiGuTTRKFNCkXySjCG0IlUEM= 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 3377NITY023701; Fri, 7 Apr 2023 09:28: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=l6TIiiTzXpviYV8V+CDhVSL00O3KvbHlSgUHC+6wqNY=; b=H1nDARj1GmCap2MWOD3ohTUp2/ehGyJalkSBWVJku4jSTofhwP5mumr7g3UjKpP3aOLZ kLcElVezhPnK2eJEuPQrO2bhEZGgp5tI1PkYlrwCOug4eA8Rn0Ld4dWgKXuYcGALkId3 HYT+3+k0sxS31rr/TGec1EdrlNL5pwljLtkPZM/NSAjE+1gXPA/bBDp83aw5YgHXA/Yf mS1f+BHxY8PhKaXJUnaLK9WDdJ2MeeQoi4JizfKtts7/DhOPnrmQ754PV0N9NqJmgRz+ 9UGtWZb3Ig/dxFRBCbpeDM0rgfYl1cUSRsIJv/txhcW/DnVpRNdPuR6azvk1cGBkCg+9 iA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pter82d95-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:28:41 +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 3379GsVo030964; Fri, 7 Apr 2023 09:28:41 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3pter82d8c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:28:40 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 336Nw1CU018894; Fri, 7 Apr 2023 09:28:39 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3ppc87cvq7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Apr 2023 09:28:39 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3379San534472318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Apr 2023 09:28:36 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 940DD20040; Fri, 7 Apr 2023 09:28:36 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 77CFB2004B; Fri, 7 Apr 2023 09:28:35 +0000 (GMT) Received: from linux.ibm.com (unknown [9.171.71.120]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTPS; Fri, 7 Apr 2023 09:28:35 +0000 (GMT) Date: Fri, 7 Apr 2023 12:28:33 +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 08/29] selftests/mm: Use PM_* macros in vm_utils.h Message-ID: References: <20230330155707.3106228-1-peterx@redhat.com> <20230330160708.3106977-1-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330160708.3106977-1-peterx@redhat.com> X-TM-AS-GCONF: 00 X-Proofpoint-GUID: gMHXTDyET44tT2n4F2pj9df3jHpYAbzA X-Proofpoint-ORIG-GUID: cJ_Iww4BMDEX3_T5CR8wZviNCyKLmdfS 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_04,2023-04-06_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 malwarescore=0 suspectscore=0 impostorscore=0 phishscore=0 adultscore=0 priorityscore=1501 mlxlogscore=909 mlxscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304070084 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D2B864000A X-Rspam-User: X-Stat-Signature: fch7pdyh77mhh916aeu6zz3yci6hu93n X-HE-Tag: 1680859722-458412 X-HE-Meta: U2FsdGVkX18YXSxnWjYQSYUjuirunHxzSx+O3ElEbMTjC1FQ5quqpeffhwJLULT12csVo+k2YG0nEMzE10Zd/3IpG+aOXWSMNr1QT5SsK8R6TyA4dZa4YO4C7d93VnzoyoK5etiWHDuYe0rnFeBK0UDtfoV8wuIe4nmisvwVp8yGNrMYkvJ1N8cpK+oPh6FD8vNehHDNBDneRxWaP2VSV4Hd5BVUgIjmPqjdIqhagBWmBcHHKXXSmisKg590UhuPXf65EU1joBVmiVGWU/9PXJhNZI4YlbumOtdiK1AXk7QMdjpkVsT4qKtwaTPFOhhalY8U05apIuy2YA+gvJ1XG9fsUoWs0Bwsl2FnCwZUX6Z5loQ0GEZwqUHl6ZnPTuOE61+HfhUC7B3tWQBRXareSjh1I5tCEcnovA830ALLKQeKYf8BN6opOyTu1QcI34ZXrQPpb4XdnZhuzNmi95+IO5EgbS8reRZViO0HbvxQMiQWm46qSK3VfcbwSYn+yTJXmTU+926PkaiYiPjJULJAs+LiBx8N42GjRTaQKh6LvPU4kC+KdarMMhecnQ3SCZsXhaPud/aFzst3EIspLR9omWVfwsd3CKVDMCyYZooVpPi/Wr9pU3Zs6Q5x/wev4djtI0MvY8rk0AM5xqHWm//+28qWnEYymC4FRLeE2AyiJYx3XWrZQ9ai/dgwOQ7eyrLqAnPt2srfui/xz17kOQbGpSCLuqr/7OKnLQz7E4NFJaLiJxsh5+diBxsHYB2xtP21xr67t3u6TzDeLdO3Cgu5TKJz9PjjbwbVs2LS49pEuUjkbrJ/+O5wNk/Dnav2jI7OiEziA1NmaNZ1PCvnKXjuZaDkC7QP3JwjYRkoL1tES+2PsGNPHTNdPcD4+h50g3l59Utxk2KwK/h2VeNabGqPK1hv9tEwDL3gurPA6V2pGU30H1t5oFXyhP8cdGpHOdR1zgAPKkhdt6aZvCB1KJE 0r/eE/v1 wdX7ddnau5PgVdX6DnbFFKrmnbCGNxJeeZ/+oJDcSy+ELXxfpA8yeht589mhD9xHFoRObSRFjjk4rOBvTCxSG0JNR6DhGE9TgKxOjLtnz1vC0hlLkSj2QzsAzyj/teggdcms9+WNCZTCCqcFbj6+ypydSAuNfiCw7UlUKUPtIHZhTO4hW0gAHNNCqcHL91PRFXMeF4d2jMdGfrT5Spd0ld8BSmMsUxxkSWpoC5l0XRgsPetb3vmbgG0sjoci3noRykoZUapyp9FNLzdrEKQt+PFaZ7O6dfeIbuc2xB9HyB7L4CUL7sr18+4awvb4xa1X+A9ZU4nO8OzYNGN0V1kf4BJQZGpAud4qToB+X 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:08PM -0400, Peter Xu wrote: > We've got the macros in uffd-stress.c, move it over and use it in > vm_util.h. > > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > tools/testing/selftests/mm/userfaultfd.c | 8 -------- > tools/testing/selftests/mm/vm_util.c | 16 ++++------------ > tools/testing/selftests/mm/vm_util.h | 8 ++++++++ > 3 files changed, 12 insertions(+), 20 deletions(-) > > diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c > index 4cc80a0e8955..7e841f7e2884 100644 > --- a/tools/testing/selftests/mm/userfaultfd.c > +++ b/tools/testing/selftests/mm/userfaultfd.c > @@ -1389,14 +1389,6 @@ static int userfaultfd_minor_test(void) > return stats.missing_faults != 0 || stats.minor_faults != nr_pages; > } > > -#define BIT_ULL(nr) (1ULL << (nr)) > -#define PM_SOFT_DIRTY BIT_ULL(55) > -#define PM_MMAP_EXCLUSIVE BIT_ULL(56) > -#define PM_UFFD_WP BIT_ULL(57) > -#define PM_FILE BIT_ULL(61) > -#define PM_SWAP BIT_ULL(62) > -#define PM_PRESENT BIT_ULL(63) > - > static int pagemap_open(void) > { > int fd = open("/proc/self/pagemap", O_RDONLY); > diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests/mm/vm_util.c > index 12dc654b5be3..8e9da621764a 100644 > --- a/tools/testing/selftests/mm/vm_util.c > +++ b/tools/testing/selftests/mm/vm_util.c > @@ -25,25 +25,17 @@ uint64_t pagemap_get_entry(int fd, char *start) > > bool pagemap_is_softdirty(int fd, char *start) > { > - uint64_t entry = pagemap_get_entry(fd, start); > - > - // Check if dirty bit (55th bit) is set > - return entry & 0x0080000000000000ull; > + return pagemap_get_entry(fd, start) & PM_SOFT_DIRTY; > } > > bool pagemap_is_swapped(int fd, char *start) > { > - uint64_t entry = pagemap_get_entry(fd, start); > - > - return entry & 0x4000000000000000ull; > + return pagemap_get_entry(fd, start) & PM_SWAP; > } > > bool pagemap_is_populated(int fd, char *start) > { > - uint64_t entry = pagemap_get_entry(fd, start); > - > - /* Present or swapped. */ > - return entry & 0xc000000000000000ull; > + return pagemap_get_entry(fd, start) & (PM_PRESENT | PM_SWAP); > } > > unsigned long pagemap_get_pfn(int fd, char *start) > @@ -51,7 +43,7 @@ unsigned long pagemap_get_pfn(int fd, char *start) > uint64_t entry = pagemap_get_entry(fd, start); > > /* If present (63th bit), PFN is at bit 0 -- 54. */ > - if (entry & 0x8000000000000000ull) > + if (entry & PM_PRESENT) > return entry & 0x007fffffffffffffull; > return -1ul; > } > diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests/mm/vm_util.h > index d7163fff8fb7..d9fadddb5c69 100644 > --- a/tools/testing/selftests/mm/vm_util.h > +++ b/tools/testing/selftests/mm/vm_util.h > @@ -6,6 +6,14 @@ > #include /* ffsl() */ > #include /* _SC_PAGESIZE */ > > +#define BIT_ULL(nr) (1ULL << (nr)) > +#define PM_SOFT_DIRTY BIT_ULL(55) > +#define PM_MMAP_EXCLUSIVE BIT_ULL(56) > +#define PM_UFFD_WP BIT_ULL(57) > +#define PM_FILE BIT_ULL(61) > +#define PM_SWAP BIT_ULL(62) > +#define PM_PRESENT BIT_ULL(63) > + > extern unsigned int __page_size; > extern unsigned int __page_shift; > > -- > 2.39.1 > -- Sincerely yours, Mike.