Skip to contentSkip to conversation

powerpc/pseries/cmm: fix managed page counts when migrating pages between zones

PATCH Applied David Hildenbrand 2 participants 2 messages Dec 16, 2019 – Dec 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 powerpc/pseries/cmm: fix managed page counts when migrating pages between zones

Commit 63341ab03706 (virtio-balloon: fix managed page counts when migrating pages between zones) fixed a long existing BUG in the virtio-balloon driver when pages would get migrated between zones. I did not try to reproduce on powerpc, but looking at the code, the same should apply to powerpc/cmm ever since it started using the balloon compaction infrastructure (luckily just recently).

In case we have to migrate a ballon page to a newpage of another zone, the managed page count of both zones is wrong. Paired with memory offlining (which will adjust the managed page count), we can trigger kernel crashes and all kinds of different symptoms.

Fix it by properly adjusting the managed page count when migrating if the zone changed.

We'll temporarily modify the totalram page count. If this ever becomes a problem, we can fine tune by providing helpers that don't touch the totalram pages (e.g., adjust_zone_managed_page_count()).

Fixes fe030c9b85e6 ("powerpc/pseries/cmm: Implement balloon compaction")
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Richard Fontana <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arun KS <[email protected]>
Cc Thomas Gleixner <[email protected]>

---

v1 -> v2:
- Link virtio-balloon fix commit
- Check if the zone changed
- Move fixup further up, before enqueuing the new newpage (where we are guaranteed to hold a reference to both pages)

---
 arch/powerpc/platforms/pseries/cmm.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/powerpc/platforms/pseries/cmm.c +10 -0
index 91571841df8a..9dba7e880885 100644
@@ -539,6 +539,16 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info,
 	/* balloon page list reference */
 	get_page(newpage);
 
+	/*
+	 * When we migrate a page to a different zone, we have to fixup the
+	 * count of both involved zones as we adjusted the managed page count
+	 * when inflating.
+	 */
+	if (page_zone(page) != page_zone(newpage)) {
+		adjust_managed_page_count(page, 1);
+		adjust_managed_page_count(newpage, -1);
+	}
+
 	spin_lock_irqsave(&b_dev_info->pages_lock, flags);
 	balloon_page_insert(b_dev_info, newpage);
 	balloon_page_delete(page);
Signature · 1 line
2.23.0
#1 lore raw
Quoted 21 lines · David Hildenbrand

Commit 63341ab03706 (virtio-balloon: fix managed page counts when migrati= ng
pages between zones) fixed a long existing BUG in the virtio-balloon driver when pages would get migrated between zones. I did not try to reproduce on powerpc, but looking at the code, the same should apply to powerpc/cmm ever since it started using the balloon compaction infrastructure (luckily just recently).

In case we have to migrate a ballon page to a newpage of another zone, th= e
managed page count of both zones is wrong. Paired with memory offlining (which will adjust the managed page count), we can trigger kernel crashes and all kinds of different symptoms.

Fix it by properly adjusting the managed page count when migrating if the zone changed.

We'll temporarily modify the totalram page count. If this ever becomes a problem, we can fine tune by providing helpers that don't touch the totalram pages (e.g., adjust_zone_managed_page_count()).

Quoted 11 lines
Fixes fe030c9b85e6 ("powerpc/pseries/cmm: Implement balloon compaction")
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Richard Fontana <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Arun KS <[email protected]>
Cc Thomas Gleixner <[email protected]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/e352f576d345e5bf1fb62c8559851448a6c1d9cd

cheers