Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alistair Popple <apopple@nvidia.com>
To:     linux-mm@kvack.org, akpm@linux-foundation.org
Cc:     John Hubbard <jhubbard@nvidia.com>, Peter Xu <peterx@redhat.com>,
        Nadav Amit <nadav.amit@gmail.com>,
        huang ying <huang.ying.caritas@gmail.com>,
        LKML <linux-kernel@vger.kernel.org>,
        "Sierra Guiza, Alejandro (Alex)" <alex.sierra@amd.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        Jason Gunthorpe <jgg@nvidia.com>,
        David Hildenbrand <david@redhat.com>,
        Ralph Campbell <rcampbell@nvidia.com>,
        Matthew Wilcox <willy@infradead.org>,
        Karol Herbst <kherbst@redhat.com>,
        Lyude Paul <lyude@redhat.com>, Ben Skeggs <bskeggs@redhat.com>,
        Logan Gunthorpe <logang@deltatee.com>, paulus@ozlabs.org,
        linuxppc-dev@lists.ozlabs.org, Alistair Popple <apopple@nvidia.com>
Subject: [PATCH] hmm-tests: Fix migrate_dirty_page test
Date:   Tue, 13 Sep 2022 15:22:03 +1000
Message-Id: <20220913052203.177071-1-apopple@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?paSSUZU3juMov6ffL4dJQMhLAXonIW43taVdUGjTl4J5aPzXEXb3EYAaYnG5?=
 =?us-ascii?Q?QkDkzQR3KrfnSchB36CK83Ksx/gnLNF8J7RNzHlZaDe+tDTwkck9pTDr/0Ww?=
 =?us-ascii?Q?rfBBBL6SUGGNPmfLn4BvYuobovozXaigaHhjfx99B6jXCGap8BaIGKiSV/OJ?=
 =?us-ascii?Q?VWQDA0ZzhLyPXhiJ66Al45B0Kasa6ZnnEYL/q8kNlaaMk7g4TyqrIZzMHHSs?=
 =?us-ascii?Q?G7BK0wYuWiQ3GaZT5P3MUpmEbtUNUxOPQHkXXFc3I2GmtpXh1QZeqDjx0ODI?=
 =?us-ascii?Q?BJk5cUX1g1AenTlLUQL0W1DmYP+LVZMZ7Dyeooti6uIwJPiO/7ACvICWj6c2?=
 =?us-ascii?Q?e8B4i+zdsbCdXW+drxc5IrDMqM4D19oCDrFm6+JAkVyhGMQBP35aLUvow8l6?=
 =?us-ascii?Q?lSIvRTczfRY7Eqg2lCP0QBP4kfcOoG/NUYeuBiV5uk12FGPdiD62L797EbEL?=
 =?us-ascii?Q?cd6wUJXNyvQewGXgjjQc0GIiSRw4n3AC+VLDNkv53kB6jC5UQeu/YsgDyofO?=
 =?us-ascii?Q?jkW8iRQ0YkUHsm5P3IoNU7SB+AHitadpejUnEQ4UnfZJVS3BnQn6knWFkDp8?=
 =?us-ascii?Q?brWH703lhvaV6hj5N7twnRHkDNoS5GdA0Ndn/Q0dPRpoO8S6MAox+meM6PEN?=
 =?us-ascii?Q?G11Gb2MLccqEdz3pOhiajZtko5YQ4b5FSdvLmZmtxHXbHm6Y3ge6BzOhwMTM?=
 =?us-ascii?Q?UGzvIcRr39YHG+kc3I8dczJk15/rVYDmJrrg3SQ4L97O2gkVkQhrmmlLDRD/?=
 =?us-ascii?Q?5C7v5KRWi0gvRVq/8Ez3UnGSwLA3B5xkszo6pkCobjAVx7i+WXclFJj8EIO0?=
 =?us-ascii?Q?B7pJ/QnkCaDlMfgh/XeS54xEeY0T0ArMp9soWbLDyIVlwD984aWczR/NGyCZ?=
 =?us-ascii?Q?2dZKvbJbD90Hi1cmSq0ZrPhn1nX9PHzoBWlIrYfw34N3xMiOVm1947OR/Ig9?=
 =?us-ascii?Q?waou7ritJ8AbCgPPEpsmdbneqdPJwL+1BzORuWtl3mq2zdVFcm0ZbpBEvm+o?=
 =?us-ascii?Q?9RwjlpYKLjMC81rSBSvMJHX8bL/zATNtJpc3M+hJMRyFTqZmEu5QIW7zF4eX?=
 =?us-ascii?Q?ppU6Pmx29fFfTtTSPWIVx0wMBeTNI+nKcI312Ups1CAaxgNZYcjbtZAZbiPY?=
 =?us-ascii?Q?ZgRosGVDhiZQIfBarVJRlJ4XkHTPIOhOjpGrsYRZrVJSl4E5bmDXrARv4tHj?=
 =?us-ascii?Q?qHwQE6pmRVbLeE+IL+mS1eriAHStWboRyP82C65+lM7/ha0MTP7yl0yVtiZZ?=
 =?us-ascii?Q?Lo0Q5YdY+vfr1//UvSIyIZ9NIOY4eWxM/n/GcsLIoIhpG7h7UP/OeZ9emUzz?=
 =?us-ascii?Q?HS9ZajVnm5964iZiAdFNMbMafVVM1rOgM4yykeAkwRB/+dO+C8b+XPh5u21X?=
 =?us-ascii?Q?UMngfaUdxcRwYzEb9g72X4r7wFavrnxAXydKbYbEWsW/ELQYY2BIxt0QcR2v?=
 =?us-ascii?Q?w2O/uOfRaOtOPWuO6Q6Zr8GKhQC22MXWhl04Wwj3ydzZBQwvVYtUjj115sjU?=
 =?us-ascii?Q?aegONuYZ4ys3OGysUFRkmvmZavO3iqVODif4T7UUdWADK7uhzqO3iOYL/1tD?=
 =?us-ascii?Q?jX3MVPQcFWKltYkrW5LT+oRBX0srmcOP522QXt1q?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf177e44-39b7-46e1-21b4-08da9547e9af
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2022 05:22:12.3538
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 6EKuWki1n+hThDMmqYPn72Q+MBEZ6wqHbMNZANFjU9+/RkzDq7y2kEh7esJFKOeTOzjY4opK7sEMTMGIQu8FRg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6692
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

As noted by John Hubbard the original test relied on side effects of the
implementation of migrate_vma_setup() to detect if pages had been
swapped to disk or not. This is subject to change in future so
explicitly check for swap entries via pagemap instead. Fix a spelling
mistake while we're at it.

Signed-off-by: Alistair Popple <apopple@nvidia.com>
Fixes: 5cc88e844e87 ("selftests/hmm-tests: add test for dirty bits")
---
 tools/testing/selftests/vm/hmm-tests.c | 50 +++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftests/vm/hmm-tests.c
index 70fdb49b59ed..b5f6a7dc1f12 100644
--- a/tools/testing/selftests/vm/hmm-tests.c
+++ b/tools/testing/selftests/vm/hmm-tests.c
@@ -1261,9 +1261,47 @@ static int destroy_cgroup(void)
 	return 0;
 }
 
+static uint64_t get_pfn(int fd, uint64_t ptr)
+{
+	uint64_t pfn;
+	int ret;
+
+	ret = pread(fd, &pfn, sizeof(ptr),
+		(uint64_t) ptr / getpagesize() * sizeof(ptr));
+	if (ret != sizeof(ptr))
+		return 0;
+
+	return pfn;
+}
+
+#define PAGEMAP_SWAPPED (1ULL << 62)
+
+/* Returns true if at least one page in the range is on swap */
+static bool pages_swapped(void *ptr, unsigned long pages)
+{
+	uint64_t pfn;
+	int fd = open("/proc/self/pagemap", O_RDONLY);
+	unsigned long i;
+
+	if (fd < 0)
+		return false;
+
+	for (i = 0; i < pages; i++) {
+		pfn = get_pfn(fd, (uint64_t) ptr + i * getpagesize());
+
+		if (pfn & PAGEMAP_SWAPPED) {
+			close(fd);
+			return true;
+		}
+	}
+
+	close(fd);
+	return false;
+}
+
 /*
  * Try and migrate a dirty page that has previously been swapped to disk. This
- * checks that we don't loose dirty bits.
+ * checks that we don't lose dirty bits.
  */
 TEST_F(hmm, migrate_dirty_page)
 {
@@ -1300,6 +1338,10 @@ TEST_F(hmm, migrate_dirty_page)
 
 	ASSERT_FALSE(write_cgroup_param(cgroup, "memory.reclaim", 1UL<<30));
 
+	/* Make sure at least some pages got paged to disk. */
+	if (!pages_swapped(buffer->ptr, npages))
+		SKIP(return, "Pages weren't swapped when they should have been");
+
 	/* Fault pages back in from swap as clean pages */
 	for (i = 0, ptr = buffer->ptr; i < size / sizeof(*ptr); ++i)
 		tmp += ptr[i];
@@ -1309,10 +1351,10 @@ TEST_F(hmm, migrate_dirty_page)
 		ptr[i] = i;
 
 	/*
-	 * Attempt to migrate memory to device, which should fail because
-	 * hopefully some pages are backed by swap storage.
+	 * Attempt to migrate memory to device. This might fail if some pages
+	 * are/were backed by swap but that's ok.
 	 */
-	ASSERT_TRUE(hmm_migrate_sys_to_dev(self->fd, buffer, npages));
+	hmm_migrate_sys_to_dev(self->fd, buffer, npages);
 
 	ASSERT_FALSE(write_cgroup_param(cgroup, "memory.reclaim", 1UL<<30));
 
-- 
2.35.1