a9d79a0751
[ Upstream commit 123664101aa2156d05251704fc63f9bcbf77741a ] This reverts commitb3cf8528bb. That commit unintentionally broke Xen balloon memory hotplug with "hotplug_unpopulated" set to 1. As long as "System RAM" resource got assigned under a new "Unusable memory" resource in IO/Mem tree any attempt to online this memory would fail due to general kernel restrictions on having "System RAM" resources as 1st level only. The original issue that commit has tried to workaroundfa564ad963("x86/PCI: Enable a 64bit BAR on AMD Family 15h (Models 00-1f, 30-3f, 60-7f)") also got amended by the following03a551734("x86/PCI: Move and shrink AMD 64-bit window to avoid conflict") which made the original fix to Xen ballooning unnecessary. Signed-off-by: Igor Druzhinin <igor.druzhinin@citrix.com> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
46 lines
1.2 KiB
C
46 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/******************************************************************************
|
|
* Xen balloon functionality
|
|
*/
|
|
|
|
#define RETRY_UNLIMITED 0
|
|
|
|
struct balloon_stats {
|
|
/* We aim for 'current allocation' == 'target allocation'. */
|
|
unsigned long current_pages;
|
|
unsigned long target_pages;
|
|
unsigned long target_unpopulated;
|
|
/* Number of pages in high- and low-memory balloons. */
|
|
unsigned long balloon_low;
|
|
unsigned long balloon_high;
|
|
unsigned long total_pages;
|
|
unsigned long schedule_delay;
|
|
unsigned long max_schedule_delay;
|
|
unsigned long retry_count;
|
|
unsigned long max_retry_count;
|
|
};
|
|
|
|
extern struct balloon_stats balloon_stats;
|
|
|
|
void balloon_set_new_target(unsigned long target);
|
|
|
|
int alloc_xenballooned_pages(int nr_pages, struct page **pages);
|
|
void free_xenballooned_pages(int nr_pages, struct page **pages);
|
|
|
|
struct device;
|
|
#ifdef CONFIG_XEN_SELFBALLOONING
|
|
extern int register_xen_selfballooning(struct device *dev);
|
|
#else
|
|
static inline int register_xen_selfballooning(struct device *dev)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_XEN_BALLOON
|
|
void xen_balloon_init(void);
|
|
#else
|
|
static inline void xen_balloon_init(void)
|
|
{
|
|
}
|
|
#endif
|