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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0135CCD1A7 for ; Tue, 21 Oct 2025 15:01:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4CA258E001E; Tue, 21 Oct 2025 11:01:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47AA58E0002; Tue, 21 Oct 2025 11:01:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3697F8E001E; Tue, 21 Oct 2025 11:01:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 1E2418E0002 for ; Tue, 21 Oct 2025 11:01:01 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DEB7BC05DE for ; Tue, 21 Oct 2025 15:01:00 +0000 (UTC) X-FDA: 84022433880.07.1BEAF9A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 336CFC0017 for ; Tue, 21 Oct 2025 15:00:57 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JNx8ZAD1; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1761058858; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+nGTOYp18iZpymN+wDfkqVo+fjPG/wcicD9l6wCBXUY=; b=SYIaeCAmnu3AIsM9LhPXyN5CkNJK4Jn1sHimakTSrbHiqy+o7O6xAIvRlnp+El0QkQThnp +iRWp/oU8flBZpZyLByD+vymHFqtgy9EJUCghsHalByYJcsuRlPrcpImDaKCVFUlQhW6V0 DYr9jKQL16jOd3Q47VUMiL2Q9ihMpsE= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JNx8ZAD1; spf=pass (imf28.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1761058858; a=rsa-sha256; cv=none; b=b866VqJdSFwrR5267MZ4BtApm0Brnf0J7IOpKleCjfI1sFol5JdFHHf7Wxait3jn0S8p5H Gs0oFEJnoUmDzqYl40HD+iDJpaAJ9gZRwKXFDKUHTgvrEITOj1xQe3SFebwpzyTtkK1wu0 5sMmmdFxQ/LHp8F5ia+GpK8UvKksB1Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761058856; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+nGTOYp18iZpymN+wDfkqVo+fjPG/wcicD9l6wCBXUY=; b=JNx8ZAD1q3jOwpPBk4kS0V409ajOa90m94lx8B2/N8W9ULUfMAy71kJSXeDYqOWN7nuksp DOVtMHYn5nPiyAM+ncdV+8wSq8Ncj/Wz5U+cJZUS4ILNNq7764aM6ah5fWnl2eMpCq3f3C 3UCdMuP90zsLcfppXuMZfHun08cPIso= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269--8r5R1rWNx60tUuDvpvBPA-1; Tue, 21 Oct 2025 11:00:54 -0400 X-MC-Unique: -8r5R1rWNx60tUuDvpvBPA-1 X-Mimecast-MFC-AGG-ID: -8r5R1rWNx60tUuDvpvBPA_1761058853 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-47111dc7bdbso46510485e9.0 for ; Tue, 21 Oct 2025 08:00:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761058853; x=1761663653; 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=+nGTOYp18iZpymN+wDfkqVo+fjPG/wcicD9l6wCBXUY=; b=XCaeygV8mypdIMnWBxjtvhNdFlPpMOA8zp0QmS8veOO9TWJFxPGhYJogeM1drh9Nk8 JE17CbYL88px41IOw1s4VGQHjrNQDZ8VS1scNHTVmMZjU10LtGJr5QLLOgtedmtfuAS8 P8efw9qxb5KNjtzpSjgOz04wVp7A9r6brp+AGCF1AwKWBS7EBbXDbo8tP6WnXNJqbO7a 8V8Nu1wJjyYtI8N1Fr2ViKiCiVuRASttkwQs85Q1YX0EaIYDoFhDazbBybJ3VC9v6Jzf AZgvDymRwk8IV8ha7rsI5HYVWZg5rwmt4AEn2mjx4lY1z2iPYQfGUof8p89CeoaARdDP gYaA== X-Gm-Message-State: AOJu0YxWzyKXAXhNA4H/vILHjbJEQfT2gKZjMJ9Te4cRQIzEi9I+U4js FY/Z2+QEjProEw7C4jWl2k30Ji61mmVxisAMtlwsvP9LFOBL9gbMEBKLGqqewN7hn7RmEU1VTGx t19uASFMVuROY2sMqK23aU9CB17n0H0/8Qd0gjLzNeyH61TEAjHB9 X-Gm-Gg: ASbGncsdO2NO/xIbEQM+mgOpcULnagsTW7IkZpShTdmZEDIWUvb47sCuB/ar4N3iEOB SxrPNKloTx3ceAvDH0Y38Vvx4UNKRFcHb6exr1k8NVkSsq7OyntX8fQZn0SW+2PnTsf/FGDj+bV RaqjkStkv9emHmn+ky7afFlEkmiL6CfftfT5SAr+CXnz/9nG7iajkxrwtLD77n8DPcL3LWEWzRe 2s4JMDfcYRFj225CdpwvwCIqzI+wfivWAQDKnT8z266xsIC4aDkZfoE9j0eWJ+rpz9LtvOe8kZP JdIhwbqWrYBjE+3rH8JNckxhsPm8F0d1XqR3z98NYxfOlGQyrwE+4+bfoXR5vnDHis+wOsfxM9w 8nq46/zZck3vRa/FRzzPOlZhtTKew8j0XarKNXByvNUGhYNQEsgTA2ZZ+sJ9M X-Received: by 2002:a05:600c:34d0:b0:46e:37af:f90e with SMTP id 5b1f17b1804b1-4711787441fmr139614755e9.6.1761058852743; Tue, 21 Oct 2025 08:00:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTTgiIrEFbqDE5HfZSqmV7pniP8CbdB50p8AOsZ6Nodq7CpyHUpLxK4mVvDoU4TDBZaM7d4Q== X-Received: by 2002:a05:600c:34d0:b0:46e:37af:f90e with SMTP id 5b1f17b1804b1-4711787441fmr139613955e9.6.1761058852009; Tue, 21 Oct 2025 08:00:52 -0700 (PDT) Received: from localhost (p200300d82f4e3200c99da38b3f3ad4b3.dip0.t-ipconnect.de. [2003:d8:2f4e:3200:c99d:a38b:3f3a:d4b3]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4731c95efb9sm169884335e9.8.2025.10.21.08.00.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Oct 2025 08:00:51 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, Broadcom internal kernel review list , linux-doc@vger.kernel.org, virtualization@lists.linux.dev, Andrew Morton , Oscar Salvador , Lorenzo Stoakes , "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Arnd Bergmann , Greg Kroah-Hartman , Jerrin Shaji George , "Michael S . Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Zi Yan , David Hildenbrand Subject: [PATCH v1 21/23] mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION Date: Tue, 21 Oct 2025 17:00:38 +0200 Message-ID: <20251021150040.498160-5-david@redhat.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251021150040.498160-1-david@redhat.com> References: <20251021125929.377194-1-david@redhat.com> <20251021150040.498160-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 76UAV7kKaWkZu9NIqqktfbR1PqQGVt-doHjiDZBe5uc_1761058853 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 336CFC0017 X-Stat-Signature: xg6zsjq9zgi83cky3yjbg6m1wgywpzc7 X-Rspam-User: X-HE-Tag: 1761058857-852370 X-HE-Meta: U2FsdGVkX1+NBPboJo1FipBNkcviKkab8F4H6QW2sYj0KW1gwn9kgywORlAxTxlNfA4t4KvQoTRH7T1AvbgiCynF8/gimsNXVwBW7KeoB8t/dy50lRYSJPRsUgE8+rHpnufN9jqHClmjmw7L9V8qtBQ1AKHL+yhhdcrkoQ0PI7olx/Fwx2vrkkJG+cEKhqXMwz2h0LMx91b2Zzxg1pLtP70GvsbKRt3u79XnixFiQPTfj+MUZMzL7sK5dWyEwP8n1zpK5Ob+71kHUzIZGiuRs/cAe5aFnDlXMbqALQntmsQen1gooxM6U+DMpaiTU3QA8iy06sYPxHj+sI8x+ydkYDgyFIPEbHGxX9TIVIigt6l5lTXVg+PYA6TOocnnWt8nGkJApRYogMIYDO55f0qOJUlVjPEsq3jViFypB/okskZ5G5zprL9BuReZgxwSdqsC04tR8LViInuh43v316mqbwLIgASlveYlAWNp0doKezMDy2eEXjjrBwqYfg+hZC6mozpExpwZtPw/tJgb5eO7SWRyVn5T72d2Co4Du2MqecRMbz5zpQ1lLc9yLg1ss/vCTCc21TYY9XKw4JfMh1vdxs8ldMkB76pW1HsA7ddAL5uktYBSkykONrw0yz/2sythAACyFYflBhNoLUFdTcjYVLnx6gIJGL/n/X2Xy+/PRmFwSzg/ew13rB7kk5wVeylRxjM88yWozY+suL+FqcXW7QIuY8Uatp9zBlpSV4yyo9xj/SewX05yfjua4GmEAdeb58VPXAjYq7lqVqJzqsQUZUriyyo7SBFCvnxn8qlerf8/d3AlDok97jokCFrGKOtl/lfYC4EdwBQofyI5RoEkiCTsD73Qr1gKOOWji6iijDGlumiswB/sCZdINUpWQV9bsO8UQoOtIcQLnwXZzqIVVbgtuMpdpdeBuzUlyBTrX5NZMJpAwATIG3HirrVldnMdy5VgEGu9dIDKn9Vw9nO RyxzvZH9 tgThB81Ayxczfro706yVnVPwGl/AFz7o+Mvu1ev9SRlveocGVq0mSGCavclaRt7cUwFcqzGLvGV2fpLODYNpD1N86kQvj0BlHlh/cOljnEt1u/oUC0XCC2hpWHlnOwOGVYVXJxs3leoFfKV6WVDmJm5m/XBc+tN86uDBM6Wp6d/TZzLd+tZHBoQx5W05FZSw3rPX7x6G8qsyyYCZ3QI5LPl3QdvFC0JSE/Kh/F2WS1iGf5tBqIM4e1Jsbj8GtmywRVSngJ9SC4MLnd0Rk2v5FtZPk57CBolzqpfu9x0st3eVK5VBOk/w6U4d3ty5L9wngzsRjy2yMhYcwydiFuoqGafM8BoZBlSbn2HXrxwCLx0uDdIZzrS0Lyw7kgHHlPK+t1FNeYNg7+DW9Jdo59TySnm954lfEaAgCzBm/rjUVEDqHtno5U2GyULcxssyIWqqI8QTN6CxVYR7dv0o+plXN0Pg3KgtNtKWeHE9zYMPrMBVsNXaaes1RhQA5CaxjOcvca8PuiKTl7+sCxIF0QnoI80vt7uuCNJB+NuZgeYi5yA4aNLM5BYFE9jQk7qn5+r3zVErshrZaX59qQttueLkHn4tibywf5TXUPfHMAosYdLkpDDV69V4gikB7wkoXWP3X1M294GedB/jfvJfOC9cMQjNliMscSWZUIdcPGouP7ynixiOB1zDv9gS2SQ== 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: List-Subscribe: List-Unsubscribe: While compaction depends on migration, the other direction is not the case. So let's make it clearer that this is all about migration of balloon pages. Adjust all comments/docs in the core to talk about "migration" instead of "compaction". While at it add some "/* CONFIG_BALLOON_MIGRATION */". Signed-off-by: David Hildenbrand --- Documentation/admin-guide/mm/memory-hotplug.rst | 8 ++++---- arch/powerpc/platforms/pseries/cmm.c | 8 ++++---- drivers/misc/vmw_balloon.c | 8 ++++---- drivers/virtio/virtio_balloon.c | 6 +++--- include/linux/balloon.h | 2 +- include/linux/vm_event_item.h | 4 ++-- mm/Kconfig | 4 ++-- mm/balloon.c | 10 +++++----- mm/memory_hotplug.c | 4 ++-- mm/migrate.c | 2 +- mm/vmstat.c | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Documentation/admin-guide/mm/memory-hotplug.rst b/Documentation/admin-guide/mm/memory-hotplug.rst index 33c886f3d1983..8d5f57d1ef48b 100644 --- a/Documentation/admin-guide/mm/memory-hotplug.rst +++ b/Documentation/admin-guide/mm/memory-hotplug.rst @@ -603,11 +603,11 @@ ZONE_MOVABLE, especially when fine-tuning zone ratios: memory for metadata and page tables in the direct map; having a lot of offline memory blocks is not a typical case, though. -- Memory ballooning without balloon compaction is incompatible with - ZONE_MOVABLE. Only some implementations, such as virtio-balloon and - pseries CMM, fully support balloon compaction. +- Memory ballooning without support for balloon memory migration is incompatible + with ZONE_MOVABLE. Only some implementations, such as virtio-balloon and + pseries CMM, fully support balloon memory migration. - Further, the CONFIG_BALLOON_COMPACTION kernel configuration option might be + Further, the CONFIG_BALLOON_MIGRATION kernel configuration option might be disabled. In that case, balloon inflation will only perform unmovable allocations and silently create a zone imbalance, usually triggered by inflation requests from the hypervisor. diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index c5aee15e192ea..9278f6573e17b 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -494,7 +494,7 @@ static struct notifier_block cmm_mem_nb = { .priority = CMM_MEM_HOTPLUG_PRI }; -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION static int cmm_migratepage(struct balloon_dev_info *b_dev_info, struct page *newpage, struct page *page, enum migrate_mode mode) @@ -520,10 +520,10 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info, plpar_page_set_active(page); return 0; } -#else /* CONFIG_BALLOON_COMPACTION */ +#else /* CONFIG_BALLOON_MIGRATION */ int cmm_migratepage(struct balloon_dev_info *b_dev_info, struct page *newpage, struct page *page, enum migrate_mode mode); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ /** * cmm_init - Module initialization @@ -540,7 +540,7 @@ static int cmm_init(void) balloon_devinfo_init(&b_dev_info); b_dev_info.adjust_managed_page_count = true; - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) + if (IS_ENABLED(CONFIG_BALLOON_MIGRATION)) b_dev_info.migratepage = cmm_migratepage; rc = register_oom_notifier(&cmm_oom_nb); diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 7fd3f709108c2..216a163959684 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -1719,7 +1719,7 @@ static inline void vmballoon_debugfs_exit(struct vmballoon *b) #endif /* CONFIG_DEBUG_FS */ -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION /** * vmballoon_migratepage() - migrates a balloon page. * @b_dev_info: balloon device information descriptor. @@ -1803,11 +1803,11 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info, up_read(&b->conf_sem); return ret; } -#else /* CONFIG_BALLOON_COMPACTION */ +#else /* CONFIG_BALLOON_MIGRATION */ int vmballoon_migratepage(struct balloon_dev_info *b_dev_info, struct page *newpage, struct page *page, enum migrate_mode mode); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ static int __init vmballoon_init(void) { @@ -1827,7 +1827,7 @@ static int __init vmballoon_init(void) return error; balloon_devinfo_init(&balloon.b_dev_info); - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) + if (IS_ENABLED(CONFIG_BALLOON_MIGRATION)) balloon.b_dev_info.migratepage = vmballoon_migratepage; INIT_LIST_HEAD(&balloon.huge_pages); diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 5434a7739d588..1a3001f35d3e6 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -802,7 +802,7 @@ static void report_free_page_func(struct work_struct *work) } } -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION /* * virtballoon_migratepage - perform the balloon page migration on behalf of * a compaction thread. (called under page lock) @@ -851,7 +851,7 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info, mutex_unlock(&vb->balloon_lock); return 0; } -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ static unsigned long shrink_free_pages(struct virtio_balloon *vb, unsigned long pages_to_free) @@ -948,7 +948,7 @@ static int virtballoon_probe(struct virtio_device *vdev) if (!virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_DEFLATE_ON_OOM)) vb->vb_dev_info.adjust_managed_page_count = true; -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION vb->vb_dev_info.migratepage = virtballoon_migratepage; #endif if (virtio_has_feature(vdev, VIRTIO_BALLOON_F_FREE_PAGE_HINT)) { diff --git a/include/linux/balloon.h b/include/linux/balloon.h index 82585542300d6..e8da95ca4ad48 100644 --- a/include/linux/balloon.h +++ b/include/linux/balloon.h @@ -45,7 +45,7 @@ /* * Balloon device information descriptor. - * This struct is used to allow the common balloon compaction interface + * This struct is used to allow the common balloon page migration interface * procedures to find the proper balloon device holding memory pages they'll * have to cope for page compaction / migration, as well as it serves the * balloon driver as a page book-keeper for its registered balloon devices. diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 92f80b4d69a6d..fca34d3473b6b 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -125,9 +125,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, #ifdef CONFIG_MEMORY_BALLOON BALLOON_INFLATE, BALLOON_DEFLATE, -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION BALLOON_MIGRATE, -#endif +#endif /* CONFIG_BALLOON_MIGRATION */ #endif #ifdef CONFIG_DEBUG_TLBFLUSH NR_TLB_REMOTE_FLUSH, /* cpu tried to flush others' tlbs */ diff --git a/mm/Kconfig b/mm/Kconfig index 3aff4d05a2d8c..c058a65080d1e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -597,8 +597,8 @@ config MEMORY_BALLOON bool # -# support for memory balloon compaction -config BALLOON_COMPACTION +# support for memory balloon page migration +config BALLOON_MIGRATION bool "Allow for balloon memory migration" default y depends on MIGRATION && MEMORY_BALLOON diff --git a/mm/balloon.c b/mm/balloon.c index 5734dae81e318..8a21c6b9a7f0a 100644 --- a/mm/balloon.c +++ b/mm/balloon.c @@ -34,7 +34,7 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, { lockdep_assert_held(&balloon_pages_lock); __SetPageOffline(page); - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) { + if (IS_ENABLED(CONFIG_BALLOON_MIGRATION)) { SetPageMovableOps(page); set_page_private(page, (unsigned long)balloon); } @@ -51,7 +51,7 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, static inline void balloon_page_finalize(struct page *page) { lockdep_assert_held(&balloon_pages_lock); - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) + if (IS_ENABLED(CONFIG_BALLOON_MIGRATION)) set_page_private(page, 0); /* PageOffline is sticky until the page is freed to the buddy. */ } @@ -153,7 +153,7 @@ struct page *balloon_page_alloc(void) { gfp_t gfp_flags = __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN; - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) + if (IS_ENABLED(CONFIG_BALLOON_MIGRATION)) gfp_flags |= GFP_HIGHUSER_MOVABLE; else gfp_flags |= GFP_HIGHUSER; @@ -232,7 +232,7 @@ struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info) } EXPORT_SYMBOL_GPL(balloon_page_dequeue); -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION static bool balloon_page_isolate(struct page *page, isolate_mode_t mode) @@ -340,4 +340,4 @@ static int __init balloon_init(void) } core_initcall(balloon_init); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 94a8f6e8811ab..44bfac61139b7 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -946,8 +946,8 @@ static struct zone *default_kernel_zone_for_pfn(int nid, unsigned long start_pfn * We rely on "present pages" instead of "managed pages", as the latter is * highly unreliable and dynamic in virtualized environments, and does not * consider boot time allocations. For example, memory ballooning adjusts the - * managed pages when inflating/deflating the balloon, and balloon compaction - * can even migrate inflated pages between zones. + * managed pages when inflating/deflating the balloon, and balloon page + * migration can even migrate inflated pages between zones. * * Using "present pages" is better but some things to keep in mind are: * diff --git a/mm/migrate.c b/mm/migrate.c index ceee354ef2152..cf5e9b13ff28d 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -88,7 +88,7 @@ static const struct movable_operations *page_movable_ops(struct page *page) * back to the buddy. */ if (PageOffline(page)) - /* Only balloon compaction sets PageOffline pages movable. */ + /* Only balloon page migration sets PageOffline pages movable. */ return offline_movable_ops; if (PageZsmalloc(page)) return zsmalloc_movable_ops; diff --git a/mm/vmstat.c b/mm/vmstat.c index 98855f31294dd..8843a8c4914c4 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1434,9 +1434,9 @@ const char * const vmstat_text[] = { #ifdef CONFIG_MEMORY_BALLOON [I(BALLOON_INFLATE)] = "balloon_inflate", [I(BALLOON_DEFLATE)] = "balloon_deflate", -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION [I(BALLOON_MIGRATE)] = "balloon_migrate", -#endif +#endif /* CONFIG_BALLOON_MIGRATION */ #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH [I(NR_TLB_REMOTE_FLUSH)] = "nr_tlb_remote_flush", -- 2.51.0