From nobody Wed Dec 17 10:53:23 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A41F3C77B6E for ; Wed, 12 Apr 2023 16:44:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230507AbjDLQoN (ORCPT ); Wed, 12 Apr 2023 12:44:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230414AbjDLQnt (ORCPT ); Wed, 12 Apr 2023 12:43:49 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 217A37DA5 for ; Wed, 12 Apr 2023 09:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681317757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WqDS6jtSapL9ifdeK9em1EDp4bv+6WCKRXbZ+q/xf6g=; b=aydLCzjAdysOzWn6y1NskRVL5rn64+JYgfuQ+m4pc16bdwtUgi97rITUFC1YjSFMWkfjcD c2FPY22tu+3ew5+OZbw6APQnw3bYEL2lwlADWuTAyIxW6EDV0XAf1yL4DZxS4my5/Gz3+J Dmn/MgSnfo/2yxCiJBjfGO+74xIJpQg= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-423-oE5bAW95O8KLdUysWhjZTQ-1; Wed, 12 Apr 2023 12:42:36 -0400 X-MC-Unique: oE5bAW95O8KLdUysWhjZTQ-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-74acb477be6so2293085a.1 for ; Wed, 12 Apr 2023 09:42:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681317755; x=1683909755; 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=WqDS6jtSapL9ifdeK9em1EDp4bv+6WCKRXbZ+q/xf6g=; b=M7JNEcYTmoVdZiIsZVK7nZN8Qtk0F8ngpjhLy/msI6oorkKelAZpAudYLHjUyvnahJ ADmQghUUx+w/B9/bft19gEQJuf2Kc7o2D5Jxj3KO/0ai4nihphvD/bwAYxJ21oyD+wjz 5Zmw3tA0Cx21M3mbYvYN1b59cjjxtUR4CIYRfm4fsGJboxoCtsVwjsrWhvVDtlbwEL9m nHh3Qx27IQ7GkXW+0ydy8lkKnD7xhRn8SIpL8tt5jByK4Hx7bcKRD+JY6FPz/TeRR7kD IU397wTcwW7atW9DYkKDz/blHqeig44ojIsrZOSah1LAzdL1A+k7fXw9uia6MflNFAtu if2Q== X-Gm-Message-State: AAQBX9eVA6Vv+E2wJePT2fg9MW/MzJh+E24lwSEh2LpOplMaBlnobZfl ay1qCU23Z0p5yAV4FhH90c+fk4tm7ahfLdYbL3UYrYcbn8XkJlBr5hx9nbkIxBMKxp7014PBn0a IaTwmyaJcXgppQQYWv6tU6YNGNQGZ9SQtv2md0/gpzpdXMlaTxgpdXpVhMAWyewfGHSM2ufAeit Njtd4Xtg== X-Received: by 2002:a05:6214:4002:b0:5ac:463b:a992 with SMTP id kd2-20020a056214400200b005ac463ba992mr4597605qvb.0.1681317755030; Wed, 12 Apr 2023 09:42:35 -0700 (PDT) X-Google-Smtp-Source: AKy350ZccWUkGHYWZ2bzm1zWaJsqlvJFElNocxXwtSRv3N+papWfiGQIPvLDwhR7/K1RnRC+7EOELw== X-Received: by 2002:a05:6214:4002:b0:5ac:463b:a992 with SMTP id kd2-20020a056214400200b005ac463ba992mr4597570qvb.0.1681317754674; Wed, 12 Apr 2023 09:42:34 -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 g14-20020a05620a218e00b0074a25a59667sm4749109qka.115.2023.04.12.09.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 09:42:33 -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 09/31] selftests/mm: Reuse pagemap_get_entry() in vm_util.h Date: Wed, 12 Apr 2023 12:42:31 -0400 Message-Id: <20230412164231.328157-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Meanwhile drop pagemap_read_vaddr(). Reviewed-by: Axel Rasmussen Reviewed-by: Mike Kravetz Reviewed-by: David Hildenbrand Reviewed-by: Mike Rapoport (IBM) Signed-off-by: Peter Xu --- 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/selft= ests/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; } =20 -static uint64_t pagemap_read_vaddr(int fd, void *vaddr) -{ - uint64_t value; - int ret; - - ret =3D pread(fd, &value, sizeof(uint64_t), - ((uint64_t)vaddr >> 12) * sizeof(uint64_t)); - if (ret !=3D 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) !=3D wp) \ @@ -1427,7 +1414,7 @@ static int pagemap_test_fork(bool present) if (!child) { /* Open the pagemap fd of the child itself */ fd =3D pagemap_open(); - value =3D pagemap_read_vaddr(fd, area_dst); + value =3D 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 pag= emap_fd) =20 /* Test applying pte marker to anon unpopulated */ wp_range(uffd, (uint64_t)area_dst, page_size, true); - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D pagemap_get_entry(pagemap_fd, area_dst); pagemap_check_wp(value, true); =20 /* Test unprotect on anon pte marker */ wp_range(uffd, (uint64_t)area_dst, page_size, false); - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D pagemap_get_entry(pagemap_fd, area_dst); pagemap_check_wp(value, false); =20 /* 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 =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D pagemap_get_entry(pagemap_fd, area_dst); pagemap_check_wp(value, false); =20 /* Test fault in after marker removed */ *area_dst =3D 1; - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D 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 tes= t_pgsize) /* Touch the page */ *area_dst =3D 1; wp_range(uffd, (uint64_t)area_dst, test_pgsize, true); - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D 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 tes= t_pgsize) err("madvise(MADV_PAGEOUT) failed"); =20 /* Uffd-wp should persist even swapped out */ - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D 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 t= est_pgsize) =20 /* Unprotect; this tests swap pte modifications */ wp_range(uffd, (uint64_t)area_dst, page_size, false); - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D pagemap_get_entry(pagemap_fd, area_dst); pagemap_check_wp(value, false); =20 /* Fault in the page from disk */ *area_dst =3D 2; - value =3D pagemap_read_vaddr(pagemap_fd, area_dst); + value =3D pagemap_get_entry(pagemap_fd, area_dst); pagemap_check_wp(value, false); =20 close(pagemap_fd); --=20 2.39.1