Skip to content

mm: balloon infrastructure cleanups

David Hildenbrand (Red Hat) linux-doc linux-mm linuxppc-dev lkml virtualization 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest24 patches 2 repliesIn review 23 of 24 applied
  2. v223 patches 41 repliesSuperseded

Changes in v3 from the cover letter

* "mm/balloon_compaction: centralize basic page migration handling" -> Remove newline
-> Talk about "page" instead of "old page"
-> avoid the switch statement
* "mm/balloon_compaction: move internal helpers to balloon_compaction.c" -> No need to carry over the "inline"
* "fixup mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION -> Remove some more "balloon page compaction" thingies
* "MAINTAINERS: move memory balloon infrastructure to "MEMORY MANAGEMENT - BALLOON"
-> CC the virt list and use the proper mail address
* "mm/balloon_compaction: improve comments for WARN_ON_ONCE(!b_dev_info) -> Added

Patches in v3 23 of 24 applied

#Subject and filesSizeRepliesApplied
1/24vmw_balloon: adjust BALLOON_DEFLATE when deflating while migratingdrivers/misc/vmw_balloon.c+2 -00 repliesApplied
2/24vmw_balloon: remove vmballoon_compaction_init()drivers/misc/vmw_balloon.c+5 -250 repliesApplied
3/24powerpc/pseries/cmm: remove cmm_balloon_compaction_init()arch/powerpc/platforms/pseries/cmm.c+5 -110 repliesApplied
4/24mm/balloon_compaction: improve comments for WARN_ON_ONCE(!b_dev_info)mm/balloon_compaction.c+10 -20 repliesApplied
5/24mm/balloon_compaction: centralize basic page migration handlingarch/powerpc/platforms/pseries/cmm.c drivers/misc/vmw_balloon.c drivers/virtio/virtio_balloon.c +1 more+35 -730 repliesApplied
6/24mm/balloon_compaction: centralize adjust_managed_page_count() handlingarch/powerpc/platforms/pseries/cmm.c drivers/virtio/virtio_balloon.c include/linux/balloon_compaction.h +1 more+22 -290 repliesApplied
7/24vmw_balloon: stop using the balloon_dev_info lockdrivers/misc/vmw_balloon.c+12 -80 repliesApplied
8/24mm/balloon_compaction: use a device-independent balloon (list) lockinclude/linux/balloon_compaction.h mm/balloon_compaction.c+22 -180 repliesApplied
9/24mm/balloon_compaction: remove dependency on page lockinclude/linux/balloon_compaction.h mm/balloon_compaction.c+25 -380 repliesApplied
10/24mm/balloon_compaction: make balloon_mops staticinclude/linux/balloon_compaction.h mm/balloon_compaction.c+1 -20 repliesApplied
11/24mm/balloon_compaction: drop fs.h include from balloon_compaction.hinclude/linux/balloon_compaction.h+0 -10 repliesApplied
12/24drivers/virtio/virtio_balloon: stop using balloon_page_push/pop()drivers/virtio/virtio_balloon.c+15 -100 repliesApplied
13/24mm/balloon_compaction: remove balloon_page_push/pop()include/linux/balloon_compaction.h mm/balloon_compaction.c+2 -330 repliesApplied
14/24mm/balloon_compaction: fold balloon_mapping_gfp_mask() into balloon_page_alloc()include/linux/balloon_compaction.h mm/balloon_compaction.c+8 -110 repliesApplied
15/24mm/balloon_compaction: move internal helpers to balloon_compaction.cinclude/linux/balloon_compaction.h mm/balloon_compaction.c+38 -441 reply
16/24mm/balloon_compaction: assert that the balloon_pages_lock is heldmm/balloon_compaction.c+2 -00 repliesApplied
17/24mm/balloon_compaction: mark remaining functions for having proper kerneldocmm/balloon_compaction.c+5 -50 repliesApplied
18/24mm/balloon_compaction: remove "extern" from functionsinclude/linux/balloon_compaction.h+8 -80 repliesApplied
19/24mm/vmscan: drop inclusion of balloon_compaction.hmm/vmscan.c+0 -10 repliesApplied
20/24mm: rename balloon_compaction.(c|h) to balloon.(c|h)Documentation/core-api/mm-api.rst MAINTAINERS arch/powerpc/platforms/pseries/cmm.c +5 more+15 -170 repliesApplied
21/24mm/kconfig: make BALLOON_COMPACTION depend on MIGRATIONmm/Kconfig+7 -100 repliesApplied
22/24mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATIONDocumentation/admin-guide/mm/memory-hotplug.rst arch/powerpc/platforms/pseries/cmm.c drivers/misc/vmw_balloon.c +8 more+35 -350 repliesApplied
23/24mm: rename CONFIG_MEMORY_BALLOON -> CONFIG_BALLOONarch/powerpc/platforms/pseries/Kconfig drivers/misc/Kconfig drivers/virtio/Kconfig +4 more+10 -100 repliesApplied
24/24MAINTAINERS: move memory balloon infrastructure to "MEMORY MANAGEMENT - BALLOON"MAINTAINERS+11 -20 repliesApplied

Reviews trailers per patch

23 of 24 patches have a Reviewed-by or Acked-by.

PatchSeongJae ParkLorenzo StoakesMichael S. TsirkinLiam R. HowlettVlastimil Babka
1/24R-b R-b A-b
2/24R-b A-b
3/24R-b A-b
4/24
5/24A-b
6/24A-b A-b
7/24R-b A-b
8/24A-b
9/24A-b
10/24R-b A-b
11/24R-b A-b
12/24R-b A-b
13/24R-b A-b
14/24R-b A-b
15/24R-b A-b
16/24R-b A-b
17/24R-b A-b
18/24R-b A-b
19/24R-b A-b
20/24R-b A-b
21/24R-b A-b
22/24R-b A-b
23/24R-b A-b
24/24A-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v3 thread

Cover letter [PATCH v3 00/24] mm: balloon infrastructure cleanups

I started with wanting to remove the dependency of the balloon infrastructure on the page lock, but ended up performing various other cleanups, some of which I had on my todo list for years.

This series heavily cleans up and simplifies our balloon infrastructure, including our balloon page migration functionality.

With this series, we no longer make use of the page lock for PageOffline pages as part of the balloon infrastructure (preparing for memdescs where PageOffline pages won't have any such lock), and simplifies migration handling such that refcounting can more easily be adjusted later (long-term focus is for PageOffline pages to not have a refcount either).

Plenty of related cleanups.

Heavily compile-tested and heavily runtime-tested with virtio-balloon. PPC CMM and the VMware balloon are untested and I'd appreciate a helping hand from people that have suitable environments.

Not CCing maintainers for the vmscan.c and migrate.c change as they are rather trivial and I don't want to patchbomb them.

--

v2 -> v3:
* "mm/balloon_compaction: centralize basic page migration handling" -> Remove newline
-> Talk about "page" instead of "old page"
-> avoid the switch statement
* "mm/balloon_compaction: move internal helpers to balloon_compaction.c" -> No need to carry over the "inline"
* "fixup mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION -> Remove some more "balloon page compaction" thingies
* "MAINTAINERS: move memory balloon infrastructure to "MEMORY MANAGEMENT - BALLOON"
-> CC the virt list and use the proper mail address
* "mm/balloon_compaction: improve comments for WARN_ON_ONCE(!b_dev_info) -> Added

v1 -> v2:
* Rebased to latest mm/mm-unstable without any conflicts
* Minor patch description/subject and comment fixups
* Retested

Cc Andrew Morton <[email protected]>
Cc Oscar Salvador <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc "Liam R. Howlett" <[email protected]>
Cc Vlastimil Babka <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Madhavan Srinivasan <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Jerrin Shaji George <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>
Cc Jason Wang <[email protected]>
Cc Xuan Zhuo <[email protected]>
Cc "Eugenio Pérez" <[email protected]>
Cc Zi Yan <[email protected]>

David Hildenbrand (Red Hat) (24):
vmw_balloon: adjust BALLOON_DEFLATE when deflating while migrating
vmw_balloon: remove vmballoon_compaction_init() powerpc/pseries/cmm: remove cmm_balloon_compaction_init() mm/balloon_compaction: improve comments for WARN_ON_ONCE(!b_dev_info) mm/balloon_compaction: centralize basic page migration handling mm/balloon_compaction: centralize adjust_managed_page_count() handling
vmw_balloon: stop using the balloon_dev_info lock mm/balloon_compaction: use a device-independent balloon (list) lock mm/balloon_compaction: remove dependency on page lock mm/balloon_compaction: make balloon_mops static mm/balloon_compaction: drop fs.h include from balloon_compaction.h drivers/virtio/virtio_balloon: stop using balloon_page_push/pop() mm/balloon_compaction: remove balloon_page_push/pop() mm/balloon_compaction: fold balloon_mapping_gfp_mask() into
balloon_page_alloc()
mm/balloon_compaction: move internal helpers to balloon_compaction.c mm/balloon_compaction: assert that the balloon_pages_lock is held mm/balloon_compaction: mark remaining functions for having proper
kerneldoc
mm/balloon_compaction: remove "extern" from functions mm/vmscan: drop inclusion of balloon_compaction.h
mm: rename balloon_compaction.(c|h) to balloon.(c|h) mm/kconfig: make BALLOON_COMPACTION depend on MIGRATION
mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION
mm: rename CONFIG_MEMORY_BALLOON -> CONFIG_BALLOON
MAINTAINERS: move memory balloon infrastructure to "MEMORY MANAGEMENT
- BALLOON"

 .../admin-guide/mm/memory-hotplug.rst         |   8 +-
 Documentation/core-api/mm-api.rst             |   2 +-
 MAINTAINERS                                   |  13 +-
 arch/powerpc/platforms/pseries/Kconfig        |   2 +-
 arch/powerpc/platforms/pseries/cmm.c          |  53 +----
 drivers/misc/Kconfig                          |   2 +-
 drivers/misc/vmw_balloon.c                    | 105 +++------
 drivers/virtio/Kconfig                        |   2 +-
 drivers/virtio/virtio_balloon.c               |  64 ++----
 include/linux/balloon.h                       |  77 +++++++
 include/linux/balloon_compaction.h            | 160 --------------
 include/linux/vm_event_item.h                 |   8 +-
 mm/Kconfig                                    |  23 +-
 mm/Makefile                                   |   2 +-
 mm/{balloon_compaction.c => balloon.c}        | 200 ++++++++++++------
 mm/memory_hotplug.c                           |   4 +-
 mm/migrate.c                                  |   2 +-
 mm/vmscan.c                                   |   1 -
 mm/vmstat.c                                   |   8 +-
 19 files changed, 319 insertions(+), 417 deletions(-)
 create mode 100644 include/linux/balloon.h
 delete mode 100644 include/linux/balloon_compaction.h
 rename mm/{balloon_compaction.c => balloon.c} (58%)

base-commit: f8ed52ac0cfbddff992bb9600941bfe51e1e385a

Signature · 1 line
2.52.0