Skip to contentSkip to conversation

xen/balloon: fixes for memory hotplug

PATCH Applied Roger Pau Monne 6 participants 18 messages Jul 27, 2020 – Aug 3, 2020

Subsystems (6)

v3 of 5 Applied Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover xen/balloon: fixes for memory hotplug

Hello,

The following series contain some fixes in order to split Xen unpopulated memory handling from the ballooning driver if ZONE_DEVICE is available, so that physical memory regions used to map foreign pages are not tied to memory hotplug.

First two patches are bugfixes that IMO should be backported to stable branches, third patch is a revert of a workaround applied to the balloon driver and last patch introduces an interface based on ZONE_DEVICE in order to manage regions to use for foreign mappings.

Thanks, Roger.

Roger Pau Monne (4):
xen/balloon: fix accounting in alloc_xenballooned_pages error path xen/balloon: make the balloon wait interruptible
Revert "xen/balloon: Fix crash when ballooning on x86 32 bit PAE"
xen: add helpers to allocate unpopulated memory

 drivers/gpu/drm/xen/xen_drm_front_gem.c |   9 +-
 drivers/xen/Makefile                    |   1 +
 drivers/xen/balloon.c                   |  30 ++--
 drivers/xen/grant-table.c               |   4 +-
 drivers/xen/privcmd.c                   |   4 +-
 drivers/xen/unpopulated-alloc.c         | 185 ++++++++++++++++++++++++
 drivers/xen/xenbus/xenbus_client.c      |   6 +-
 drivers/xen/xlate_mmu.c                 |   4 +-
 include/xen/xen.h                       |   9 ++
 9 files changed, 221 insertions(+), 31 deletions(-)
 create mode 100644 drivers/xen/unpopulated-alloc.c
Signature · 1 line
2.27.0
#1 lore raw

PATCH v3 1/4 xen/balloon: fix accounting in alloc_xenballooned_pages error path

target_unpopulated is incremented with nr_pages at the start of the function, but the call to free_xenballooned_pages will only subtract pgno number of pages, and thus the rest need to be subtracted before returning or else accounting will be skewed.

---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: [email protected]

---
 drivers/xen/balloon.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/xen/balloon.c +6 -0
index 77c57568e5d7..3cb10ed32557 100644
@@ -630,6 +630,12 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages)
  out_undo:
 	mutex_unlock(&balloon_mutex);
 	free_xenballooned_pages(pgno, pages);
+	/*
+	 * NB: free_xenballooned_pages will only subtract pgno pages, but since
+	 * target_unpopulated is incremented with nr_pages at the start we need
+	 * to remove the remaining ones also, or accounting will be screwed.
+	 */
+	balloon_stats.target_unpopulated -= nr_pages - pgno;
 	return ret;
 }
 EXPORT_SYMBOL(alloc_xenballooned_pages);
Signature · 1 line
2.27.0
maintainer Applied
#2 lore raw

Re: [PATCH v3 1/4] xen/balloon: fix accounting in alloc_xenballooned_pages error path

Quoted 8 lines · Roger Pau Monne

target_unpopulated is incremented with nr_pages at the start of the function, but the call to free_xenballooned_pages will only subtract pgno number of pages, and thus the rest need to be subtracted before returning or else accounting will be skewed.

Pushed to xen/tip.git for-linus-5.9

Juergen

#3 lore raw

PATCH v3 2/4 xen/balloon: make the balloon wait interruptible

In reply to Roger Pau Monne

So it can be killed, or else processes can get hung indefinitely waiting for balloon pages.

---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: [email protected]

---
 drivers/xen/balloon.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/xen/balloon.c +4 -2
index 3cb10ed32557..292413b27575 100644
@@ -568,11 +568,13 @@ static int add_ballooned_pages(int nr_pages)
 	if (xen_hotplug_unpopulated) {
 		st = reserve_additional_memory();
 		if (st != BP_ECANCELED) {
+			int rc;
+
 			mutex_unlock(&balloon_mutex);
-			wait_event(balloon_wq,
+			rc = wait_event_interruptible(balloon_wq,
 				   !list_empty(&ballooned_pages));
 			mutex_lock(&balloon_mutex);
-			return 0;
+			return rc ? -ENOMEM : 0;
 		}
 	}
 
Signature · 1 line
2.27.0
#5 lore raw

PATCH v3 3/4 Revert "xen/balloon: Fix crash when ballooning on x86 32 bit PAE"

In reply to Roger Pau Monne

This reverts commit dfd74a1edfaba5864276a2859190a8d242d18952.

This has been fixed by commit dca4436d1cf9e0d237c which added the out of bounds check to __add_memory, so that trying to add blocks past MAX_PHYSMEM_BITS will fail.

Note the check in the Xen balloon driver was bogus anyway, as it checked the start address of the resource, but it should instead test the end address to assert the whole resource falls below MAX_PHYSMEM_BITS.

---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: [email protected]

---
 drivers/xen/balloon.c | 14 --------------
 1 file changed, 14 deletions(-)
drivers/xen/balloon.c +0 -14
index 292413b27575..b1d8b028bf80 100644
@@ -266,20 +266,6 @@ static struct resource *additional_memory_resource(phys_addr_t size)
 		return NULL;
 	}
 
-#ifdef CONFIG_SPARSEMEM
-	{
-		unsigned long limit = 1UL << (MAX_PHYSMEM_BITS - PAGE_SHIFT);
-		unsigned long pfn = res->start >> PAGE_SHIFT;
-
-		if (pfn > limit) {
-			pr_err("New System RAM resource outside addressable RAM (%lu > %lu)\n",
-			       pfn, limit);
-			release_memory_resource(res);
-			return NULL;
-		}
-	}
-#endif
-
 	return res;
 }
 
Signature · 1 line
2.27.0
maintainer
#6 lore raw

Re: [PATCH v3 3/4] Revert "xen/balloon: Fix crash when ballooning on x86 32 bit PAE"

Quoted 6 lines · Roger Pau Monne

This reverts commit dfd74a1edfaba5864276a2859190a8d242d18952.

This has been fixed by commit dca4436d1cf9e0d237c which added the out of bounds check to __add_memory, so that trying to add blocks past MAX_PHYSMEM_BITS will fail.

Quoted 7 lines

Note the check in the Xen balloon driver was bogus anyway, as it checked the start address of the resource, but it should instead test the end address to assert the whole resource falls below MAX_PHYSMEM_BITS.

Pushed to: xen/tip.git for-linus-5.9

Juergen

#7 lore raw

PATCH v3 4/4 xen: add helpers to allocate unpopulated memory

In reply to Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

---
I've not added a new memory_type type and just used MEMORY_DEVICE_DEVDAX which seems to be what we want for such memory regions. I'm unsure whether abusing this type is fine, or if I should instead add a specific type, maybe MEMORY_DEVICE_GENERIC? I don't think we should be using a specific Xen type at all.
---
Cc: Oleksandr Andrushchenko <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Dan Carpenter <[email protected]>
Cc: Roger Pau Monne <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Yan Yankovskyi <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: David Hildenbrand <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Dan Williams <[email protected]>
---
Changes since v2:
- Drop BUILD_BUG_ON regarding PVMMU page sizes.
- Use a SPDX license identifier.
- Call fill with only the minimum required number of pages.
- Include xen.h header in xen_drm_front_gem.c.
- Use less generic function names.
- Exit early from the init function if not a PV guest.
- Don't use all caps for region name.

---
 drivers/gpu/drm/xen/xen_drm_front_gem.c |   9 +-
 drivers/xen/Makefile                    |   1 +
 drivers/xen/balloon.c                   |   4 +-
 drivers/xen/grant-table.c               |   4 +-
 drivers/xen/privcmd.c                   |   4 +-
 drivers/xen/unpopulated-alloc.c         | 185 ++++++++++++++++++++++++
 drivers/xen/xenbus/xenbus_client.c      |   6 +-
 drivers/xen/xlate_mmu.c                 |   4 +-
 include/xen/xen.h                       |   9 ++
 9 files changed, 211 insertions(+), 15 deletions(-)
 create mode 100644 drivers/xen/unpopulated-alloc.c
drivers/gpu/drm/xen/xen_drm_front_gem.c +5 -4
index f0b85e094111..270e1bd3e4da 100644
@@ -18,6 +18,7 @@
 #include <drm/drm_probe_helper.h>
 
 #include <xen/balloon.h>
+#include <xen/xen.h>
 
 #include "xen_drm_front.h"
 #include "xen_drm_front_gem.h"
@@ -99,8 +100,8 @@ static struct xen_gem_object *gem_create(struct drm_device *dev, size_t size)
 		 * allocate ballooned pages which will be used to map
 		 * grant references provided by the backend
 		 */
-		ret = alloc_xenballooned_pages(xen_obj->num_pages,
-					       xen_obj->pages);
+		ret = xen_alloc_unpopulated_pages(xen_obj->num_pages,
+					          xen_obj->pages);
 		if (ret < 0) {
 			DRM_ERROR("Cannot allocate %zu ballooned pages: %d\n",
 				  xen_obj->num_pages, ret);
@@ -152,8 +153,8 @@ void xen_drm_front_gem_free_object_unlocked(struct drm_gem_object *gem_obj)
 	} else {
 		if (xen_obj->pages) {
 			if (xen_obj->be_alloc) {
-				free_xenballooned_pages(xen_obj->num_pages,
-							xen_obj->pages);
+				xen_free_unpopulated_pages(xen_obj->num_pages,
+							   xen_obj->pages);
 				gem_free_pages_array(xen_obj);
 			} else {
 				drm_gem_put_pages(&xen_obj->base,
drivers/xen/Makefile +1 -0
index 0d322f3d90cd..788a5d9c8ef0 100644
@@ -42,3 +42,4 @@ xen-gntdev-$(CONFIG_XEN_GNTDEV_DMABUF)	+= gntdev-dmabuf.o
 xen-gntalloc-y				:= gntalloc.o
 xen-privcmd-y				:= privcmd.o privcmd-buf.o
 obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF)	+= xen-front-pgdir-shbuf.o
+obj-$(CONFIG_ZONE_DEVICE)		+= unpopulated-alloc.o
drivers/xen/balloon.c +2 -2
index b1d8b028bf80..815ef10eb2ff 100644
@@ -654,7 +654,7 @@ void free_xenballooned_pages(int nr_pages, struct page **pages)
 }
 EXPORT_SYMBOL(free_xenballooned_pages);
 
-#ifdef CONFIG_XEN_PV
+#if defined(CONFIG_XEN_PV) && !defined(CONFIG_ZONE_DEVICE)
 static void __init balloon_add_region(unsigned long start_pfn,
 				      unsigned long pages)
 {
@@ -708,7 +708,7 @@ static int __init balloon_init(void)
 	register_sysctl_table(xen_root);
 #endif
 
-#ifdef CONFIG_XEN_PV
+#if defined(CONFIG_XEN_PV) && !defined(CONFIG_ZONE_DEVICE)
 	{
 		int i;
 
drivers/xen/grant-table.c +2 -2
index 8d06bf1cc347..523dcdf39cc9 100644
@@ -801,7 +801,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages)
 {
 	int ret;
 
-	ret = alloc_xenballooned_pages(nr_pages, pages);
+	ret = xen_alloc_unpopulated_pages(nr_pages, pages);
 	if (ret < 0)
 		return ret;
 
@@ -836,7 +836,7 @@ EXPORT_SYMBOL_GPL(gnttab_pages_clear_private);
 void gnttab_free_pages(int nr_pages, struct page **pages)
 {
 	gnttab_pages_clear_private(nr_pages, pages);
-	free_xenballooned_pages(nr_pages, pages);
+	xen_free_unpopulated_pages(nr_pages, pages);
 }
 EXPORT_SYMBOL_GPL(gnttab_free_pages);
 
drivers/xen/privcmd.c +2 -2
index a250d118144a..56000ab70974 100644
@@ -425,7 +425,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs)
 	if (pages == NULL)
 		return -ENOMEM;
 
-	rc = alloc_xenballooned_pages(numpgs, pages);
+	rc = xen_alloc_unpopulated_pages(numpgs, pages);
 	if (rc != 0) {
 		pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,
 			numpgs, rc);
@@ -900,7 +900,7 @@ static void privcmd_close(struct vm_area_struct *vma)
 
 	rc = xen_unmap_domain_gfn_range(vma, numgfns, pages);
 	if (rc == 0)
-		free_xenballooned_pages(numpgs, pages);
+		xen_free_unpopulated_pages(numpgs, pages);
 	else
 		pr_crit("unable to unmap MFN range: leaking %d pages. rc=%d\n",
 			numpgs, rc);
drivers/xen/unpopulated-alloc.c new file +185 -0

185 lines not on this page · raw message

drivers/xen/xenbus/xenbus_client.c +3 -3
index 786fbb7d8be0..70b6c4780fbd 100644
@@ -615,7 +615,7 @@ static int xenbus_map_ring_hvm(struct xenbus_device *dev,
 	bool leaked = false;
 	unsigned int nr_pages = XENBUS_PAGES(nr_grefs);
 
-	err = alloc_xenballooned_pages(nr_pages, node->hvm.pages);
+	err = xen_alloc_unpopulated_pages(nr_pages, node->hvm.pages);
 	if (err)
 		goto out_err;
 
@@ -656,7 +656,7 @@ static int xenbus_map_ring_hvm(struct xenbus_device *dev,
 			 addr, nr_pages);
  out_free_ballooned_pages:
 	if (!leaked)
-		free_xenballooned_pages(nr_pages, node->hvm.pages);
+		xen_free_unpopulated_pages(nr_pages, node->hvm.pages);
  out_err:
 	return err;
 }
@@ -852,7 +852,7 @@ static int xenbus_unmap_ring_hvm(struct xenbus_device *dev, void *vaddr)
 			       info.addrs);
 	if (!rv) {
 		vunmap(vaddr);
-		free_xenballooned_pages(nr_pages, node->hvm.pages);
+		xen_free_unpopulated_pages(nr_pages, node->hvm.pages);
 	}
 	else
 		WARN(1, "Leaking %p, size %u page(s)\n", vaddr, nr_pages);
drivers/xen/xlate_mmu.c +2 -2
index 7b1077f0abcb..34742c6e189e 100644
@@ -232,7 +232,7 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
 		kfree(pages);
 		return -ENOMEM;
 	}
-	rc = alloc_xenballooned_pages(nr_pages, pages);
+	rc = xen_alloc_unpopulated_pages(nr_pages, pages);
 	if (rc) {
 		pr_warn("%s Couldn't balloon alloc %ld pages rc:%d\n", __func__,
 			nr_pages, rc);
@@ -249,7 +249,7 @@ int __init xen_xlate_map_ballooned_pages(xen_pfn_t **gfns, void **virt,
 	if (!vaddr) {
 		pr_warn("%s Couldn't map %ld pages rc:%d\n", __func__,
 			nr_pages, rc);
-		free_xenballooned_pages(nr_pages, pages);
+		xen_free_unpopulated_pages(nr_pages, pages);
 		kfree(pages);
 		kfree(pfns);
 		return -ENOMEM;
include/xen/xen.h +9 -0
index 19a72f591e2b..e93b47e5e378 100644
@@ -52,4 +52,13 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
 extern u64 xen_saved_max_mem_size;
 #endif
 
+#ifdef CONFIG_ZONE_DEVICE
+int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages);
+void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages);
+#else
+#define xen_alloc_unpopulated_pages alloc_xenballooned_pages
+#define xen_free_unpopulated_pages free_xenballooned_pages
+#include <xen/balloon.h>
+#endif
+
 #endif	/* _XEN_XEN_H */
Signature · 1 line
2.27.0
maintainer Reviewed-by on v3 4/4
#8 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

Quoted 21 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

Quoted 7 lines

---
I've not added a new memory_type type and just used MEMORY_DEVICE_DEVDAX which seems to be what we want for such memory regions. I'm unsure whether abusing this type is fine, or if I should instead add a specific type, maybe MEMORY_DEVICE_GENERIC? I don't think we should be using a specific Xen type at all.

What about introducing MEMORY_DEVICE_VIRT? The comment for MEMORY_DEVICE_DEVDAX doesn't really fit, as there is no character device involved.

In the end its the memory management maintainers to decide that.

Other than that you can have my

Juergen
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#9 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

In reply to Roger Pau Monne
Thank you for the patch! Yet something to improve:

Hi Roger,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on xen-tip/linux-next]
[also build test ERROR on linus/master v5.8-rc7 next-20200727] [cannot apply to linux/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Roger-Pau-Monne/xen-balloon-fixes-for-memory-hotplug/20200727-171643
base:   https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git linux-next
config: i386-randconfig-a001-20200727 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-14) 9.3.0
reproduce (this is a W=1 build):
        # save the attached .config to linux build tree
        make W=1 ARCH=i386 

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

In file included from include/xen/xen.h:61,
from drivers/xen/xen-front-pgdir-shbuf.c:18:
include/xen/balloon.h:8:8: error: redefinition of 'struct balloon_stats'

       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from drivers/xen/xen-front-pgdir-shbuf.c:17:
   include/xen/balloon.h:8:8: note: originally defined here
       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/xen-front-pgdir-shbuf.c:18:
   include/xen/balloon.h:23:29: error: conflicting types for 'balloon_stats'
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from drivers/xen/xen-front-pgdir-shbuf.c:17:
   include/xen/balloon.h:23:29: note: previous declaration of 'balloon_stats' was here
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/xen-front-pgdir-shbuf.c:18:
>> include/xen/balloon.h:33:20: error: redefinition of 'xen_balloon_init'

33 | static inline void xen_balloon_init(void)
| ^~~~~~~~~~~~~~~~
In file included from drivers/xen/xen-front-pgdir-shbuf.c:17:
include/xen/balloon.h:33:20: note: previous definition of 'xen_balloon_init' was here
33 | static inline void xen_balloon_init(void)
| ^~~~~~~~~~~~~~~~
--
In file included from drivers/xen/balloon.c:71:
include/xen/balloon.h:8:8: error: redefinition of 'struct balloon_stats'

       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/balloon.c:68:
   include/xen/balloon.h:8:8: note: originally defined here
       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from drivers/xen/balloon.c:71:
   include/xen/balloon.h:23:29: error: conflicting types for 'balloon_stats'
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/balloon.c:68:
   include/xen/balloon.h:23:29: note: previous declaration of 'balloon_stats' was here
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from drivers/xen/balloon.c:71:
>> include/xen/balloon.h:33:20: error: redefinition of 'xen_balloon_init'
      33 | static inline void xen_balloon_init(void)
         |                    ^~~~~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/balloon.c:68:
   include/xen/balloon.h:33:20: note: previous definition of 'xen_balloon_init' was here
      33 | static inline void xen_balloon_init(void)
         |                    ^~~~~~~~~~~~~~~~
   drivers/xen/balloon.c:138:22: error: conflicting types for 'balloon_stats'
     138 | struct balloon_stats balloon_stats;
         |                      ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/balloon.c:68:
   include/xen/balloon.h:23:29: note: previous declaration of 'balloon_stats' was here
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from include/linux/linkage.h:7,
                    from include/linux/kernel.h:8,
                    from arch/x86/include/asm/percpu.h:45,
                    from arch/x86/include/asm/current.h:6,
                    from include/linux/sched.h:12,
                    from include/linux/ratelimit.h:6,
                    from include/linux/dev_printk.h:16,
                    from include/linux/device.h:15,
                    from include/linux/node.h:18,
                    from include/linux/cpu.h:17,
                    from drivers/xen/balloon.c:41:
   drivers/xen/balloon.c:139:19: error: conflicting types for 'balloon_stats'
     139 | EXPORT_SYMBOL_GPL(balloon_stats);
         |                   ^~~~~~~~~~~~~
   include/linux/export.h:98:21: note: in definition of macro '___EXPORT_SYMBOL'
      98 |  extern typeof(sym) sym;       \
         |                     ^~~
   include/linux/export.h:155:34: note: in expansion of macro '__EXPORT_SYMBOL'
     155 | #define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "")
         |                                  ^~~~~~~~~~~~~~~
   include/linux/export.h:159:33: note: in expansion of macro '_EXPORT_SYMBOL'
     159 | #define EXPORT_SYMBOL_GPL(sym)  _EXPORT_SYMBOL(sym, "_gpl")
         |                                 ^~~~~~~~~~~~~~
   drivers/xen/balloon.c:139:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL'
     139 | EXPORT_SYMBOL_GPL(balloon_stats);
         | ^~~~~~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from drivers/xen/balloon.c:68:
   include/xen/balloon.h:23:29: note: previous declaration of 'balloon_stats' was here
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
--
   In file included from include/xen/xen.h:61,
                    from arch/x86/include/asm/xen/events.h:5,
                    from include/xen/events.h:13,
                    from drivers/xen/xenbus/xenbus_client.c:44:
   include/xen/balloon.h:8:8: error: redefinition of 'struct balloon_stats'
       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from drivers/xen/xenbus/xenbus_client.c:43:
   include/xen/balloon.h:8:8: note: originally defined here
       8 | struct balloon_stats {
         |        ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from arch/x86/include/asm/xen/events.h:5,
                    from include/xen/events.h:13,
                    from drivers/xen/xenbus/xenbus_client.c:44:
   include/xen/balloon.h:23:29: error: conflicting types for 'balloon_stats'
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from drivers/xen/xenbus/xenbus_client.c:43:
   include/xen/balloon.h:23:29: note: previous declaration of 'balloon_stats' was here
      23 | extern struct balloon_stats balloon_stats;
         |                             ^~~~~~~~~~~~~
   In file included from include/xen/xen.h:61,
                    from arch/x86/include/asm/xen/events.h:5,
                    from include/xen/events.h:13,
                    from drivers/xen/xenbus/xenbus_client.c:44:
>> include/xen/balloon.h:33:20: error: redefinition of 'xen_balloon_init'
      33 | static inline void xen_balloon_init(void)
         |                    ^~~~~~~~~~~~~~~~
   In file included from drivers/xen/xenbus/xenbus_client.c:43:
   include/xen/balloon.h:33:20: note: previous definition of 'xen_balloon_init' was here
      33 | static inline void xen_balloon_init(void)
         |                    ^~~~~~~~~~~~~~~~
   drivers/xen/xenbus/xenbus_client.c: In function 'xenbus_va_dev_error':
   drivers/xen/xenbus/xenbus_client.c:292:2: warning: function 'xenbus_va_dev_error' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
     292 |  vsnprintf(printf_buffer + len, PRINTF_BUFFER_SIZE - len, fmt, ap);
         |  ^~~~~~~~~

vim +/xen_balloon_init +33 include/xen/balloon.h

803eb047a28d23 Daniel De Graaf       2011-03-14  22  
803eb047a28d23 Daniel De Graaf       2011-03-14 @23  extern struct balloon_stats balloon_stats;
803eb047a28d23 Daniel De Graaf       2011-03-14  24  
803eb047a28d23 Daniel De Graaf       2011-03-14  25  void balloon_set_new_target(unsigned long target);
b6f3067985f12d Konrad Rzeszutek Wilk 2011-03-15  26  
81b286e0f1fe52 David Vrabel          2015-06-25  27  int alloc_xenballooned_pages(int nr_pages, struct page **pages);
b6f3067985f12d Konrad Rzeszutek Wilk 2011-03-15  28  void free_xenballooned_pages(int nr_pages, struct page **pages);
a50777c791031d Dan Magenheimer       2011-07-08  29  
96edd61dcf4436 Juergen Gross         2017-07-10  30  #ifdef CONFIG_XEN_BALLOON
96edd61dcf4436 Juergen Gross         2017-07-10  31  void xen_balloon_init(void);
96edd61dcf4436 Juergen Gross         2017-07-10  32  #else

96edd61dcf4436 Juergen Gross 2017-07-10 @33 static inline void xen_balloon_init(void)

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#10 lore raw

PATCH 1/1 xen/balloon: add header guard

In reply to Roger Pau Monne

In order to protect against the header being included multiple times on the same compilation unit.

---
Cc: Boris Ostrovsky <[email protected]>
Cc: Juergen Gross <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: [email protected]
---
This is required as a pre-patch to use ZONE_DEVICE, or else the fallback of including the balloon header might not work properly.

---
 include/xen/balloon.h | 4 ++++
 1 file changed, 4 insertions(+)
include/xen/balloon.h +4 -0
index 6fb95aa19405..6dbdb0b3fd03 100644
@@ -2,6 +2,8 @@
 /******************************************************************************
  * Xen balloon functionality
  */
+#ifndef _XEN_BALLOON_H
+#define _XEN_BALLOON_H
 
 #define RETRY_UNLIMITED	0
 
@@ -34,3 +36,5 @@ static inline void xen_balloon_init(void)
 {
 }
 #endif
+
+#endif	/* _XEN_BALLOON_H */
Signature · 1 line
2.27.0
#12 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

In reply to Roger Pau Monne

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Cheers,

Signature · 1 line
Julien Grall
#13 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

Quoted 27 lines · Julien Grall

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Quoted 5 lines

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Right, this feature (allocation of unpopulated memory separated from the balloon driver) is currently gated on CONFIG_ZONE_DEVICE, which I think could be used on Arm.

IMO the right solution seems to be to subtract the physical memory regions that can be used for the identity mappings of foreign pages (all RAM on the system AFAICT) from iomem_resource, as that would make this and the memory hotplug done in the balloon driver safe?

Thanks, Roger.

#14 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

Quoted 33 lines · Roger Pau Monné
Quoted 27 lines · Julien Grall

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Quoted 5 lines

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Quoted 8 lines

Right, this feature (allocation of unpopulated memory separated from the balloon driver) is currently gated on CONFIG_ZONE_DEVICE, which I think could be used on Arm.

IMO the right solution seems to be to subtract the physical memory regions that can be used for the identity mappings of foreign pages (all RAM on the system AFAICT) from iomem_resource, as that would make this and the memory hotplug done in the balloon driver safe?

The right solution is a mechanism for translated guests to query Xen to find regions of guest physical address space which are unused, and can be safely be used for foreign/grant/other  mappings.

Please don't waste any more time applying more duct tape to a broken system, and instead spend the time organising some proper foundations.

~Andrew

#15 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

Quoted 43 lines · Andrew Cooper
Quoted 33 lines · Roger Pau Monné
Quoted 27 lines · Julien Grall

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Quoted 5 lines

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Quoted 8 lines

Right, this feature (allocation of unpopulated memory separated from the balloon driver) is currently gated on CONFIG_ZONE_DEVICE, which I think could be used on Arm.

IMO the right solution seems to be to subtract the physical memory regions that can be used for the identity mappings of foreign pages (all RAM on the system AFAICT) from iomem_resource, as that would make this and the memory hotplug done in the balloon driver safe?

Quoted 6 lines

The right solution is a mechanism for translated guests to query Xen to find regions of guest physical address space which are unused, and can be safely be used for foreign/grant/other  mappings.

Please don't waste any more time applying more duct tape to a broken system, and instead spend the time organising some proper foundations.

The piece added here (using ZONE_DEVICE) will be relevant when Xen can provide the space to map foreign pages, it's just that right now it relies on iomem_resource instead of a Xen specific resource map that should be provided by the hypervisor. It should indeed be fixed, but right now this patch should allow a PVH dom0 to work slightly better. When Xen provides such areas Linux just needs to populate a custom Xen resource with them and use it instead of iomem_resurce.

The Arm stuff I'm certainly not familiar with, and can't provide much insight on that. If it's best to just disable it and continue to rely on ballooned out pages that's fine.

Roger.

#16 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

In reply to Roger Pau Monné

Hi Roger,

Quoted 34 lines · Roger Pau Monné
Quoted 27 lines · Julien Grall

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Quoted 5 lines

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Quoted 8 lines

Right, this feature (allocation of unpopulated memory separated from the balloon driver) is currently gated on CONFIG_ZONE_DEVICE, which I think could be used on Arm.

IMO the right solution seems to be to subtract the physical memory regions that can be used for the identity mappings of foreign pages (all RAM on the system AFAICT) from iomem_resource, as that would make this and the memory hotplug done in the balloon driver safe?

Dom0 doesn't know the regions used for the identity mappings as this is only managed by Xen. So there is nothing you can really do here.

But don't you have the same issue on x86 with "magic pages"?

Cheers,

Signature · 1 line
Julien Grall
#17 lore raw

Re: [PATCH v3 4/4] xen: add helpers to allocate unpopulated memory

Quoted 41 lines · Julien Grall

Hi Roger,

Quoted 38 lines · Roger Pau Monné
Quoted 27 lines · Julien Grall

Hi,

Quoted 15 lines · Roger Pau Monne

To be used in order to create foreign mappings. This is based on the ZONE_DEVICE facility which is used by persistent memory devices in order to create struct pages and kernel virtual mappings for the IOMEM areas of such devices. Note that on kernels without support for ZONE_DEVICE Xen will fallback to use ballooned pages in order to create foreign mappings.

The newly added helpers use the same parameters as the existing {alloc/free}_xenballooned_pages functions, which allows for in-place replacement of the callers. Once a memory region has been added to be used as scratch mapping space it will no longer be released, and pages returned are kept in a linked list. This allows to have a buffer of pages and prevents resorting to frequent additions and removals of regions.

Quoted 5 lines

If enabled (because ZONE_DEVICE is supported) the usage of the new functionality untangles Xen balloon and RAM hotplug from the usage of unpopulated physical memory ranges to map foreign pages, which is the correct thing to do in order to avoid mappings of foreign pages depend on memory hotplug.

I think this is going to break Dom0 on Arm if the kernel has been built with hotplug. This is because you may end up to re-use region that will be used for the 1:1 mapping of a foreign map.

Quoted 5 lines

Note that I don't know whether hotplug has been tested on Xen on Arm yet. So it might be possible to be already broken.

Meanwhile, my suggestion would be to make the use of hotplug in the balloon code conditional (maybe using CONFIG_ARM64 and CONFIG_ARM)?

Right, this feature (allocation of unpopulated memory separated from the balloon driver) is currently gated on CONFIG_ZONE_DEVICE, which I think could be used on Arm.

Quoted 7 lines
Quoted 4 lines

IMO the right solution seems to be to subtract the physical memory regions that can be used for the identity mappings of foreign pages (all RAM on the system AFAICT) from iomem_resource, as that would make this and the memory hotplug done in the balloon driver safe?

Dom0 doesn't know the regions used for the identity mappings as this is only managed by Xen. So there is nothing you can really do here.

OK, I will add the guards to prevent this being built on Arm.

Quoted 1 line

But don't you have the same issue on x86 with "magic pages"?

Those are marked as reserved on the memory map, and hence I would expect them to never end up in iomem_resource.

Thanks, Roger.