x86/xen changes for v2.6.31
Subsystems (7)
Linus,
Please pull the latest x86-xen-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-xen-for-linus
out-of-topic modifications in x86-xen-for-linus:
------------------------------------------------include/Kbuild # c5cfef0: xen: export ioctl headers to userinclude/asm-generic/pgtable.h # 224101e: x86/paravirt: finish change from
# 7fd7d83: x86/pvops: replace arch_enter_laz
kernel/sched.c # 224101e: x86/paravirt: finish change from
# 7fd7d83: x86/pvops: replace arch_enter_lazThanks,
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 (32):
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
xen: add FIX_TEXT_POKE to fixmap
xen: reserve Xen start_info rather than e820 reserving xen/x86-64: fix breakpoints and hardware watchpoints xen/x86-64: clean up warnings about IST-using traps
xen: cache cr0 value to avoid trap'n'emulate for read_cr0
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/traps.h | 3 + arch/x86/kernel/entry_64.S | 5 + 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 | 65 ++++- arch/x86/xen/mmu.c | 23 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/xen-ops.h | 1 - drivers/xen/Kconfig | 20 ++ drivers/xen/Makefile | 4 +- drivers/xen/events.c | 6 + drivers/xen/evtchn.c | 507 ++++++++++++++++++++++++++++++ drivers/xen/manage.c | 9 +- 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-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 +- 37 files changed, 1281 insertions(+), 174 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_MSR (1<<(X86_FEATURE_MSR & 31))#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_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/traps.h +3 -0
@@ -13,6 +13,9 @@ asmlinkage void divide_error(void); asmlinkage void debug(void); asmlinkage void nmi(void); asmlinkage void int3(void); +asmlinkage void xen_debug(void); +asmlinkage void xen_int3(void); +asmlinkage void xen_stack_segment(void); asmlinkage void overflow(void); asmlinkage void bounds(void); asmlinkage void invalid_op(void);
arch/x86/kernel/entry_64.S +5 -0
@@ -1379,6 +1379,11 @@ END(xen_failsafe_callback) paranoidzeroentry_ist debug do_debug DEBUG_STACK paranoidzeroentry_ist int3 do_int3 DEBUG_STACK paranoiderrorentry stack_segment do_stack_segment +#ifdef CONFIG_XEN +zeroentry xen_debug do_debug +zeroentry xen_int3 do_int3 +errorentry xen_stack_segment do_stack_segment +#endif errorentry general_protection do_general_protection errorentry page_fault do_page_fault #ifdef CONFIG_X86_MCE
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
@@ -1053,8 +1059,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;
@@ -1067,7 +1073,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 +57 -8
117 lines not on this page · raw message
arch/x86/xen/mmu.c +11 -12
@@ -451,10 +451,6 @@ void set_pte_mfn(unsigned long vaddr, unsigned long mfn, pgprot_t flags)void xen_set_pte_at (struct mm_struct *mm,unsigned long addr,pte_t *ptep,pte_t pteval) { -/* updates to init_mm may be done without lock */ -if (mm == &init_mm) -preempt_disable (); -ADD_STATS (set_pte_at,1 );// ADD_STATS(set_pte_at_pinned, xen_page_pinned(ptep)); ADD_STATS (set_pte_at_current, mm == current->mm);
@@ -475,9 +471,7 @@ void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, }xen_set_pte (ptep, pteval); -out: -if (mm == &init_mm) -preempt_enable (); +out:return ; } pte_t xen_ptep_modify_prot_start(struct mm_struct *mm,
@@ -1151,10 +1145,8 @@ static void drop_other_mm_ref(void *info)/* If this cpu still has a stale cr3 reference, then make sure it has been flushed. */ -if (percpu_read (xen_current_cr3) ==__pa (mm->pgd)) { +if (percpu_read (xen_current_cr3) ==__pa (mm->pgd))load_cr3 (swapper_pg_dir); -arch_flush_lazy_cpu_mode (); - } }static void xen_drop_mm_ref (struct mm_struct *mm)
@@ -1167,7 +1159,6 @@ static void xen_drop_mm_ref(struct mm_struct *mm)load_cr3 (swapper_pg_dir); elseleave_mm (smp_processor_id ()); -arch_flush_lazy_cpu_mode (); }/* Get the "official" set of cpus referring to our pagetable. */
@@ -1875,6 +1866,14 @@ __init void xen_post_allocator_init(void)xen_mark_init_mm_pinned (); } +static void xen_leave_lazy_mmu (void ) +{ +preempt_disable (); +xen_mc_flush (); +paravirt_leave_lazy_mmu (); +preempt_enable (); +} +const struct pv_mmu_ops xen_mmu_ops__initdata = { .pagetable_setup_start = xen_pagetable_setup_start, .pagetable_setup_done = xen_pagetable_setup_done,
@@ -1948,7 +1947,7 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = { .lazy_mode = { .enter = paravirt_enter_lazy_mmu, - .leave = xen_leave_lazy, + .leave = xen_leave_lazy_mmu, }, .set_fixmap = xen_set_fixmap,
arch/x86/xen/setup.c +3 -3
@@ -61,9 +61,9 @@ char * __init xen_memory_setup(void)* - xen_start_info * See comment above "struct start_info" in <xen/interface/xen.h> */ -e820_add_region (__pa (xen_start_info->mfn_list), - xen_start_info->pt_base - xen_start_info->mfn_list, -E820_RESERVED ); +reserve_early (__pa (xen_start_info->mfn_list), +__pa (xen_start_info->pt_base), +"XEN START INFO" );sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map);
arch/x86/xen/xen-ops.h +0 -1
@@ -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 );
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/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 +4 -5
@@ -98,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) {
@@ -116,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-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
@@ -2766,7 +2766,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 4 lines · On Wed, 10 Jun 2009 23:54:23 +0200 Ingo Molnar <[email protected]> wrote:
Linus,
Please pull the latest x86-xen-for-linus git tree from:
Quoted 8 lines
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-xen-for-linus...
Jeremy Fitzhardinge (32):
mm: disable preemption inapply_to_pte_range
...
mm: allow preemption inapply_to_pte_range
I think these cancel each other out, don't they?
It's strange that I cant find them in linux-next, whereas the others:
Quoted 3 lines
x86/paravirt: use
percpu_rather than__get_cpu_var
xen: disable preempt forleave_lazy_mmu
xen: separate p2m allocation from setting
are present in linux-next. Perhaps Stephen's merge process cancelled the self-cancelling patches altogether.
Quoted 9 lines · On Wed, 10 Jun 2009 15:03:14 -0700 Andrew Morton <[email protected]>…
Quoted 6 lines · On Wed, 10 Jun 2009 23:54:23 +0200 Ingo Molnar <[email protected]> wrote:
Linus,
Please pull the latest x86-xen-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-xen-for-linus
Quoted 8 lines
Quoted 6 lines
...
Jeremy Fitzhardinge (32):
mm: disable preemption inapply_to_pte_range
...
mm: allow preemption inapply_to_pte_rangeI think these cancel each other out, don't they?
They do.
Quoted 1 line
It's strange that I cant find them in linux-next
oop, I was looking at the wrong tree.
Quoted 12 lines · Andrew Morton
Quoted 8 lines · On Wed, 10 Jun 2009 23:54:23 +0200 Ingo Molnar<[email protected]> wrote:
Linus,
Please pull the latest x86-xen-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-xen-for-linus...
Quoted 8 lines
Quoted 5 lines
Jeremy Fitzhardinge (32):
mm: disable preemption inapply_to_pte_range
...
mm: allow preemption inapply_to_pte_rangeI think these cancel each other out, don't they?
[ Resent for lkml; Fedora 11's Thunderbird quietly sends HTML by default (thanks for that) ]
Yes. The first is the bare-minimum hacky bugfix, followed by the proper fix which reverts the hack. Just a bit of wankery, basically.
J