Xen updates for v2.6.30
Subsystems (7)
Linus,
Would you still be willing to pull pending Xen updates? They can be pulled from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git xen-for-linus
These are late, delayed past the merge window due to the discussions around the DOM0 bits and due to an exceptionally busy merge window.
These are the uncontroversial bits separated out. 95% of the impact is in Xen guest support related files.
There's cross-arch API rename impact due to the change of context-switch notification callbacks, but x86 is the only user of that facility so it does not affect other architectures.
Beyond the usual x86 tests, i also ran a few cross-build tests as well and all arches that build on current upstream build fine on this tree too:
warnings warnings
testing arm: -git: pass ( 30), -tip: pass ( 30) testing i386: -git: pass ( 7), -tip: pass ( 7) testing m32r: -git: pass ( 26), -tip: pass ( 26) testing m68k: -git: pass ( 30), -tip: pass ( 30) testing mips: -git: pass ( 2), -tip: pass ( 2) testing powerpc: -git: pass ( 46), -tip: pass ( 46) testing sh: -git: pass ( 30), -tip: pass ( 30) testing sparc: -git: pass ( 0), -tip: pass ( 2)
Thanks,
Ingo
------------------>
Alex Nixon (1):
Xen: Add virt_to_pfn helper function
Hannes Eder (1):
NULL noise: arch/x86/xen/smp.c
Ian Campbell (8):
xen: resume interrupts before system devices.
xen: add irq_from_evtchn
xen: add /dev/xen/evtchn driver
xen: export ioctl headers to userspace
xen: remove suspend_cancel hook
xen: use device model for suspending xenbus devices
xen: drop kexec bits from /sys/hypervisor since kexec isn't implemented yet
xen: honour VCPU availability on boot
Jeremy Fitzhardinge (27):
mm: disable preemption in apply_to_pte_range
x86/paravirt: remove lazy mode in interrupts
x86/pvops: replace arch_enter_lazy_cpu_mode with arch_start_context_switch x86/paravirt: flush pending mmu updates on context switch x86/paravirt: finish change from lazy cpu to context switch start/end x86/paravirt: allow preemption with lazy mmu mode
mm: allow preemption in apply_to_pte_range
x86/paravirt: use percpu_ rather than __get_cpu_var
xen: disable preempt for leave_lazy_mmu
xen: separate p2m allocation from setting
xen: split construction of p2m mfn tables from registration
xen: clean up xen_load_gdt
xen: make xen_load_gdt simpler
xen: remove xen_load_gdt debug
xen: mask XSAVE from cpuid
x86-64: remove PGE from must-have feature list
x86-64: non-paravirt systems always has PSE and PGE
xen/mmu: some early pagetable cleanups
xen/mmu: weaken flush_tlb_other test
xen: set _PAGE_NX in __supported_pte_mask before pagetable construction
xen: clean up gate trap/interrupt constants
xen/dev-evtchn: clean up locking in evtchn
xen/xenbus: export xenbus_dev_changed
xen: add /sys/hypervisor support
xen/sys/hypervisor: change writable_pt to features
xen: add "capabilities" file
lguest: update lazy mmu changes to match lguest's use of kvm hypercalls
arch/x86/include/asm/paravirt.h | 22 +- arch/x86/include/asm/pgtable.h | 2 + arch/x86/include/asm/required-features.h | 8 +- arch/x86/include/asm/thread_info.h | 4 +- arch/x86/include/asm/xen/page.h | 3 +- arch/x86/kernel/kvm.c | 2 +- arch/x86/kernel/paravirt.c | 56 ++-- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/vmi_32.c | 20 +- arch/x86/lguest/boot.c | 16 +- arch/x86/mm/fault.c | 6 +- arch/x86/mm/highmem_32.c | 2 - arch/x86/mm/iomap_32.c | 1 - arch/x86/mm/pageattr.c | 14 - arch/x86/xen/enlighten.c | 99 +++++-- arch/x86/xen/mmu.c | 134 ++++++--- arch/x86/xen/mmu.h | 3 + arch/x86/xen/smp.c | 4 +- arch/x86/xen/xen-ops.h | 3 - drivers/xen/Kconfig | 20 ++ drivers/xen/Makefile | 4 +- drivers/xen/cpu_hotplug.c | 40 ++- drivers/xen/events.c | 6 + drivers/xen/evtchn.c | 507 ++++++++++++++++++++++++++++++ drivers/xen/manage.c | 14 +- drivers/xen/sys-hypervisor.c | 445 ++++++++++++++++++++++++++ drivers/xen/xenbus/xenbus_probe.c | 61 +--- drivers/xen/xenbus/xenbus_xs.c | 2 + drivers/xen/xenfs/super.c | 19 +- include/Kbuild | 1 + include/asm-frv/pgtable.h | 4 +- include/asm-generic/pgtable.h | 21 +- include/xen/Kbuild | 1 + include/xen/events.h | 3 + include/xen/evtchn.h | 88 +++++ include/xen/interface/version.h | 3 + include/xen/xenbus.h | 3 +- kernel/sched.c | 2 +- 39 files changed, 1407 insertions(+), 240 deletions(-) create mode 100644 drivers/xen/evtchn.c create mode 100644 drivers/xen/sys-hypervisor.c create mode 100644 include/xen/Kbuild create mode 100644 include/xen/evtchn.h
arch/x86/include/asm/paravirt.h +11 -11
@@ -56,6 +56,7 @@ struct desc_ptr;struct tss_struct ;struct mm_struct ;struct desc_struct ; +struct task_struct ;/* * Wrapper type for pointers to code which uses the non-standard
@@ -203,7 +204,8 @@ struct pv_cpu_ops {void (*swapgs)(void ); -struct pv_lazy_ops lazy_mode; +void (*start_context_switch)(struct task_struct *prev); +void (*end_context_switch)(struct task_struct *next); };struct pv_irq_ops {
@@ -1399,25 +1401,23 @@ enum paravirt_lazy_mode { };enum paravirt_lazy_mode paravirt_get_lazy_mode (void ); -void paravirt_enter_lazy_cpu (void ); -void paravirt_leave_lazy_cpu (void ); +void paravirt_start_context_switch (struct task_struct *prev); +void paravirt_end_context_switch (struct task_struct *next); +void paravirt_enter_lazy_mmu (void );void paravirt_leave_lazy_mmu (void ); -void paravirt_leave_lazy (enum paravirt_lazy_mode mode); -#define __HAVE_ARCH_ENTER_LAZY_CPU_MODE -static inline void arch_enter_lazy_cpu_mode (void ) +#define __HAVE_ARCH_START_CONTEXT_SWITCH +static inline void arch_start_context_switch (struct task_struct *prev) { -PVOP_VCALL0 (pv_cpu_ops.lazy_mode.enter); +PVOP_VCALL1 (pv_cpu_ops.start_context_switch, prev); } -static inline void arch_leave_lazy_cpu_mode (void ) +static inline void arch_end_context_switch (struct task_struct *next) { -PVOP_VCALL0 (pv_cpu_ops.lazy_mode.leave); +PVOP_VCALL1 (pv_cpu_ops.end_context_switch, next); } -void arch_flush_lazy_cpu_mode (void ); -#define __HAVE_ARCH_ENTER_LAZY_MMU_MODEstatic inline void arch_enter_lazy_mmu_mode (void ) {
arch/x86/include/asm/pgtable.h +2 -0
@@ -81,6 +81,8 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base)#define pte_val (x) native_pte_val(x)#define __pte (x) native_make_pte(x) +#define arch_end_context_switch (prev) do {} while(0) +#endif /* CONFIG_PARAVIRT */ /*
arch/x86/include/asm/required-features.h +7 -1
@@ -48,9 +48,15 @@#endif #ifdef CONFIG_X86_64 +#ifdef CONFIG_PARAVIRT +/* Paravirtualized systems may not have PSE or PGE available */ #define NEED_PSE 0 +#define NEED_PGE 0 +#else +#define NEED_PSE (1<<(X86_FEATURE_PSE) & 31) +#define NEED_PGE (1<<(X86_FEATURE_PGE) & 31) +#endif #define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) -#define NEED_PGE (1<<(X86_FEATURE_PGE & 31))#define NEED_FXSR (1<<(X86_FEATURE_FXSR & 31))#define NEED_XMM (1<<(X86_FEATURE_XMM & 31))#define NEED_XMM2 (1<<(X86_FEATURE_XMM2 & 31))
arch/x86/include/asm/thread_info.h +3 -1
@@ -94,7 +94,8 @@ struct thread_info {#define TIF_FORCED_TF 24/* true if TF in eflags artificially */ #define TIF_DEBUGCTLMSR 25/* uses thread_struct.debugctlmsr */ #define TIF_DS_AREA_MSR 26/* uses thread_struct.ds_area_msr */ -#define TIF_SYSCALL_FTRACE 27/* for ftrace syscall instrumentation */ +#define TIF_LAZY_MMU_UPDATES 27/* task is updating the mmu lazily */ +#define TIF_SYSCALL_FTRACE 28/* for ftrace syscall instrumentation */ #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
@@ -116,6 +117,7 @@ struct thread_info {#define _TIF_FORCED_TF (1 << TIF_FORCED_TF)#define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR)#define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) +#define _TIF_LAZY_MMU_UPDATES (1 << TIF_LAZY_MMU_UPDATES)#define _TIF_SYSCALL_FTRACE (1 << TIF_SYSCALL_FTRACE)/* work to do in syscall_trace_enter() */
arch/x86/include/asm/xen/page.h +2 -1
@@ -124,7 +124,8 @@ static inline unsigned long mfn_to_local_pfn(unsigned long mfn)/* VIRT <-> MACHINE conversion */ #define virt_to_machine (v) (phys_to_machine(XPADDR(__pa(v)))) -#define virt_to_mfn (v) (pfn_to_mfn(PFN_DOWN(__pa(v)))) +#define virt_to_pfn (v) (PFN_DOWN(__pa(v))) +#define virt_to_mfn (v) (pfn_to_mfn(virt_to_pfn(v)))#define mfn_to_virt (m) (__va(mfn_to_pfn(m) << PAGE_SHIFT))static inline unsigned long pte_mfn (pte_t pte)
arch/x86/kernel/kvm.c +1 -1
@@ -195,7 +195,7 @@ static void kvm_leave_lazy_mmu(void)struct kvm_para_state *state =kvm_para_state ();mmu_queue_flush (state); -paravirt_leave_lazy (paravirt_get_lazy_mode ()); +paravirt_leave_lazy_mmu (); state->mode =paravirt_get_lazy_mode (); }
arch/x86/kernel/paravirt.c +26 -30
102 lines not on this page · raw message
arch/x86/kernel/process_32.c +1 -1
@@ -407,7 +407,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* done before math_state_restore, so the TS bit is up * to date. */ -arch_leave_lazy_cpu_mode (); +arch_end_context_switch (next_p);/* If the task has used fpu the last 5 timeslices, just do a full * restore of the math state immediately to avoid the trap; the
arch/x86/kernel/process_64.c +1 -1
@@ -428,7 +428,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* done before math_state_restore, so the TS bit is up * to date. */ -arch_leave_lazy_cpu_mode (); +arch_end_context_switch (next_p);/* * Switch FS and GS.
arch/x86/kernel/vmi_32.c +13 -7
@@ -462,22 +462,28 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip, }#endif -static void vmi_enter_lazy_cpu (void ) +static void vmi_start_context_switch (struct task_struct *prev) { -paravirt_enter_lazy_cpu (); +paravirt_start_context_switch (prev); vmi_ops.set_lazy_mode (2 ); } +static void vmi_end_context_switch (struct task_struct *next) +{ + vmi_ops.set_lazy_mode (0 ); +paravirt_end_context_switch (next); +} +static void vmi_enter_lazy_mmu (void ) {paravirt_enter_lazy_mmu (); vmi_ops.set_lazy_mode (1 ); } -static void vmi_leave_lazy (void ) +static void vmi_leave_lazy_mmu (void ) { -paravirt_leave_lazy (paravirt_get_lazy_mode ()); vmi_ops.set_lazy_mode (0 ); +paravirt_leave_lazy_mmu (); }static inline int __init check_vmi_rom (struct vrom_header *rom)
@@ -711,14 +717,14 @@ static inline int __init activate_vmi(void)para_fill (pv_cpu_ops.set_iopl_mask, SetIOPLMask);para_fill (pv_cpu_ops.io_delay, IODelay); -para_wrap (pv_cpu_ops.lazy_mode.enter, vmi_enter_lazy_cpu, +para_wrap (pv_cpu_ops.start_context_switch, vmi_start_context_switch, set_lazy_mode, SetLazyMode); -para_wrap (pv_cpu_ops.lazy_mode.leave, vmi_leave_lazy, +para_wrap (pv_cpu_ops.end_context_switch, vmi_end_context_switch, set_lazy_mode, SetLazyMode);para_wrap (pv_mmu_ops.lazy_mode.enter, vmi_enter_lazy_mmu, set_lazy_mode, SetLazyMode); -para_wrap (pv_mmu_ops.lazy_mode.leave, vmi_leave_lazy, +para_wrap (pv_mmu_ops.lazy_mode.leave, vmi_leave_lazy_mmu, set_lazy_mode, SetLazyMode);/* user and kernel flush are just handled with different flags to FlushTLB */
arch/x86/lguest/boot.c +11 -5
@@ -166,10 +166,16 @@ static void lazy_hcall3(unsigned long call,/* When lazy mode is turned off reset the per-cpu lazy mode variable and then * issue the do-nothing hypercall to flush any stored calls. */ -static void lguest_leave_lazy_mode (void ) +static void lguest_leave_lazy_mmu_mode (void ) { -paravirt_leave_lazy (paravirt_get_lazy_mode ());kvm_hypercall0 (LHCALL_FLUSH_ASYNC ); +paravirt_leave_lazy_mmu (); +} + +static void lguest_end_context_switch (struct task_struct *next) +{ +kvm_hypercall0 (LHCALL_FLUSH_ASYNC ); +paravirt_end_context_switch (next); }/*G:033
@@ -1051,8 +1057,8 @@ __init void lguest_init(void) pv_cpu_ops.write_gdt_entry = lguest_write_gdt_entry; pv_cpu_ops.write_idt_entry = lguest_write_idt_entry; pv_cpu_ops.wbinvd = lguest_wbinvd; - pv_cpu_ops.lazy_mode.enter = paravirt_enter_lazy_cpu; - pv_cpu_ops.lazy_mode.leave = lguest_leave_lazy_mode; + pv_cpu_ops.start_context_switch = paravirt_start_context_switch; + pv_cpu_ops.end_context_switch = lguest_end_context_switch;/* pagetable management */ pv_mmu_ops.write_cr3 = lguest_write_cr3;
@@ -1065,7 +1071,7 @@ __init void lguest_init(void) pv_mmu_ops.read_cr2 = lguest_read_cr2; pv_mmu_ops.read_cr3 = lguest_read_cr3; pv_mmu_ops.lazy_mode.enter = paravirt_enter_lazy_mmu; - pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mode; + pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mmu_mode; pv_mmu_ops.pte_update = lguest_pte_update; pv_mmu_ops.pte_update_defer = lguest_pte_update;
arch/x86/mm/fault.c +2 -4
@@ -225,12 +225,10 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)if (!pmd_present (*pmd_k))return NULL ; -if (!pmd_present (*pmd)) { +if (!pmd_present (*pmd))set_pmd (pmd, *pmd_k); -arch_flush_lazy_mmu_mode (); - }else { +else BUG_ON (pmd_page (*pmd) !=pmd_page (*pmd_k)); - }return pmd_k; }
arch/x86/mm/highmem_32.c +0 -2
@@ -44,7 +44,6 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot) vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);BUG_ON (!pte_none (*(kmap_pte-idx)));set_pte (kmap_pte-idx,mk_pte (page, prot)); -arch_flush_lazy_mmu_mode ();return (void *)vaddr; }
@@ -74,7 +73,6 @@ void kunmap_atomic(void *kvaddr, enum km_type type)#endif } -arch_flush_lazy_mmu_mode ();pagefault_enable (); }
arch/x86/mm/iomap_32.c +0 -1
@@ -82,7 +82,6 @@ iounmap_atomic(void *kvaddr, enum km_type type)if (vaddr ==__fix_to_virt (FIX_KMAP_BEGIN +idx))kpte_clear_flush (kmap_pte-idx, vaddr); -arch_flush_lazy_mmu_mode ();pagefault_enable (); }EXPORT_SYMBOL_GPL (iounmap_atomic);
arch/x86/mm/pageattr.c +0 -14
@@ -844,13 +844,6 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages,vm_unmap_aliases (); -/* -* If we're called with lazy mmu updates enabled, the -* in-memory pte state may be stale. Flush pending updates to -* bring them up to date. -*/ -arch_flush_lazy_mmu_mode (); - cpa.vaddr = addr; cpa.pages = pages; cpa.numpages = numpages;
@@ -895,13 +888,6 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, }else cpa_flush_all (cache); -/* -* If we've been called with lazy mmu updates enabled, then -* make sure that everything gets flushed out before we -* return. -*/ -arch_flush_lazy_mmu_mode (); - out:return ret; }
arch/x86/xen/enlighten.c +73 -26
194 lines not on this page · raw message
arch/x86/xen/mmu.c +90 -44
266 lines not on this page · raw message
arch/x86/xen/mmu.h +3 -0
@@ -11,6 +11,9 @@ enum pt_level { }; +bool __set_phys_to_machine (unsigned long pfn,unsigned long mfn); +bool install_p2mtop_page (unsigned long pfn,unsigned long *p); +void set_pte_mfn (unsigned long vaddr,unsigned long pfn,pgprot_t flags);
arch/x86/xen/smp.c +2 -2
@@ -317,7 +317,7 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)BUG_ON (rc);while (per_cpu (cpu_state, cpu) !=CPU_ONLINE ) { -HYPERVISOR_sched_op (SCHEDOP_yield,0 ); +HYPERVISOR_sched_op (SCHEDOP_yield,NULL );barrier (); }
@@ -422,7 +422,7 @@ static void xen_smp_send_call_function_ipi(const struct cpumask *mask)/* Make sure other vcpus get a chance to run if they need to. */ for_each_cpu (cpu, mask) {if (xen_vcpu_stolen (cpu)) { -HYPERVISOR_sched_op (SCHEDOP_yield,0 ); +HYPERVISOR_sched_op (SCHEDOP_yield,NULL );break ; } }
arch/x86/xen/xen-ops.h +0 -3
@@ -30,7 +30,6 @@ pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn);void xen_ident_map_ISA (void );void xen_reserve_top (void ); -void xen_leave_lazy (void );void xen_post_allocator_init (void );char *__init xen_memory_setup (void );
@@ -57,8 +56,6 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id);bool xen_vcpu_stolen (int vcpu); -void xen_mark_init_mm_pinned (void ); -void xen_setup_vcpu_info_placement (void );#ifdef CONFIG_SMP
drivers/xen/Kconfig +20 -0
@@ -18,6 +18,16 @@ config XEN_SCRUB_PAGES secure, but slightly less efficient. If in doubt, say yes. +config XEN_DEV_EVTCHN + tristate "Xen /dev/xen/evtchn device" + depends on XEN + default y + help + The evtchn driver allows a userspace process to triger event + channels and to receive notification of an event channel + firing. + If in doubt, say yes. + config XENFS tristate "Xen filesystem" depends on XEN
@@ -41,3 +51,13 @@ config XEN_COMPAT_XENFS a xen platform. If in doubt, say yes. +config XEN_SYS_HYPERVISOR + bool "Create xen entries under /sys/hypervisor" + depends on XEN && SYSFS + select SYS_HYPERVISOR + default y + help + Create entries under /sys/hypervisor describing the Xen + hypervisor environment. When running native or in another + virtual environment, /sys/hypervisor will still be present, + but will have no xen contents.
drivers/xen/Makefile +3 -1
@@ -4,4 +4,6 @@ obj-y += xenbus/ obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-$(CONFIG_XEN_XENCOMM) += xencomm.o obj-$(CONFIG_XEN_BALLOON) += balloon.o -obj-$(CONFIG_XENFS) += xenfs/ +obj-$(CONFIG_XEN_DEV_EVTCHN) += evtchn.o +obj-$(CONFIG_XENFS) += xenfs/ +obj-$(CONFIG_XEN_SYS_HYPERVISOR) += sys-hypervisor.o
drivers/xen/cpu_hotplug.c +30 -10
@@ -21,29 +21,41 @@ static void disable_hotplug_cpu(int cpu)set_cpu_present (cpu, false); } -static void vcpu_hotplug (unsigned int cpu) +static int vcpu_online (unsigned int cpu) {int err;char dir[32 ], state[32 ]; -if (!cpu_possible (cpu)) -return ; -sprintf (dir,"cpu/%u" , cpu); err =xenbus_scanf (XBT_NIL , dir,"availability" ,"%s" , state);if (err !=1 ) {printk (KERN_ERR "XENBUS: Unable to read cpu state\n" ); -return ; +return err; } -if (strcmp (state,"online" ) ==0 ) { +if (strcmp (state,"online" ) ==0 ) +return 1 ; +else if (strcmp (state,"offline" ) ==0 ) +return 0 ; + +printk (KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n" , state, cpu); +return -EINVAL ; +} +static void vcpu_hotplug (unsigned int cpu) +{ +if (!cpu_possible (cpu)) +return ; + +switch (vcpu_online (cpu)) { +case 1 :enable_hotplug_cpu (cpu); - }else if (strcmp (state,"offline" ) ==0 ) { +break ; +case 0 : (void )cpu_down (cpu);disable_hotplug_cpu (cpu); - }else { -printk (KERN_ERR "XENBUS: unknown state(%s) on CPU%d\n" , - state, cpu); +break ; +default : +break ; } }
@@ -64,12 +76,20 @@ static void handle_vcpu_hotplug_event(struct xenbus_watch *watch,static int setup_cpu_watcher (struct notifier_block *notifier,unsigned long event,void *data) { +int cpu;static struct xenbus_watch cpu_watch = { .node ="cpu" , .callback = handle_vcpu_hotplug_event}; (void )register_xenbus_watch (&cpu_watch); +for_each_possible_cpu (cpu) { +if (vcpu_online (cpu) ==0 ) { + (void )cpu_down (cpu); +cpu_clear (cpu, cpu_present_map); + } + } +return NOTIFY_DONE ; }
drivers/xen/events.c +6 -0
@@ -151,6 +151,12 @@ static unsigned int evtchn_from_irq(unsigned irq)return info_for_irq (irq)->evtchn; } +unsigned irq_from_evtchn (unsigned int evtchn) +{ +return evtchn_to_irq[evtchn]; +} +EXPORT_SYMBOL_GPL (irq_from_evtchn); +static enum ipi_vector ipi_from_irq (unsigned irq) {struct irq_info *info =info_for_irq (irq);
drivers/xen/evtchn.c new file +507 -0
507 lines not on this page · raw message
drivers/xen/manage.c +7 -7
@@ -62,14 +62,15 @@ static int xen_suspend(void *data)gnttab_resume ();xen_mm_unpin_all (); -sysdev_resume (); -if (!*cancelled) {xen_irq_resume ();xen_console_resume ();xen_timer_resume (); } +sysdev_resume (); +device_power_up (PMSG_RESUME ); +return 0 ; }
@@ -97,9 +98,8 @@ static void do_suspend(void) goto out; } -printk ("suspending xenbus...\n" ); -/* XXX use normal device tree? */ -xenbus_suspend (); +printk (KERN_DEBUG "suspending xenstore...\n" ); +xs_suspend (); err =device_power_down (PMSG_SUSPEND );if (err) {
@@ -115,9 +115,9 @@ static void do_suspend(void)if (!cancelled) {xen_arch_resume (); -xenbus_resume (); +xs_resume (); }else -xenbus_suspend_cancel (); +xs_suspend_cancel ();device_power_up (PMSG_RESUME );
drivers/xen/sys-hypervisor.c new file +445 -0
445 lines not on this page · raw message
drivers/xen/xenbus/xenbus_probe.c +10 -51
103 lines not on this page · raw message
drivers/xen/xenbus/xenbus_xs.c +2 -0
@@ -673,6 +673,8 @@ void xs_resume(void)struct xenbus_watch *watch;char token[sizeof (watch) *2 +1 ]; +xb_init_comms (); +mutex_unlock (&xs_state.response_mutex);mutex_unlock (&xs_state.request_mutex);up_write (&xs_state.transaction_mutex);
drivers/xen/xenfs/super.c +18 -1
@@ -20,10 +20,27 @@MODULE_DESCRIPTION ("Xen filesystem" );MODULE_LICENSE ("GPL" ); +static ssize_t capabilities_read (struct file *file,char __user *buf, +size_t size,loff_t *off) +{ +char *tmp ="" ; + +if (xen_initial_domain ()) + tmp ="control_d\n" ; + +return simple_read_from_buffer (buf, size, off, tmp,strlen (tmp)); +} + +static const struct file_operations capabilities_file_ops = { + .read = capabilities_read, +}; +static int xenfs_fill_super (struct super_block *sb,void *data,int silent) {static struct tree_descr xenfs_files[] = { - [2 ] = {"xenbus" , &xenbus_file_ops,S_IRUSR |S_IWUSR }, + [1 ] = {}, + {"xenbus" , &xenbus_file_ops,S_IRUSR |S_IWUSR }, + {"capabilities" , &capabilities_file_ops,S_IRUGO }, {"" }, };
include/Kbuild +1 -0
@@ -8,3 +8,4 @@ header-y += mtd/ header-y += rdma/ header-y += video/ header-y += drm/ +header-y += xen/
include/asm-frv/pgtable.h +2 -2
@@ -73,8 +73,8 @@ static inline int pte_file(pte_t pte) { return 0; }#define pgtable_cache_init () do {} while (0)#define arch_enter_lazy_mmu_mode () do {} while (0)#define arch_leave_lazy_mmu_mode () do {} while (0) -#define arch_enter_lazy_cpu_mode () do {} while (0) -#define arch_leave_lazy_cpu_mode () do {} while (0) + +#define arch_start_context_switch (prev) do {} while (0)#else /* !CONFIG_MMU */ /*****************************************************************************/
include/asm-generic/pgtable.h +11 -10
@@ -280,17 +280,18 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,#endif /* -* A facility to provide batching of the reload of page tables with the -* actual context switch code for paravirtualized guests. By convention, -* only one of the lazy modes (CPU, MMU) should be active at any given -* time, entry should never be nested, and entry and exits should always -* be paired. This is for sanity of maintaining and reasoning about the -* kernel code. +* A facility to provide batching of the reload of page tables and +* other process state with the actual context switch code for +* paravirtualized guests. By convention, only one of the batched +* update (lazy) modes (CPU, MMU) should be active at any given time, +* entry should never be nested, and entry and exits should always be +* paired. This is for sanity of maintaining and reasoning about the +* kernel code. In this case, the exit (end of the context switch) is +* in architecture-specific code, and so doesn't need a generic +* definition. */ -#ifndef __HAVE_ARCH_ENTER_LAZY_CPU_MODE -#define arch_enter_lazy_cpu_mode () do {} while (0) -#define arch_leave_lazy_cpu_mode () do {} while (0) -#define arch_flush_lazy_cpu_mode () do {} while (0) +#ifndef __HAVE_ARCH_START_CONTEXT_SWITCH +#define arch_start_context_switch (prev) do {} while (0)#endif #ifndef __HAVE_PFNMAP_TRACKING
include/xen/Kbuild new file +1 -0
@@ -0,0 +1 @@ +header-y += evtchn.h
include/xen/events.h +3 -0
@@ -53,4 +53,7 @@ bool xen_test_irq_pending(int irq);irq will be disabled so it won't deliver an interrupt. */ void xen_poll_irq (int irq); +/* Determine the IRQ which is bound to an event channel */ +unsigned irq_from_evtchn (unsigned int evtchn); +#endif /* _XEN_EVENTS_H */
include/xen/evtchn.h new file +88 -0
88 lines not on this page · raw message
include/xen/interface/version.h +3 -0
@@ -57,4 +57,7 @@ struct xen_feature_info {/* Declares the features reported by XENVER_get_features. */ #include "features.h" +/* arg == NULL; returns host memory page size. */ +#define XENVER_pagesize 7 +#endif /* __XEN_PUBLIC_VERSION_H__ */
include/xen/xenbus.h +1 -2
@@ -91,8 +91,7 @@ struct xenbus_driver {void (*otherend_changed)(struct xenbus_device *dev,enum xenbus_state backend_state);int (*remove)(struct xenbus_device *dev); -int (*suspend)(struct xenbus_device *dev); -int (*suspend_cancel)(struct xenbus_device *dev); +int (*suspend)(struct xenbus_device *dev,pm_message_t state);int (*resume)(struct xenbus_device *dev);int (*uevent)(struct xenbus_device *,char **,int ,char *,int );struct device_driver driver;
kernel/sched.c +1 -1
@@ -2754,7 +2754,7 @@ context_switch(struct rq *rq, struct task_struct *prev,* combine the page table reload and the switch backend into * one hypercall. */ -arch_enter_lazy_cpu_mode (); +arch_start_context_switch (prev);if (unlikely (!mm)) { next->active_mm = oldmm;
Quoted 10 lines · Ingo Molnar
Linus,
Would you still be willing to pull pending Xen updates? They can be pulled from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git xen-for-linusThese are late, delayed past the merge window due to the discussions around the DOM0 bits and due to an exceptionally busy merge window.
There are a lot of us that would really like to see Xen dom0 merged upstream, and several people were disappointed when it didn't go in the 2.6.30-rc1 merge window (check that thread). The biggest concern was "do people _want_ Xen merged?" rather than any technical problems with the code. I think, without a doubt, yes. Xen is used by many corporations. It has excellent performance, works across platforms that do not have hardware virt, and has a proven track record -- check out companies like Linode.com and Slicehost. It also has the maintainership of Citrix, so it is unlikely that the code will stagnate or become a burden to other maintainers.
Since the state of Xen dom0 was not addressed in the 2.6.30-rc1 thread, please state your intentions here.
Regards,
Kevin
2009/4/9 Kevin Bowling <[email protected]>:
Quoted 9 lines
There are a lot of us that would really like to see Xen dom0 merged upstream, and several people were disappointed when it didn't go in the 2.6.30-rc1 merge window (check that thread). The biggest concern was "do people _want_ Xen merged?" rather than any technical problems with the code. I think, without a doubt, yes. Xen is used by many corporations. It has excellent performance, works across platforms that do not have hardware virt, and has a proven track record -- check out companies like Linode.com and Slicehost. It also has the maintainership of Citrix, so it is unlikely that the code will stagnate or become a burden to other maintainers.
100% agree.
It is very important for thousands of companies to get xen dom0 support, right now.
We need Linux 2.6.30 with xen dom0 support.
Please, merge it.
Best Regards,
Morten