mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 03:04:51 +01:00
0949c646d6
This partially reverts commit87af633689so the current memory target for PV guests is still fetched from start_info->nr_pages, which matches exactly what the toolstack sets the initial memory target to. Using get_num_physpages() is possible on PV also, but needs adjusting to take into account the ISA hole and the PFN at 0 not considered usable memory despite being populated, and hence would need extra adjustments. Instead of carrying those extra adjustments switch back to the previous code. That leaves Linux with a difference in how current memory target is obtained for HVM vs PV, but that's better than adding extra logic just for PV. However if switching to start_info->nr_pages for PV domains we need to differentiate between released pages (freed back to the hypervisor) as opposed to pages in the physmap which are not populated to start with. Introduce a new xen_unpopulated_pages to account for papges that have never been populated, and hence in the PV case don't need subtracting. Fixes:87af633689("x86/xen: fix balloon target initialization for PVH dom0") Reported-by: James Dingwall <james@dingwall.me.uk> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Message-ID: <20260128110510.46425-2-roger.pau@citrix.com>
103 lines
2.5 KiB
C
103 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _XEN_XEN_H
|
|
#define _XEN_XEN_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
enum xen_domain_type {
|
|
XEN_NATIVE, /* running on bare hardware */
|
|
XEN_PV_DOMAIN, /* running in a PV domain */
|
|
XEN_HVM_DOMAIN, /* running in a Xen hvm domain */
|
|
};
|
|
|
|
#ifdef CONFIG_XEN
|
|
extern enum xen_domain_type xen_domain_type;
|
|
#else
|
|
#define xen_domain_type XEN_NATIVE
|
|
#endif
|
|
|
|
#ifdef CONFIG_XEN_PVH
|
|
extern bool xen_pvh;
|
|
#else
|
|
#define xen_pvh 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86
|
|
#include <asm/cpufeature.h>
|
|
|
|
#define xen_pv_domain() (cpu_feature_enabled(X86_FEATURE_XENPV))
|
|
#else
|
|
#define xen_pv_domain() 0
|
|
#endif
|
|
|
|
#define xen_domain() (xen_domain_type != XEN_NATIVE)
|
|
#define xen_hvm_domain() (xen_domain_type == XEN_HVM_DOMAIN)
|
|
#define xen_pvh_domain() (xen_pvh)
|
|
|
|
extern uint32_t xen_start_flags;
|
|
|
|
#ifdef CONFIG_XEN_PV
|
|
extern bool xen_pv_pci_possible;
|
|
#else
|
|
#define xen_pv_pci_possible 0
|
|
#endif
|
|
|
|
#include <xen/interface/hvm/start_info.h>
|
|
extern struct hvm_start_info pvh_start_info;
|
|
void xen_prepare_pvh(void);
|
|
struct pt_regs;
|
|
void xen_pv_evtchn_do_upcall(struct pt_regs *regs);
|
|
|
|
#ifdef CONFIG_XEN_DOM0
|
|
#include <xen/interface/xen.h>
|
|
#include <asm/xen/hypervisor.h>
|
|
|
|
#define xen_initial_domain() (xen_domain() && \
|
|
(xen_start_flags & SIF_INITDOMAIN))
|
|
#else /* !CONFIG_XEN_DOM0 */
|
|
#define xen_initial_domain() (0)
|
|
#endif /* CONFIG_XEN_DOM0 */
|
|
|
|
struct bio_vec;
|
|
struct page;
|
|
|
|
bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
|
|
const struct page *page);
|
|
|
|
#if defined(CONFIG_MEMORY_HOTPLUG) && defined(CONFIG_XEN_BALLOON)
|
|
extern u64 xen_saved_max_mem_size;
|
|
#endif
|
|
|
|
#ifdef CONFIG_XEN_UNPOPULATED_ALLOC
|
|
extern unsigned long xen_unpopulated_pages;
|
|
int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages);
|
|
void xen_free_unpopulated_pages(unsigned int nr_pages, struct page **pages);
|
|
#include <linux/ioport.h>
|
|
int arch_xen_unpopulated_init(struct resource **res);
|
|
#else
|
|
#define xen_unpopulated_pages 0UL
|
|
#include <xen/balloon.h>
|
|
static inline int xen_alloc_unpopulated_pages(unsigned int nr_pages,
|
|
struct page **pages)
|
|
{
|
|
return xen_alloc_ballooned_pages(nr_pages, pages);
|
|
}
|
|
static inline void xen_free_unpopulated_pages(unsigned int nr_pages,
|
|
struct page **pages)
|
|
{
|
|
xen_free_ballooned_pages(nr_pages, pages);
|
|
}
|
|
#endif
|
|
|
|
#if defined(CONFIG_XEN_DOM0) && defined(CONFIG_ACPI) && defined(CONFIG_X86)
|
|
bool __init xen_processor_present(uint32_t acpi_id);
|
|
#else
|
|
#include <linux/bug.h>
|
|
static inline bool xen_processor_present(uint32_t acpi_id)
|
|
{
|
|
BUG();
|
|
return false;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _XEN_XEN_H */
|