mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +00:00
b5f4035adf
* Extend the APIC ops implementation and add IRQ_WORKER vector support so that 'perf' can work properly.
* Fix self-ballooning code, and balloon logic when booting as initial domain.
* Move array printing code to generic debugfs
* Support XenBus domains.
* Lazily free grants when a domain is dead/non-existent.
* In M2P code use batching calls
Bug-fixes:
* Fix NULL dereference in allocation failure path (hvc_xen)
* Fix unbinding of IRQ_WORKER vector during vCPU hot-unplug
* Fix HVM guest resume - we would leak an PIRQ value instead of reusing the existing one.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJPu9MpAAoJEFjIrFwIi8fJaNQH/RylThiO+O+LBpPrO8VRUw+2
/Io98T7ZK2ggoUeaJx0C8irM0JMFAkxGMcfX3w9fwNt/BTec4s++4JhbN1jYN0da
6a0PqINo+M8y73So6CBfuJDCunaRLGKVG/ibIO3Y3WAff51/H+DMvO7uYYDAE0aA
mikyOxnaty0DiG5i4JGDHGmCzDASfK/jgGccZ03m6522mDx5ZIbTzZWONLfz8dqT
rbxnn9vrNLgEYWuzyLMwW0GymToUtt01xBQvwJLAbhn8lr1WBRBLpxXA+5iYNQrn
Ri25G7keYJhG4uwZfaHnR+4HTrmhlGzK1Z96dkqpGUaeIcdyWmPMp22VtBBiwG8=
=uyRr
-----END PGP SIGNATURE-----
Merge tag 'stable/for-linus-3.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
Pull Xen updates from Konrad Rzeszutek Wilk:
"Features:
* Extend the APIC ops implementation and add IRQ_WORKER vector
support so that 'perf' can work properly.
* Fix self-ballooning code, and balloon logic when booting as initial
domain.
* Move array printing code to generic debugfs
* Support XenBus domains.
* Lazily free grants when a domain is dead/non-existent.
* In M2P code use batching calls
Bug-fixes:
* Fix NULL dereference in allocation failure path (hvc_xen)
* Fix unbinding of IRQ_WORKER vector during vCPU hot-unplug
* Fix HVM guest resume - we would leak an PIRQ value instead of
reusing the existing one."
Fix up add-add onflicts in arch/x86/xen/enlighten.c due to addition of
apic ipi interface next to the new apic_id functions.
* tag 'stable/for-linus-3.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen: do not map the same GSI twice in PVHVM guests.
hvc_xen: NULL dereference on allocation failure
xen: Add selfballoning memory reservation tunable.
xenbus: Add support for xenbus backend in stub domain
xen/smp: unbind irqworkX when unplugging vCPUs.
xen: enter/exit lazy_mmu_mode around m2p_override calls
xen/acpi/sleep: Enable ACPI sleep via the __acpi_os_prepare_sleep
xen: implement IRQ_WORK_VECTOR handler
xen: implement apic ipi interface
xen/setup: update VA mapping when releasing memory during setup
xen/setup: Combine the two hypercall functions - since they are quite similar.
xen/setup: Populate freed MFNs from non-RAM E820 entries and gaps to E820 RAM
xen/setup: Only print "Freeing XXX-YYY pfn range: Z pages freed" if Z > 0
xen/gnttab: add deferred freeing logic
debugfs: Add support to print u32 array in debugfs
xen/p2m: An early bootup variant of set_phys_to_machine
xen/p2m: Collapse early_alloc_p2m_middle redundant checks.
xen/p2m: Allow alloc_p2m_middle to call reserve_brk depending on argument
xen/p2m: Move code around to allow for better re-usage.
127 lines
3.2 KiB
C
127 lines
3.2 KiB
C
#ifndef XEN_OPS_H
|
|
#define XEN_OPS_H
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/irqreturn.h>
|
|
#include <xen/xen-ops.h>
|
|
|
|
/* These are code, but not functions. Defined in entry.S */
|
|
extern const char xen_hypervisor_callback[];
|
|
extern const char xen_failsafe_callback[];
|
|
|
|
extern void *xen_initial_gdt;
|
|
|
|
struct trap_info;
|
|
void xen_copy_trap_info(struct trap_info *traps);
|
|
|
|
DECLARE_PER_CPU(struct vcpu_info, xen_vcpu_info);
|
|
DECLARE_PER_CPU(unsigned long, xen_cr3);
|
|
DECLARE_PER_CPU(unsigned long, xen_current_cr3);
|
|
|
|
extern struct start_info *xen_start_info;
|
|
extern struct shared_info xen_dummy_shared_info;
|
|
extern struct shared_info *HYPERVISOR_shared_info;
|
|
|
|
void xen_setup_mfn_list_list(void);
|
|
void xen_setup_shared_info(void);
|
|
void xen_build_mfn_list_list(void);
|
|
void xen_setup_machphys_mapping(void);
|
|
pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn);
|
|
void xen_reserve_top(void);
|
|
extern unsigned long xen_max_p2m_pfn;
|
|
|
|
void xen_set_pat(u64);
|
|
|
|
char * __init xen_memory_setup(void);
|
|
void __init xen_arch_setup(void);
|
|
void __init xen_init_IRQ(void);
|
|
void xen_enable_sysenter(void);
|
|
void xen_enable_syscall(void);
|
|
void xen_vcpu_restore(void);
|
|
|
|
void xen_callback_vector(void);
|
|
void xen_hvm_init_shared_info(void);
|
|
void xen_unplug_emulated_devices(void);
|
|
|
|
void __init xen_build_dynamic_phys_to_machine(void);
|
|
|
|
void xen_init_irq_ops(void);
|
|
void xen_setup_timer(int cpu);
|
|
void xen_setup_runstate_info(int cpu);
|
|
void xen_teardown_timer(int cpu);
|
|
cycle_t xen_clocksource_read(void);
|
|
void xen_setup_cpu_clockevents(void);
|
|
void __init xen_init_time_ops(void);
|
|
void __init xen_hvm_init_time_ops(void);
|
|
|
|
irqreturn_t xen_debug_interrupt(int irq, void *dev_id);
|
|
|
|
bool xen_vcpu_stolen(int vcpu);
|
|
|
|
void xen_setup_vcpu_info_placement(void);
|
|
|
|
#ifdef CONFIG_SMP
|
|
void xen_smp_init(void);
|
|
void __init xen_hvm_smp_init(void);
|
|
|
|
extern cpumask_var_t xen_cpu_initialized_map;
|
|
#else
|
|
static inline void xen_smp_init(void) {}
|
|
static inline void xen_hvm_smp_init(void) {}
|
|
#endif
|
|
|
|
#ifdef CONFIG_PARAVIRT_SPINLOCKS
|
|
void __init xen_init_spinlocks(void);
|
|
void __cpuinit xen_init_lock_cpu(int cpu);
|
|
void xen_uninit_lock_cpu(int cpu);
|
|
#else
|
|
static inline void xen_init_spinlocks(void)
|
|
{
|
|
}
|
|
static inline void xen_init_lock_cpu(int cpu)
|
|
{
|
|
}
|
|
static inline void xen_uninit_lock_cpu(int cpu)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
struct dom0_vga_console_info;
|
|
|
|
#ifdef CONFIG_XEN_DOM0
|
|
void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);
|
|
void __init xen_init_apic(void);
|
|
#else
|
|
static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,
|
|
size_t size)
|
|
{
|
|
}
|
|
static inline void __init xen_init_apic(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/* Declare an asm function, along with symbols needed to make it
|
|
inlineable */
|
|
#define DECL_ASM(ret, name, ...) \
|
|
ret name(__VA_ARGS__); \
|
|
extern char name##_end[]; \
|
|
extern char name##_reloc[] \
|
|
|
|
DECL_ASM(void, xen_irq_enable_direct, void);
|
|
DECL_ASM(void, xen_irq_disable_direct, void);
|
|
DECL_ASM(unsigned long, xen_save_fl_direct, void);
|
|
DECL_ASM(void, xen_restore_fl_direct, unsigned long);
|
|
|
|
/* These are not functions, and cannot be called normally */
|
|
void xen_iret(void);
|
|
void xen_sysexit(void);
|
|
void xen_sysret32(void);
|
|
void xen_sysret64(void);
|
|
void xen_adjust_exception_frame(void);
|
|
|
|
extern int xen_panic_handler_init(void);
|
|
|
|
#endif /* XEN_OPS_H */
|