*** SUBJECT HERE ***
Subsystems (6)
cover *** SUBJECT HERE ***
From: Jeremy Fitzhardinge <[email protected]>
*** BLURB HERE ***
Ian Campbell (4):
xen: disable PAT
xen/dom0: Use host E820 map
xen: implement XENMEM_machphys_mapping
xen: clear reserved bits in l3 entries given in the initial
pagetables
Jeremy Fitzhardinge (6):
xen dom0: Make hvc_xen console work for dom0.
xen-dom0: only selectively disable cpu features xen/dom0: use _PAGE_IOMAP in ioremap to do machine mappings paravirt/xen: add pvop for page_is_ram
xen/dom0: add XEN_DOM0 config option
xen: allow enable use of VGA console on dom0
Juan Quintela (2):
xen dom0: Initialize xenbus for dom0.
xen dom0: Set up basic IO permissions for dom0.
Mark McLoughlin (5):
xen mtrr: Use specific cpu_has_foo macros instead of generic
cpu_has()
xen mtrr: Kill some unneccessary includes xen mtrr: Use generic_validate_add_page() xen mtrr: Implement xen_get_free_region() xen mtrr: Add xen_{get,set}_mtrr() implementations
Stephen Tweedie (2):
xen dom0: Add support for the platform_ops hypercall xen mtrr: Add mtrr_ops support for Xen mtrr
arch/x86/include/asm/page.h | 9 +- arch/x86/include/asm/paravirt.h | 7 + arch/x86/include/asm/pat.h | 5 + arch/x86/include/asm/xen/hypercall.h | 8 + arch/x86/include/asm/xen/interface.h | 6 +- arch/x86/include/asm/xen/interface_32.h | 5 + arch/x86/include/asm/xen/interface_64.h | 13 +-- arch/x86/include/asm/xen/page.h | 15 +-- arch/x86/kernel/cpu/mtrr/Makefile | 1 + arch/x86/kernel/cpu/mtrr/amd.c | 1 + arch/x86/kernel/cpu/mtrr/centaur.c | 1 + arch/x86/kernel/cpu/mtrr/cyrix.c | 1 + arch/x86/kernel/cpu/mtrr/generic.c | 1 + arch/x86/kernel/cpu/mtrr/main.c | 11 +- arch/x86/kernel/cpu/mtrr/mtrr.h | 7 + arch/x86/kernel/cpu/mtrr/xen.c | 120 ++++++++++++++++ arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/ioremap.c | 2 +- arch/x86/mm/pat.c | 5 - arch/x86/xen/Kconfig | 26 ++++ arch/x86/xen/Makefile | 3 +- arch/x86/xen/enlighten.c | 58 ++++++-- arch/x86/xen/mmu.c | 135 ++++++++++++++++++- arch/x86/xen/setup.c | 51 ++++++- arch/x86/xen/vga.c | 65 +++++++++ arch/x86/xen/xen-ops.h | 12 ++ drivers/char/hvc_xen.c | 101 +++++++++----- drivers/xen/events.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 30 ++++- include/xen/events.h | 2 + include/xen/interface/memory.h | 42 ++++++ include/xen/interface/platform.h | 232 +++++++++++++++++++++++++++++++ include/xen/interface/xen.h | 41 ++++++ 33 files changed, 931 insertions(+), 88 deletions(-) create mode 100644 arch/x86/kernel/cpu/mtrr/xen.c create mode 100644 arch/x86/xen/vga.c create mode 100644 include/xen/interface/platform.h
PATCH 1/19 xen dom0: Make hvc_xen console work for dom0.
Use the console hypercalls for dom0 console.
--- drivers/char/hvc_xen.c | 101 ++++++++++++++++++++++++++++++++---------------- drivers/xen/events.c | 2 +- include/xen/events.h | 2 + 3 files changed, 70 insertions(+), 35 deletions(-)
drivers/char/hvc_xen.c +67 -34
@@ -55,7 +55,7 @@ static inline void notify_daemon(void)notify_remote_via_evtchn (xen_start_info->console.domU.evtchn); } -static int write_console (uint32_t vtermno,const char *data,int len) +static int domU_write_console (uint32_t vtermno,const char *data,int len) {struct xencons_interface *intf =xencons_interface ();XENCONS_RING_IDX cons, prod;
@@ -76,7 +76,7 @@ static int write_console(uint32_t vtermno, const char *data, int len)return sent; } -static int read_console (uint32_t vtermno,char *buf,int len) +static int domU_read_console (uint32_t vtermno,char *buf,int len) {struct xencons_interface *intf =xencons_interface ();XENCONS_RING_IDX cons, prod;
@@ -97,28 +97,63 @@ static int read_console(uint32_t vtermno, char *buf, int len)return recv; } -static struct hv_ops hvc_ops = { - .get_chars = read_console, - .put_chars = write_console, +static struct hv_ops domU_hvc_ops = { + .get_chars = domU_read_console, + .put_chars = domU_write_console, .notifier_add = notifier_add_irq, .notifier_del = notifier_del_irq, .notifier_hangup = notifier_hangup_irq, }; -static int __init xen_init (void ) +static int dom0_read_console (uint32_t vtermno,char *buf,int len) +{ +return HYPERVISOR_console_io (CONSOLEIO_read, len, buf); +} + +/* +* Either for a dom0 to write to the system console, or a domU with a +* debug version of Xen +*/ +static int dom0_write_console (uint32_t vtermno,const char *str,int len) +{ +int rc =HYPERVISOR_console_io (CONSOLEIO_write, len, (char *)str); +if (rc <0 ) +return 0 ; + +return len; +} + +static struct hv_ops dom0_hvc_ops = { + .get_chars = dom0_read_console, + .put_chars = dom0_write_console, + .notifier_add = notifier_add_irq, + .notifier_del = notifier_del_irq, + .notifier_hangup = notifier_hangup_irq, +}; + +static int __init xen_hvc_init (void ) {struct hvc_struct *hp; +struct hv_ops *ops; -if (!xen_pv_domain () || -xen_initial_domain () || - !xen_start_info->console.domU.evtchn) -return -ENODEV ; +if (!xen_pv_domain ()) +return -ENODEV ; + +if (xen_initial_domain ()) { + ops = &dom0_hvc_ops; + xencons_irq =bind_virq_to_irq (VIRQ_CONSOLE ,0 ); + }else { +if (!xen_start_info->console.domU.evtchn) +return -ENODEV ; + + ops = &domU_hvc_ops; + xencons_irq =bind_evtchn_to_irq (xen_start_info->console.domU.evtchn); + } - xencons_irq =bind_evtchn_to_irq (xen_start_info->console.domU.evtchn);if (xencons_irq <0 ) xencons_irq =0 ;/* NO_IRQ */ - hp =hvc_alloc (HVC_COOKIE , xencons_irq, &hvc_ops,256 ); + hp =hvc_alloc (HVC_COOKIE , xencons_irq, ops,256 );if (IS_ERR (hp))return PTR_ERR (hp);
@@ -135,7 +170,7 @@ void xen_console_resume(void)rebind_evtchn_irq (xen_start_info->console.domU.evtchn, xencons_irq); } -static void __exit xen_fini(void) +static void __exit xen_hvc_fini(void) {if (hvc)hvc_remove (hvc);
@@ -143,29 +178,24 @@ static void __exit xen_fini(void)static int xen_cons_init (void ) { +struct hv_ops *ops; +if (!xen_pv_domain ())return 0 ; -hvc_instantiate (HVC_COOKIE ,0 , &hvc_ops); + ops = &domU_hvc_ops; +if (xen_initial_domain ()) + ops = &dom0_hvc_ops; + +hvc_instantiate (HVC_COOKIE ,0 , ops); +return 0 ; } -module_init (xen_init); -module_exit (xen_fini); +module_init (xen_hvc_init); +module_exit (xen_hvc_fini);console_initcall (xen_cons_init); -static void raw_console_write (const char *str,int len) -{ -while (len >0 ) { -int rc =HYPERVISOR_console_io (CONSOLEIO_write, len, (char *)str); -if (rc <=0 ) -break ; - - str += rc; - len -= rc; - } -} -#ifdef CONFIG_EARLY_PRINTK static void xenboot_write_console (struct console *console,const char *string,unsigned len)
@@ -173,19 +203,22 @@ static void xenboot_write_console(struct console *console, const char *string,unsigned int linelen, off =0 ;const char *pos; -raw_console_write (string, len); +dom0_write_console (0 , string, len); + +if (xen_initial_domain ()) +return ; -write_console (0 ,"(early) " ,8 ); +domU_write_console (0 ,"(early) " ,8 );while (off < len &&NULL != (pos =strchr (string+off,'\n' ))) { linelen = pos-string+off;if (off + linelen > len)break ; -write_console (0 , string+off, linelen); -write_console (0 ,"\r\n" ,2 ); +domU_write_console (0 , string+off, linelen); +domU_write_console (0 ,"\r\n" ,2 ); off += linelen +1 ; }if (off < len) -write_console (0 , string+off, len-off); +domU_write_console (0 , string+off, len-off); }struct console xenboot_console = {
@@ -197,7 +230,7 @@ struct console xenboot_console = {void xen_raw_console_write (const char *str) { -raw_console_write (str,strlen (str)); +dom0_write_console (0 , str,strlen (str)); }void xen_raw_printk (const char *fmt, ...)
drivers/xen/events.c +1 -1
@@ -404,7 +404,7 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu) } -static int bind_virq_to_irq (unsigned int virq,unsigned int cpu) +int bind_virq_to_irq (unsigned int virq,unsigned int cpu) {struct evtchn_bind_virq bind_virq;int evtchn, irq;
include/xen/events.h +2 -0
@@ -12,6 +12,8 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,irq_handler_t handler, unsigned long irqflags, const char *devname, void *dev_id); +int bind_virq_to_irq (unsigned int virq,unsigned int cpu); + int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, irq_handler_t handler, unsigned long irqflags, const char *devname,
Signature · 1 line
1.6.0.6
PATCH 2/19 xen dom0: Initialize xenbus for dom0.
From: Juan Quintela <[email protected]>
Do initial xenbus/xenstore setup in dom0. In dom0 we need to actually allocate the xenstore resources, rather than being given them from outside.
--- drivers/xen/xenbus/xenbus_probe.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-)
drivers/xen/xenbus/xenbus_probe.c +29 -1
@@ -821,6 +821,7 @@ void xenbus_probe(struct work_struct *unused)static int __init xenbus_probe_init (void ) {int err =0 ; +unsigned long page =0 ;DPRINTK ("" );
@@ -841,7 +842,31 @@ static int __init xenbus_probe_init(void)* Domain0 doesn't have a store_evtchn or store_mfn yet. */ if (xen_initial_domain ()) { -/* dom0 not yet supported */ +struct evtchn_alloc_unbound alloc_unbound; + +/* Allocate Xenstore page */ + page =get_zeroed_page (GFP_KERNEL ); +if (!page) +return -ENOMEM ; + + xen_store_mfn = xen_start_info->store_mfn = +pfn_to_mfn (virt_to_phys ((void *)page) >> +PAGE_SHIFT ); + +/* Next allocate a local port which xenstored can bind to */ + alloc_unbound.dom =DOMID_SELF ; + alloc_unbound.remote_dom =0 ; + + err =HYPERVISOR_event_channel_op (EVTCHNOP_alloc_unbound, + &alloc_unbound); +if (err == -ENOSYS ) + goto out_unreg_front; + +BUG_ON (err); + xen_store_evtchn = xen_start_info->store_evtchn = + alloc_unbound.port; + + xen_store_interface =mfn_to_virt (xen_store_mfn); }else { xenstored_ready =1 ; xen_store_evtchn = xen_start_info->store_evtchn;
@@ -877,6 +902,9 @@ static int __init xenbus_probe_init(void)bus_unregister (&xenbus_frontend.bus); out_error: +if (page !=0 ) +free_page (page); +return err; }
Signature · 1 line
1.6.0.6
PATCH 3/19 xen dom0: Set up basic IO permissions for dom0.
From: Juan Quintela <[email protected]>
Add the direct mapping area for ISA bus access, and enable IO space access for the guest when running as dom0.
--- arch/x86/xen/enlighten.c | 8 ++++++++ arch/x86/xen/mmu.c | 24 ++++++++++++++++++++++++ arch/x86/xen/setup.c | 6 +++++- arch/x86/xen/xen-ops.h | 1 + 4 files changed, 38 insertions(+), 1 deletions(-)
arch/x86/xen/enlighten.c +8 -0
@@ -941,6 +941,7 @@ asmlinkage void __init xen_start_kernel(void)xen_raw_console_write ("mapping kernel into physical memory\n" ); pgd =xen_setup_kernel_pagetable (pgd, xen_start_info->nr_pages); +xen_ident_map_ISA (); init_mm.pgd = pgd;
@@ -950,6 +951,13 @@ asmlinkage void __init xen_start_kernel(void)if (xen_feature (XENFEAT_supervisor_mode_kernel)) pv_info.kernel_rpl =0 ; +if (xen_initial_domain ()) { +struct physdev_set_iopl set_iopl; + set_iopl.iopl =1 ; +if (HYPERVISOR_physdev_op (PHYSDEVOP_set_iopl, &set_iopl) ==-1 ) +BUG (); + } +/* set the limit of our address space */ xen_reserve_top ();
arch/x86/xen/mmu.c +24 -0
@@ -1572,6 +1572,7 @@ static void *m2v(phys_addr_t maddr)return __ka (m2p (maddr)); } +/* Set the page permissions on an identity-mapped pages */ static void set_page_prot (void *addr,pgprot_t prot) {unsigned long pfn =__pa (addr) >>PAGE_SHIFT ;
@@ -1789,6 +1790,29 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)#endif } +__init void xen_ident_map_ISA (void ) +{ +unsigned long pa; + +/* +* If we're dom0, then linear map the ISA machine addresses into +* the kernel's address space. +*/ +if (!xen_initial_domain ()) +return ; + +xen_raw_printk ("Xen: setup ISA identity maps\n" ); + +for (pa =ISA_START_ADDRESS ; pa <ISA_END_ADDRESS ; pa +=PAGE_SIZE ) { +pte_t pte =mfn_pte (PFN_DOWN (pa),PAGE_KERNEL_IO ); + +if (HYPERVISOR_update_va_mapping (PAGE_OFFSET + pa, pte,0 )) +BUG (); + } + +xen_flush_tlb (); +} +__init void xen_post_allocator_init (void ) { pv_mmu_ops.set_pte = xen_set_pte;
arch/x86/xen/setup.c +5 -1
@@ -51,6 +51,9 @@ char * __init xen_memory_setup(void)* Even though this is normal, usable memory under Xen, reserve * ISA memory anyway because too many things think they can poke * about in there. +* +* In a dom0 kernel, this region is identity mapped with the +* hardware ISA area, so it really is out of bounds. */ e820_add_region (ISA_START_ADDRESS ,ISA_END_ADDRESS -ISA_START_ADDRESS ,E820_RESERVED );
@@ -188,7 +191,8 @@ void __init xen_arch_setup(void) pm_idle = xen_idle; -paravirt_disable_iospace (); +if (!xen_initial_domain ()) +paravirt_disable_iospace ();fiddle_vdso (); }
arch/x86/xen/xen-ops.h +1 -0
@@ -29,6 +29,7 @@ void xen_setup_machphys_mapping(void);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_ident_map_ISA (void );void xen_leave_lazy (void );void xen_post_allocator_init (void );
Signature · 1 line
1.6.0.6
PATCH 4/19 xen-dom0: only selectively disable cpu features
Dom0 kernels actually want most of the CPU features to be enabled. Some, like MCA/MCE, are still handled by Xen itself.
We leave APIC enabled even though we don't really have a functional local apic so that the ACPI code will parse the corresponding tables properly.
--- arch/x86/xen/enlighten.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-)
arch/x86/xen/enlighten.c +13 -8
@@ -171,18 +171,23 @@ static void __init xen_banner(void)static void xen_cpuid (unsigned int *ax,unsigned int *bx,unsigned int *cx,unsigned int *dx) { -unsigned maskedx = ~0 ; +unsigned maskedx =0 ;/* * Mask out inconvenient features, to try and disable as many * unsupported kernel subsystems as possible. */ -if (*ax ==1 ) - maskedx = ~((1 <<X86_FEATURE_APIC ) |/* disable APIC */ - (1 <<X86_FEATURE_ACPI ) |/* disable ACPI */ - (1 <<X86_FEATURE_MCE ) |/* disable MCE */ - (1 <<X86_FEATURE_MCA ) |/* disable MCA */ - (1 <<X86_FEATURE_ACC ));/* thermal monitoring */ +if (*ax ==1 ) { + maskedx = + (1 <<X86_FEATURE_MCE ) |/* disable MCE */ + (1 <<X86_FEATURE_MCA ) |/* disable MCA */ + (1 <<X86_FEATURE_ACC );/* thermal monitoring */ + +if (!xen_initial_domain ()) + maskedx |= + (1 <<X86_FEATURE_APIC ) |/* disable local APIC */ + (1 <<X86_FEATURE_ACPI );/* disable ACPI */ + } asm(XEN_EMULATE_PREFIX "cpuid" : "=a" (*ax),
@@ -190,7 +195,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, "=c" (*cx), "=d" (*dx) : "0" (*ax), "2" (*cx)); - *dx &= maskedx; + *dx &= ~maskedx; }static void xen_set_debugreg (int reg,unsigned long val)
Signature · 1 line
1.6.0.6
PATCH 5/19 xen dom0: Add support for the platform_ops hypercall
From: Stephen Tweedie <[email protected]>
Minimal changes to get platform ops (renamed dom0_ops on pv_ops) working on pv_ops builds. Pulls in upstream linux-2.6.18-xen.hg's platform.h
--- arch/x86/include/asm/xen/hypercall.h | 8 ++ include/xen/interface/platform.h | 232 ++++++++++++++++++++++++++++++++++ include/xen/interface/xen.h | 2 + 3 files changed, 242 insertions(+), 0 deletions(-) create mode 100644 include/xen/interface/platform.h
arch/x86/include/asm/xen/hypercall.h +8 -0
@@ -45,6 +45,7 @@#include <xen/interface/xen.h> #include <xen/interface/sched.h> #include <xen/interface/physdev.h> +#include <xen/interface/platform.h> /* * The hypercall asms have to meet several constraints:
@@ -282,6 +283,13 @@ HYPERVISOR_set_timer_op(u64 timeout) }static inline int +HYPERVISOR_dom0_op (struct xen_platform_op *platform_op) +{ + platform_op->interface_version =XENPF_INTERFACE_VERSION ; +return _hypercall1 (int, dom0_op, platform_op); +} + +static inline int HYPERVISOR_set_debugreg (int reg,unsigned long value) {return _hypercall2 (int, set_debugreg, reg, value);
include/xen/interface/platform.h new file +232 -0
232 lines not on this page · raw message
include/xen/interface/xen.h +2 -0
@@ -461,6 +461,8 @@ typedef uint8_t xen_domain_handle_t[16];#define __mk_unsigned_long (x) x ## UL#define mk_unsigned_long (x) __mk_unsigned_long(x) +DEFINE_GUEST_HANDLE (uint64_t); +#else /* __ASSEMBLY__ */ /* In assembly code we cannot use C numeric constant suffixes. */
Signature · 1 line
1.6.0.6
PATCH 6/19 xen mtrr: Add mtrr_ops support for Xen mtrr
From: Stephen Tweedie <[email protected]>
Add a Xen mtrr type, and reorganise mtrr initialisation slightly to allow the mtrr driver to set up num_var_ranges (Xen needs to do this by querying the hypervisor itself.)
Only the boot path is handled for now: we set up a xen-specific mtrr_if and set up the mtrr tables based on hypervisor information, but we don't yet handle mtrr entry add/delete.
--- arch/x86/kernel/cpu/mtrr/Makefile | 1 + arch/x86/kernel/cpu/mtrr/amd.c | 1 + arch/x86/kernel/cpu/mtrr/centaur.c | 1 + arch/x86/kernel/cpu/mtrr/cyrix.c | 1 + arch/x86/kernel/cpu/mtrr/generic.c | 1 + arch/x86/kernel/cpu/mtrr/main.c | 11 +++++-- arch/x86/kernel/cpu/mtrr/mtrr.h | 5 +++ arch/x86/kernel/cpu/mtrr/xen.c | 59 ++++++++++++++++++++++++++++++++++++ 8 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 arch/x86/kernel/cpu/mtrr/xen.c
arch/x86/kernel/cpu/mtrr/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-y := main.o if.o generic.o state.o obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o +obj-$(CONFIG_XEN_DOM0) += xen.o
arch/x86/kernel/cpu/mtrr/amd.c +1 -0
@@ -108,6 +108,7 @@ static struct mtrr_ops amd_mtrr_ops = { .get_free_region = generic_get_free_region, .validate_add_page = amd_validate_add_page, .have_wrcomb = positive_have_wrcomb, + .num_var_ranges = common_num_var_ranges, };int __init amd_init_mtrr (void )
arch/x86/kernel/cpu/mtrr/centaur.c +1 -0
@@ -213,6 +213,7 @@ static struct mtrr_ops centaur_mtrr_ops = { .get_free_region = centaur_get_free_region, .validate_add_page = centaur_validate_add_page, .have_wrcomb = positive_have_wrcomb, + .num_var_ranges = common_num_var_ranges, };int __init centaur_init_mtrr (void )
arch/x86/kernel/cpu/mtrr/cyrix.c +1 -0
@@ -263,6 +263,7 @@ static struct mtrr_ops cyrix_mtrr_ops = { .get_free_region = cyrix_get_free_region, .validate_add_page = generic_validate_add_page, .have_wrcomb = positive_have_wrcomb, + .num_var_ranges = common_num_var_ranges, };int __init cyrix_init_mtrr (void )
arch/x86/kernel/cpu/mtrr/generic.c +1 -0
@@ -663,4 +663,5 @@ struct mtrr_ops generic_mtrr_ops = { .set = generic_set_mtrr, .validate_add_page = generic_validate_add_page, .have_wrcomb = generic_have_wrcomb, + .num_var_ranges = common_num_var_ranges, };
arch/x86/kernel/cpu/mtrr/main.c +8 -3
@@ -99,7 +99,7 @@ static int have_wrcomb(void) }/* This function returns the number of variable MTRRs */ -static void __init set_num_var_ranges (void ) +int __init common_num_var_ranges (void ) {unsigned long config =0 , dummy;
@@ -109,7 +109,7 @@ static void __init set_num_var_ranges(void) config =2 ; else if (is_cpu(CYRIX) || is_cpu(CENTAUR)) config =8 ; - num_var_ranges = config &0xff ; +return config &0xff ; }static void __init init_table (void )
@@ -1673,12 +1673,17 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)void __init mtrr_bp_init (void ) {u32 phys_addr; +init_ifs (); phys_addr =32 ;if (cpu_has_mtrr) { mtrr_if = &generic_mtrr_ops; +#ifdef CONFIG_XEN_DOM0 +xen_init_mtrr (); +#endif + size_or_mask =0xff000000 ;/* 36 bits */ size_and_mask =0x00f00000 ; phys_addr =36 ;
@@ -1736,7 +1741,7 @@ void __init mtrr_bp_init(void) }if (mtrr_if) { -set_num_var_ranges (); + num_var_ranges = mtrr_if->num_var_ranges ();init_table ();if (use_intel ()) {get_mtrr_state ();
arch/x86/kernel/cpu/mtrr/mtrr.h +5 -0
@@ -41,6 +41,8 @@ struct mtrr_ops {int (*validate_add_page)(unsigned long base,unsigned long size,unsigned int type);int (*have_wrcomb)(void ); + +int (*num_var_ranges)(void ); }; extern int generic_get_free_region(unsigned long base, unsigned long size,
@@ -52,6 +54,8 @@ extern struct mtrr_ops generic_mtrr_ops;extern int positive_have_wrcomb (void ); +extern int __init common_num_var_ranges (void ); +/* library functions for processor-specific routines */ struct set_mtrr_context {unsigned long flags;
@@ -88,3 +92,4 @@ void mtrr_wrmsr(unsigned, unsigned, unsigned);int amd_init_mtrr (void );int cyrix_init_mtrr (void );int centaur_init_mtrr (void ); +void xen_init_mtrr (void );
arch/x86/kernel/cpu/mtrr/xen.c new file +59 -0
59 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 7/19 xen: disable PAT
From: Ian Campbell <[email protected]>
Xen imposes a particular PAT layout on all paravirtual guests which does not match the layout Linux would like to use.
Force PAT to be disabled until this is resolved.
--- arch/x86/include/asm/pat.h | 5 +++++ arch/x86/mm/pat.c | 5 ----- arch/x86/xen/enlighten.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-)
arch/x86/include/asm/pat.h +5 -0
@@ -5,8 +5,13 @@#ifdef CONFIG_X86_PAT extern int pat_enabled; +extern void pat_disable (const char *reason);#else static const int pat_enabled; +static inline void pat_disable (const char *reason) +{ + (void )reason; +}#endif extern void pat_init (void );
arch/x86/mm/pat.c +0 -5
@@ -42,11 +42,6 @@ static int __init nopat(char *str) return 0; }early_param ("nopat" , nopat); -#else -static inline void pat_disable (const char *reason) -{ - (void )reason; -}#endif
arch/x86/xen/enlighten.c +3 -0
@@ -48,6 +48,7 @@#include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/reboot.h> +#include <asm/pat.h> #include "xen-ops.h" #include "mmu.h"
@@ -986,6 +987,8 @@ asmlinkage void __init xen_start_kernel(void)add_preferred_console ("hvc" ,0 ,NULL ); } +pat_disable ("PAT disabled on Xen" ); +xen_raw_console_write ("about to get started...\n" );/* Start the world */
Signature · 1 line
1.6.0.6
PATCH 8/19 xen/dom0: use _PAGE_IOMAP in ioremap to do machine mappings
In a Xen domain, ioremap operates on machine addresses, not pseudo-physical addresses. We use _PAGE_IOMAP to determine whether a mapping is intended for machine addresses.
--- arch/x86/include/asm/xen/page.h | 8 +--- arch/x86/xen/enlighten.c | 4 ++- arch/x86/xen/mmu.c | 70 +++++++++++++++++++++++++++++++++++++- 3 files changed, 73 insertions(+), 9 deletions(-)
arch/x86/include/asm/xen/page.h +2 -6
@@ -112,13 +112,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)*/ static inline unsigned long mfn_to_local_pfn (unsigned long mfn) { -extern unsigned long max_mapnr;unsigned long pfn =mfn_to_pfn (mfn); -if ((pfn < max_mapnr) - && !xen_feature (XENFEAT_auto_translated_physmap) - && (get_phys_to_machine (pfn) != mfn)) -return max_mapnr;/* force !pfn_valid() */ -/* XXX fixme; not true with sparsemem */ +if (get_phys_to_machine (pfn) != mfn) +return -1 ;/* force !pfn_valid() */ return pfn; }
arch/x86/xen/enlighten.c +3 -1
@@ -938,7 +938,9 @@ asmlinkage void __init xen_start_kernel(void)/* Prevent unwanted bits from being set in PTEs. */ __supported_pte_mask &= ~_PAGE_GLOBAL; -if (!xen_initial_domain ()) +if (xen_initial_domain ()) + __supported_pte_mask |= _PAGE_IOMAP; +else __supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);/* Don't do the full vcpu_info placement stuff until we have a
arch/x86/xen/mmu.c +68 -2
119 lines not on this page · raw message
Signature · 1 line
1.6.0.6
PATCH 9/19 paravirt/xen: add pvop for page_is_ram
From: Jeremy Fitzhardinge <[email protected]>
A guest domain may have external pages mapped into its address space, in order to share memory with other domains. These shared pages are more akin to io mappings than real RAM, and should not pass the page_is_ram test. Add a paravirt op for this so that a hypervisor backend can validate whether a page should be considered ram or not.
--- arch/x86/include/asm/page.h | 9 ++++++++- arch/x86/include/asm/paravirt.h | 7 +++++++ arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/ioremap.c | 2 +- arch/x86/xen/mmu.c | 11 +++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-)
arch/x86/include/asm/page.h +8 -1
@@ -56,7 +56,14 @@typedef struct {pgdval_t pgd; }pgd_t ;typedef struct {pgprotval_t pgprot; }pgprot_t ; -extern int page_is_ram (unsigned long pagenr); +extern int native_page_is_ram (unsigned long pagenr); +#ifndef CONFIG_PARAVIRT +static inline int page_is_ram (unsigned long pagenr) +{ +return native_page_is_ram (pagenr); +} +#endif +extern int devmem_is_allowed (unsigned long pagenr);extern void map_devmem (unsigned long pfn,unsigned long size,pgprot_t vma_prot);
arch/x86/include/asm/paravirt.h +7 -0
@@ -350,6 +350,8 @@ struct pv_mmu_ops {an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,unsigned long phys,pgprot_t flags); + +int (*page_is_ram)(unsigned long pfn); };struct raw_spinlock ;
@@ -1452,6 +1454,11 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, pv_mmu_ops.set_fixmap (idx, phys, flags); } +static inline int page_is_ram (unsigned long pfn) +{ +return PVOP_CALL1 (int, pv_mmu_ops.page_is_ram, pfn); +} +void _paravirt_nop (void );u32 _paravirt_ident_32 (u32 );u64 _paravirt_ident_64 (u64 );
arch/x86/kernel/paravirt.c +1 -0
@@ -504,6 +504,7 @@ struct pv_mmu_ops pv_mmu_ops = { }, .set_fixmap = native_set_fixmap, + .page_is_ram = native_page_is_ram, };EXPORT_SYMBOL_GPL (pv_time_ops);
arch/x86/mm/ioremap.c +1 -1
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(__virt_addr_valid);#endif -int page_is_ram (unsigned long pagenr) +int native_page_is_ram (unsigned long pagenr) {resource_size_t addr, end;int i;
arch/x86/xen/mmu.c +11 -0
@@ -1856,6 +1856,16 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)#endif } +static int xen_page_is_ram (unsigned long pfn) +{ +/* Granted pages are not RAM. They will not have a proper +identity pfn<->mfn translation. */ +if (mfn_to_local_pfn (pfn_to_mfn (pfn)) != pfn) +return 0 ; + +return native_page_is_ram (pfn); +} +__init void xen_ident_map_ISA (void ) {unsigned long pa;
@@ -1984,6 +1994,7 @@ const struct pv_mmu_ops xen_mmu_ops __initdata = { }, .set_fixmap = xen_set_fixmap, + .page_is_ram = xen_page_is_ram, };
Signature · 1 line
1.6.0.6
PATCH 10/19 xen/dom0: Use host E820 map
From: Ian Campbell <[email protected]>
Unlike the non-paravirt Xen port we do not have distinct psuedo-physical and I/O memory resource-spaces and therefore resources in the two can clash. Fix this by registering a memory map which matches the underlying I/O map. Currently this wastes the memory in the reserved regions. Eventually we should remap this memory to the end of the address space.
--- arch/x86/xen/setup.c | 45 +++++++++++++++++++++++++++++++++++++-- include/xen/interface/memory.h | 29 +++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-)
arch/x86/xen/setup.c +42 -3
@@ -19,6 +19,7 @@#include <xen/page.h> #include <xen/interface/callback.h> +#include <xen/interface/memory.h> #include <xen/interface/physdev.h> #include <xen/features.h>
@@ -36,16 +37,54 @@ extern void xen_syscall32_target(void);/** * machine_specific_memory_setup - Hook for machine specific memory setup. **/ -char *__init xen_memory_setup (void ) {unsigned long max_pfn = xen_start_info->nr_pages; +unsigned long long mem_end; +int rc; +struct xen_memory_map memmap; +/* +* This is rather large for a stack variable but this early in +* the boot process we know we have plenty slack space. +*/ +struct e820entry map[E820MAX ]; +int op =xen_initial_domain () ? + XENMEM_machine_memory_map : + XENMEM_memory_map; +int i; max_pfn =min (MAX_DOMAIN_PAGES , max_pfn); + mem_end =PFN_PHYS ((u64 )max_pfn); + + memmap.nr_entries =E820MAX ; +set_xen_guest_handle (memmap.buffer, map); + + rc =HYPERVISOR_memory_op (op, &memmap); +if (rc == -ENOSYS ) { + memmap.nr_entries =1 ; + map[0 ].addr =0ULL ; + map[0 ].size = mem_end; +/* 8MB slack (to balance backend allocations). */ + map[0 ].size +=8ULL <<20 ; + map[0 ].type =E820_RAM ; + rc =0 ; + } +BUG_ON (rc); e820.nr_map =0 ; - -e820_add_region (0 ,PFN_PHYS ((u64 )max_pfn),E820_RAM ); +for (i =0 ; i < memmap.nr_entries; i++) { +unsigned long long end = map[i].addr + map[i].size; +if (map[i].type ==E820_RAM ) { +if (map[i].addr > mem_end) +continue ; +if (end > mem_end) { +/* Truncate region to max_mem. */ + map[i].size -= end - mem_end; + } + } +if (map[i].size >0 ) +e820_add_region (map[i].addr, map[i].size, map[i].type); + }/* * Even though this is normal, usable memory under Xen, reserve
include/xen/interface/memory.h +29 -0
@@ -142,4 +142,33 @@ struct xen_translate_gpfn_list { };DEFINE_GUEST_HANDLE_STRUCT (xen_translate_gpfn_list); +/* +* Returns the pseudo-physical memory map as it was when the domain +* was started (specified by XENMEM_set_memory_map). +* arg == addr of struct xen_memory_map. +*/ +#define XENMEM_memory_map 9 +struct xen_memory_map { +/* +* On call the number of entries which can be stored in buffer. On +* return the number of entries which have been stored in +* buffer. +*/ +unsigned int nr_entries; + +/* +* Entries in the buffer are in the same format as returned by the +* BIOS INT 0x15 EAX=0xE820 call. +*/ +GUEST_HANDLE (void ) buffer; +}; +DEFINE_GUEST_HANDLE_STRUCT (xen_memory_map); + +/* +* Returns the real physical memory map. Passes the same structure as +* XENMEM_memory_map. +* arg == addr of struct xen_memory_map. +*/ +#define XENMEM_machine_memory_map 10 +#endif /* __XEN_PUBLIC_MEMORY_H__ */
Signature · 1 line
1.6.0.6
PATCH 11/19 xen: implement XENMEM_machphys_mapping
From: Ian Campbell <[email protected]>
This hypercall allows Xen to specify a non-default location for the machine to physical mapping. This capability is used when running a 32 bit domain 0 on a 64 bit hypervisor to shrink the hypervisor hole to exactly the size required.
--- arch/x86/include/asm/xen/interface.h | 6 +++--- arch/x86/include/asm/xen/interface_32.h | 5 +++++ arch/x86/include/asm/xen/interface_64.h | 13 +------------ arch/x86/include/asm/xen/page.h | 7 ++++--- arch/x86/xen/enlighten.c | 7 +++++++ arch/x86/xen/mmu.c | 15 +++++++++++++++ include/xen/interface/memory.h | 13 +++++++++++++ 7 files changed, 48 insertions(+), 18 deletions(-)
arch/x86/include/asm/xen/interface.h +3 -3
@@ -61,9 +61,9 @@ DEFINE_GUEST_HANDLE(void);#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START)#endif -#ifndef machine_to_phys_mapping -#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) -#endif +#define MACH2PHYS_VIRT_START mk_unsigned_long(__MACH2PHYS_VIRT_START) +#define MACH2PHYS_VIRT_END mk_unsigned_long(__MACH2PHYS_VIRT_END) +#define MACH2PHYS_NR_ENTRIES ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>__MACH2PHYS_SHIFT)/* Maximum number of virtual CPUs in multi-processor guests. */ #define MAX_VIRT_CPUS 32
arch/x86/include/asm/xen/interface_32.h +5 -0
@@ -32,6 +32,11 @@/* And the trap vector is... */ #define TRAP_INSTR "int $0x82" +#define __MACH2PHYS_VIRT_START 0xF5800000 +#define __MACH2PHYS_VIRT_END 0xF6800000 + +#define __MACH2PHYS_SHIFT 2 +/* * Virtual addresses beyond this are not modifiable by guest OSes. The * machine->physical mapping table starts at this address, read-only.
arch/x86/include/asm/xen/interface_64.h +1 -12
@@ -39,18 +39,7 @@#define __HYPERVISOR_VIRT_END 0xFFFF880000000000#define __MACH2PHYS_VIRT_START 0xFFFF800000000000#define __MACH2PHYS_VIRT_END 0xFFFF804000000000 - -#ifndef HYPERVISOR_VIRT_START -#define HYPERVISOR_VIRT_START mk_unsigned_long(__HYPERVISOR_VIRT_START) -#define HYPERVISOR_VIRT_END mk_unsigned_long(__HYPERVISOR_VIRT_END) -#endif - -#define MACH2PHYS_VIRT_START mk_unsigned_long(__MACH2PHYS_VIRT_START) -#define MACH2PHYS_VIRT_END mk_unsigned_long(__MACH2PHYS_VIRT_END) -#define MACH2PHYS_NR_ENTRIES ((MACH2PHYS_VIRT_END-MACH2PHYS_VIRT_START)>>3) -#ifndef machine_to_phys_mapping -#define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START) -#endif +#define __MACH2PHYS_SHIFT 3/* * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
arch/x86/include/asm/xen/page.h +4 -3
@@ -5,6 +5,7 @@#include <linux/types.h> #include <linux/spinlock.h> #include <linux/pfn.h> +#include <linux/mm.h> #include <asm/uaccess.h> #include <asm/page.h>
@@ -35,6 +36,8 @@ typedef struct xpaddr {#define MAX_DOMAIN_PAGES \ ((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE)) +extern unsigned long *machine_to_phys_mapping; +extern unsigned int machine_to_phys_order;extern unsigned long get_phys_to_machine (unsigned long pfn);extern void set_phys_to_machine (unsigned long pfn,unsigned long mfn);
@@ -62,10 +65,8 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)if (xen_feature (XENFEAT_auto_translated_physmap))return mfn; -#if 0 if (unlikely ((mfn >> machine_to_phys_order) !=0 )) -return max_mapnr; -#endif +return ~0 ; pfn =0 ;/*
arch/x86/xen/enlighten.c +7 -0
@@ -62,6 +62,11 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info);enum xen_domain_type xen_domain_type =XEN_NATIVE ;EXPORT_SYMBOL_GPL (xen_domain_type); +unsigned long *machine_to_phys_mapping = (void *)MACH2PHYS_VIRT_START ; +EXPORT_SYMBOL (machine_to_phys_mapping); +unsigned int machine_to_phys_order; +EXPORT_SYMBOL (machine_to_phys_order); +struct start_info *xen_start_info;EXPORT_SYMBOL_GPL (xen_start_info);
@@ -890,6 +895,8 @@ asmlinkage void __init xen_start_kernel(void)xen_setup_features (); +xen_setup_machphys_mapping (); +/* Install Xen paravirt ops */ pv_info = xen_info; pv_init_ops = xen_init_ops;
arch/x86/xen/mmu.c +15 -0
@@ -57,6 +57,7 @@#include <xen/page.h> #include <xen/interface/xen.h> #include <xen/interface/version.h> +#include <xen/interface/memory.h> #include <xen/hvc-console.h> #include "multicalls.h"
@@ -1866,6 +1867,20 @@ static int xen_page_is_ram(unsigned long pfn)return native_page_is_ram (pfn); } +__init void xen_setup_machphys_mapping (void ) +{ +struct xen_machphys_mapping mapping; +unsigned long machine_to_phys_nr_ents; + +if (HYPERVISOR_memory_op (XENMEM_machphys_mapping, &mapping) ==0 ) { + machine_to_phys_mapping = (unsigned long *)mapping.v_start; + machine_to_phys_nr_ents = mapping.max_mfn +1 ; + }else { + machine_to_phys_nr_ents =MACH2PHYS_NR_ENTRIES ; + } + machine_to_phys_order =fls (machine_to_phys_nr_ents -1 ); +} +__init void xen_ident_map_ISA (void ) {unsigned long pa;
include/xen/interface/memory.h +13 -0
@@ -97,6 +97,19 @@ struct xen_machphys_mfn_list {DEFINE_GUEST_HANDLE_STRUCT (xen_machphys_mfn_list);/* +* Returns the location in virtual address space of the machine_to_phys +* mapping table. Architectures which do not have a m2p table, or which do not +* map it by default into guest address space, do not implement this command. +* arg == addr of xen_machphys_mapping_t. +*/ +#define XENMEM_machphys_mapping 12 +struct xen_machphys_mapping { +unsigned long v_start, v_end;/* Start and end virtual addresses. */ +unsigned long max_mfn;/* Maximum MFN that can be looked up. */ +}; +DEFINE_GUEST_HANDLE_STRUCT (xen_machphys_mapping_t); + +/* * Sets the GPFN at which a particular page appears in the specified guest's * pseudophysical address space. * arg == addr of xen_add_to_physmap_t.
Signature · 1 line
1.6.0.6
PATCH 12/19 xen: clear reserved bits in l3 entries given in the initial pagetables
From: Ian Campbell <[email protected]>
In native PAE, the only flag that may be legitimately set in an L3 entry is Present. When Xen grafts the top-level PAE L3 pagetable entries into the L4 pagetable, it must also set the other permissions flags so that the mapped pages are actually accessible.
However, due to a bug in the hypervisor, it validates update to the L3 entries as formal PAE entries, so it will refuse to validate these entries with the extra bits requires for 4-level pagetables.
This patch simply masks the entries back to the bare PAE level, leaving Xen to add whatever bits it feels are necessary.
--- arch/x86/xen/mmu.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
arch/x86/xen/mmu.c +15 -0
@@ -1778,6 +1778,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) {pmd_t *kernel_pmd; +int i; init_pg_tables_start =__pa (pgd); init_pg_tables_end =__pa (pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE ;
@@ -1789,6 +1790,20 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,xen_map_identity_early (level2_kernel_pgt, max_pfn);memcpy (swapper_pg_dir, pgd,sizeof (pgd_t) *PTRS_PER_PGD ); + +/* +* When running a 32 bit domain 0 on a 64 bit hypervisor a +* pinned L3 (such as the initial pgd here) contains bits +* which are reserved in the PAE layout but not in the 64 bit +* layout. Unfortunately some versions of the hypervisor +* (incorrectly) validate compat mode guests against the PAE +* layout and hence will not allow such a pagetable to be +* pinned by the guest. Therefore we mask off only the PFN and +* Present bits of the supplied L3. +*/ +for (i =0 ; i <PTRS_PER_PGD ; i++) + swapper_pg_dir[i].pgd &= (PTE_PFN_MASK | _PAGE_PRESENT); +set_pgd (&swapper_pg_dir[KERNEL_PGD_BOUNDARY ],__pgd (__pa (level2_kernel_pgt) | _PAGE_PRESENT));
Signature · 1 line
1.6.0.6
PATCH 13/19 xen/dom0: add XEN_DOM0 config option
Allow dom0 to be configured. Requires more patches to do something useful.
--- arch/x86/xen/Kconfig | 26 ++++++++++++++++++++++++++ arch/x86/xen/enlighten.c | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-)
arch/x86/xen/Kconfig +26 -0
@@ -36,3 +36,29 @@ config XEN_DEBUG_FS help Enable statistics output and various tuning options in debugfs. Enabling this option may incur a significant performance overhead. + +config XEN_DOM0 + bool "Enable Xen privileged domain support" + depends on XEN && X86_IO_APIC && ACPI + help + The Xen hypervisor requires a privileged domain ("dom0") to + actually manage the machine, provide devices drivers, etc. + This option enables dom0 support. A dom0 kernel can also + run as an unprivileged domU kernel, or a kernel running + native on bare hardware. + +# Dummy symbol since people have come to rely on the PRIVILEGED_GUEST +# name in tools. +config XEN_PRIVILEGED_GUEST + def_bool XEN_DOM0 + +config XEN_PCI_PASSTHROUGH + bool #"Enable support for Xen PCI passthrough devices" + depends on XEN && PCI + help + Enable support for passing PCI devices through to + unprivileged domains. (COMPLETELY UNTESTED) + +config XEN_DOM0_PCI + def_bool y + depends on XEN_DOM0 && PCI
arch/x86/xen/enlighten.c +3 -2
@@ -169,9 +169,10 @@ static void __init xen_banner(void)printk (KERN_INFO "Booting paravirtualized kernel on %s\n" , pv_info.name); -printk (KERN_INFO "Xen version: %d.%d%s%s\n" , +printk (KERN_INFO "Xen version: %d.%d%s%s%s\n" , version >>16 , version &0xffff , extra.extraversion, -xen_feature (XENFEAT_mmu_pt_update_preserve_ad) ?" (preserve-AD)" :"" ); +xen_feature (XENFEAT_mmu_pt_update_preserve_ad) ?" (preserve-AD)" :"" , +xen_initial_domain () ?" (dom0)" :"" ); } static void xen_cpuid(unsigned int *ax, unsigned int *bx,
Signature · 1 line
1.6.0.6
PATCH 14/19 xen: allow enable use of VGA console on dom0
If we're booting a privileged domain, then set up the vga console for use. Xen provides us with all the information about the current vga state, without need to use the BIOS. We use that information to populate screen_info, which allows the rest of the kernel to carry on as normal.
--- arch/x86/xen/Makefile | 3 +- arch/x86/xen/enlighten.c | 10 ++++++ arch/x86/xen/vga.c | 65 +++++++++++++++++++++++++++++++++++++++++++ arch/x86/xen/xen-ops.h | 11 +++++++ include/xen/interface/xen.h | 39 +++++++++++++++++++++++++ 5 files changed, 127 insertions(+), 1 deletions(-) create mode 100644 arch/x86/xen/vga.c
arch/x86/xen/Makefile +2 -1
@@ -10,4 +10,5 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ grant-table.o suspend.o obj-$(CONFIG_SMP) += smp.o spinlock.o -obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o +obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o +obj-$(CONFIG_XEN_DOM0) += vga.o
arch/x86/xen/enlighten.c +10 -0
@@ -995,6 +995,16 @@ asmlinkage void __init xen_start_kernel(void)add_preferred_console ("xenboot" ,0 ,NULL );add_preferred_console ("tty" ,0 ,NULL );add_preferred_console ("hvc" ,0 ,NULL ); + + boot_params.screen_info.orig_video_isVGA =0 ; + }else { +const struct dom0_vga_console_info *info = + (void *)((char *)xen_start_info + + xen_start_info->console.dom0.info_off); + +xen_init_vga (info, xen_start_info->console.dom0.info_size); + xen_start_info->console.domU.mfn =0 ; + xen_start_info->console.domU.evtchn =0 ; }pat_disable ("PAT disabled on Xen" );
arch/x86/xen/vga.c new file +65 -0
65 lines not on this page · raw message
arch/x86/xen/xen-ops.h +11 -0
@@ -4,6 +4,8 @@#include <linux/init.h> #include <linux/clocksource.h> #include <linux/irqreturn.h> + +#include <xen/interface/xen.h> #include <xen/xen-ops.h> /* These are code, but not functions. Defined in entry.S */
@@ -75,6 +77,15 @@ static inline void xen_smp_init(void) {}#endif +#ifdef CONFIG_XEN_DOM0 +void xen_init_vga (const struct dom0_vga_console_info *,size_t size); +#else +static inline void xen_init_vga (const struct dom0_vga_console_info *info, +size_t size) +{ +} +#endif +/* Declare an asm function, along with symbols needed to make it inlineable */ #define DECL_ASM (ret, name, ...) \
include/xen/interface/xen.h +39 -0
@@ -449,6 +449,45 @@ struct start_info {int8_t cmd_line[MAX_GUEST_CMDLINE ]; }; +struct dom0_vga_console_info { +uint8_t video_type;/* DOM0_VGA_CONSOLE_??? */ +#define XEN_VGATYPE_TEXT_MODE_3 0x03 +#define XEN_VGATYPE_VESA_LFB 0x23 + +union { +struct { +/* Font height, in pixels. */ +uint16_t font_height; +/* Cursor location (column, row). */ +uint16_t cursor_x, cursor_y; +/* Number of rows and columns (dimensions in characters). */ +uint16_t rows, columns; + } text_mode_3; + +struct { +/* Width and height, in pixels. */ +uint16_t width, height; +/* Bytes per scan line. */ +uint16_t bytes_per_line; +/* Bits per pixel. */ +uint16_t bits_per_pixel; +/* LFB physical address, and size (in units of 64kB). */ +uint32_t lfb_base; +uint32_t lfb_size; +/* RGB mask offsets and sizes, as defined by VBE 1.2+ */ +uint8_t red_pos, red_size; +uint8_t green_pos, green_size; +uint8_t blue_pos, blue_size; +uint8_t rsvd_pos, rsvd_size; + +/* VESA capabilities (offset 0xa, VESA command 0x4f00). */ +uint32_t gbl_caps; +/* Mode attributes (offset 0x0, VESA command 0x4f01). */ +uint16_t mode_attrs; + } vesa_lfb; + } u; +}; +/* These flags are passed in the 'flags' field of start_info_t. */ #define SIF_PRIVILEGED (1<<0)/* Is the domain privileged? */ #define SIF_INITDOMAIN (1<<1)/* Is this the initial control domain? */
Signature · 1 line
1.6.0.6
PATCH 15/19 xen mtrr: Use specific cpu_has_foo macros instead of generic cpu_has()
From: Mark McLoughlin <[email protected]>
--- arch/x86/kernel/cpu/mtrr/xen.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/mtrr/xen.c +4 -6
@@ -44,15 +44,13 @@ static int __init xen_num_var_ranges(void)void __init xen_init_mtrr (void ) { -struct cpuinfo_x86 *c = &boot_cpu_data; -if (!xen_initial_domain ())return ; -if ((!cpu_has (c,X86_FEATURE_MTRR )) && - (!cpu_has (c,X86_FEATURE_K6_MTRR )) && - (!cpu_has (c,X86_FEATURE_CYRIX_ARR )) && - (!cpu_has (c,X86_FEATURE_CENTAUR_MCR ))) +if (!cpu_has_mtrr && + !cpu_has_k6_mtrr && + !cpu_has_cyrix_arr && + !cpu_has_centaur_mcr)return ; mtrr_if = &xen_mtrr_ops;
Signature · 1 line
1.6.0.6
PATCH 16/19 xen mtrr: Kill some unneccessary includes
From: Mark McLoughlin <[email protected]>
--- arch/x86/kernel/cpu/mtrr/mtrr.h | 2 ++ arch/x86/kernel/cpu/mtrr/xen.c | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/mtrr/mtrr.h +2 -0
@@ -5,6 +5,8 @@#include <linux/types.h> #include <linux/stddef.h> +#include <asm/mtrr.h> +#define MTRRcap_MSR 0x0fe#define MTRRdefType_MSR 0x2ff
arch/x86/kernel/cpu/mtrr/xen.c +2 -8
@@ -1,12 +1,6 @@#include <linux/init.h> -#include <linux/proc_fs.h> -#include <linux/ctype.h> -#include <linux/module.h> -#include <linux/seq_file.h> -#include <asm/uaccess.h> -#include <linux/mutex.h> - -#include <asm/mtrr.h> +#include <linux/mm.h> +#include "mtrr.h" #include <xen/interface/platform.h>
Signature · 1 line
1.6.0.6
PATCH 17/19 xen mtrr: Use generic_validate_add_page()
From: Mark McLoughlin <[email protected]>
The hypervisor already performs the same validation, but better to do it early before getting to the range combining code.
--- arch/x86/kernel/cpu/mtrr/xen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/mtrr/xen.c +1 -1
@@ -16,7 +16,7 @@ static struct mtrr_ops xen_mtrr_ops = {// .set = xen_set_mtrr, // .get = xen_get_mtrr, .get_free_region = generic_get_free_region, -// .validate_add_page = xen_validate_add_page, + .validate_add_page = generic_validate_add_page, .have_wrcomb = positive_have_wrcomb, .use_intel_if = 0, .num_var_ranges = xen_num_var_ranges,
Signature · 1 line
1.6.0.6
PATCH 18/19 xen mtrr: Implement xen_get_free_region()
From: Mark McLoughlin <[email protected]>
When an already set MTRR is being changed, we need to first unset, since Xen also maintains a usage count.
--- arch/x86/kernel/cpu/mtrr/xen.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/mtrr/xen.c +26 -1
@@ -9,13 +9,38 @@static int __init xen_num_var_ranges (void ); +static int xen_get_free_region (unsigned long base,unsigned long size,int replace_reg) +{ +struct xen_platform_op op; +int error; + +if (replace_reg <0 ) +return generic_get_free_region (base, size,-1 ); + +/* If we're replacing the contents of a register, +* we need to first unset it since Xen also keeps +* a usage count. +*/ + op.cmd = XENPF_del_memtype; + op.u.del_memtype.handle =0 ; + op.u.del_memtype.reg = replace_reg; + + error =HYPERVISOR_dom0_op (&op); +if (error) { +BUG_ON (error >0 ); +return error; + } + +return replace_reg; +} +/* DOM0 TODO: Need to fill in the remaining mtrr methods to have full * working userland mtrr support. */ static struct mtrr_ops xen_mtrr_ops = { .vendor =X86_VENDOR_UNKNOWN ,// .set = xen_set_mtrr, // .get = xen_get_mtrr, - .get_free_region = generic_get_free_region, + .get_free_region = xen_get_free_region, .validate_add_page = generic_validate_add_page, .have_wrcomb = positive_have_wrcomb, .use_intel_if =0 ,
Signature · 1 line
1.6.0.6
PATCH 19/19 xen mtrr: Add xen_{get,set}_mtrr() implementations
From: Mark McLoughlin <[email protected]>
Straightforward apart from the hack to turn mtrr_ops->set() into a no-op on all but one CPU.
--- arch/x86/kernel/cpu/mtrr/xen.c | 52 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 48 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/mtrr/xen.c +48 -4
@@ -9,6 +9,52 @@static int __init xen_num_var_ranges (void ); +static void xen_set_mtrr (unsigned int reg,unsigned long base, +unsigned long size,mtrr_type type) +{ +struct xen_platform_op op; +int error; + +/* mtrr_ops->set() is called once per CPU, +* but Xen's ops apply to all CPUs. +*/ +if (smp_processor_id ()) +return ; + +if (size ==0 ) { + op.cmd = XENPF_del_memtype; + op.u.del_memtype.handle =0 ; + op.u.del_memtype.reg = reg; + }else { + op.cmd = XENPF_add_memtype; + op.u.add_memtype.mfn = base; + op.u.add_memtype.nr_mfns = size; + op.u.add_memtype.type = type; + } + + error =HYPERVISOR_dom0_op (&op); +BUG_ON (error !=0 ); +} + +static void xen_get_mtrr (unsigned int reg,unsigned long *base, +unsigned long *size,mtrr_type *type) +{ +struct xen_platform_op op; + + op.cmd = XENPF_read_memtype; + op.u.read_memtype.reg = reg; +if (HYPERVISOR_dom0_op (&op) !=0 ) { + *base =0 ; + *size =0 ; + *type =0 ; +return ; + } + + *size = op.u.read_memtype.nr_mfns; + *base = op.u.read_memtype.mfn; + *type = op.u.read_memtype.type; +} +static int xen_get_free_region (unsigned long base,unsigned long size,int replace_reg) {struct xen_platform_op op;
@@ -34,12 +80,10 @@ static int xen_get_free_region(unsigned long base, unsigned long size, int replareturn replace_reg; } -/* DOM0 TODO: Need to fill in the remaining mtrr methods to have full -* working userland mtrr support. */ static struct mtrr_ops xen_mtrr_ops = { .vendor =X86_VENDOR_UNKNOWN , -// .set = xen_set_mtrr, -// .get = xen_get_mtrr, + .set = xen_set_mtrr, + .get = xen_get_mtrr, .get_free_region = xen_get_free_region, .validate_add_page = generic_validate_add_page, .have_wrcomb = positive_have_wrcomb,
Signature · 1 line
1.6.0.6
Quoted 4 lines · Jeremy Fitzhardinge
From: Jeremy Fitzhardinge <[email protected]>
*** BLURB HERE ***
Bugger. Teach me to send before saving. That should be:
Subject: [PATCH 00/19] xen/dom0: core implementation
This series implements the core part of Xen dom0 support. Domain 0 (dom0) is the first Xen domain started on system boot, loaded by the hypervisor itself. Unlike a normal domain, it has direct hardware access, and is responsible for supplying the device drivers for most of the system's hardware.
The series covers the following areas:
- dom0 console support
- initialize xenbus
- give dom0 kernel direct hardware access (both IO ports and IO mappings)
- enable more CPU features, specifically APIC and ACPI
- support for dom0-specific hypercalls
- Kconfig updates to enable dom0
- MTRR updates, to paravirtualize the mtrr via Xen
This series can also be pulled from:
git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git push/xen/dom0/core
Thanks,
J
Ian Campbell (4):
xen: disable PAT
xen/dom0: Use host E820 map
xen: implement XENMEM_machphys_mapping
xen: clear reserved bits in l3 entries given in the initial
pagetables
Jeremy Fitzhardinge (6):
xen dom0: Make hvc_xen console work for dom0.
xen-dom0: only selectively disable cpu features xen/dom0: use _PAGE_IOMAP in ioremap to do machine mappings paravirt/xen: add pvop for page_is_ram
xen/dom0: add XEN_DOM0 config option
xen: allow enable use of VGA console on dom0
Juan Quintela (2):
xen dom0: Initialize xenbus for dom0.
xen dom0: Set up basic IO permissions for dom0.
Mark McLoughlin (5):
xen mtrr: Use specific cpu_has_foo macros instead of generic
cpu_has()
xen mtrr: Kill some unneccessary includes
xen mtrr: Use generic_validate_add_page()
xen mtrr: Implement xen_get_free_region()
xen mtrr: Add xen_{get,set}_mtrr() implementations
Stephen Tweedie (2):
xen dom0: Add support for the platform_ops hypercall xen mtrr: Add mtrr_ops support for Xen mtrr
arch/x86/include/asm/page.h | 9 +- arch/x86/include/asm/paravirt.h | 7 + arch/x86/include/asm/pat.h | 5 + arch/x86/include/asm/xen/hypercall.h | 8 + arch/x86/include/asm/xen/interface.h | 6 +- arch/x86/include/asm/xen/interface_32.h | 5 + arch/x86/include/asm/xen/interface_64.h | 13 +-- arch/x86/include/asm/xen/page.h | 15 +-- arch/x86/kernel/cpu/mtrr/Makefile | 1 + arch/x86/kernel/cpu/mtrr/amd.c | 1 + arch/x86/kernel/cpu/mtrr/centaur.c | 1 + arch/x86/kernel/cpu/mtrr/cyrix.c | 1 + arch/x86/kernel/cpu/mtrr/generic.c | 1 + arch/x86/kernel/cpu/mtrr/main.c | 11 +- arch/x86/kernel/cpu/mtrr/mtrr.h | 7 + arch/x86/kernel/cpu/mtrr/xen.c | 120 ++++++++++++++++ arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/ioremap.c | 2 +- arch/x86/mm/pat.c | 5 - arch/x86/xen/Kconfig | 26 ++++ arch/x86/xen/Makefile | 3 +- arch/x86/xen/enlighten.c | 58 ++++++-- arch/x86/xen/mmu.c | 135 ++++++++++++++++++- arch/x86/xen/setup.c | 51 ++++++- arch/x86/xen/vga.c | 65 +++++++++ arch/x86/xen/xen-ops.h | 12 ++ drivers/char/hvc_xen.c | 101 +++++++++----- drivers/xen/events.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 30 ++++- include/xen/events.h | 2 + include/xen/interface/memory.h | 42 ++++++ include/xen/interface/platform.h | 232 +++++++++++++++++++++++++++++++ include/xen/interface/xen.h | 41 ++++++ 33 files changed, 931 insertions(+), 88 deletions(-)
create mode 100644 arch/x86/kernel/cpu/mtrr/xen.c create mode 100644 arch/x86/xen/vga.c create mode 100644 include/xen/interface/platform.h