Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.1:kernel-2.6.32
xen
19896-32on64-arg-xlat.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 19896-32on64-arg-xlat.patch of Package xen
# HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1246877479 -3600 # Node ID bcee82a0e9d643e569fb96ac3d2ad3d27bb59a23 # Parent 83b37290ed5d10d955ebb3ead0b70e0d00b21e8b Avoid compat_arg_xlat to be a large per-CPU object Signed-off-by: Jan Beulich <jbeulich@novell.com> # HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1246877701 -3600 # Node ID 3313efd1c367a518601efb1e84502208403ea93d # Parent bcee82a0e9d643e569fb96ac3d2ad3d27bb59a23 x86: PERCPU_SHIFT can be reduced to 12 now compat_arg_xlat_area is not directly a per-cpu object. Signed-off-by: Keir Fraser <keir.fraser@citrix.com> # HG changeset patch # User Keir Fraser <keir.fraser@citrix.com> # Date 1246877717 -3600 # Node ID 100b05eed0d574ee48d88b7c9a58fc2b6fa5dfb2 # Parent 3313efd1c367a518601efb1e84502208403ea93d 32on64: increase size of compat argument translation area to 2 pages. The existing single page is not quite large enough to translate a XENMEM_exchange hypercall with order=3D9. Since Linux uses MAX_CONTIG_ORDER of 9 this seems like a reasonable upper bound to support. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -889,6 +889,9 @@ static int __devinit do_boot_cpu(int api per_cpu(doublefault_tss, cpu) = alloc_xenheap_page(); memset(per_cpu(doublefault_tss, cpu), 0, PAGE_SIZE); } +#else + if (!per_cpu(compat_arg_xlat, cpu)) + setup_compat_arg_xlat(cpu, apicid_to_node[apicid]); #endif /* --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -58,7 +58,7 @@ int compat_arch_memory_op(int op, XEN_GU case XENMEM_add_to_physmap: { struct compat_add_to_physmap cmp; - struct xen_add_to_physmap *nat = (void *)COMPAT_ARG_XLAT_VIRT_BASE; + struct xen_add_to_physmap *nat = COMPAT_ARG_XLAT_VIRT_BASE; if ( copy_from_guest(&cmp, arg, 1) ) return -EFAULT; @@ -72,7 +72,7 @@ int compat_arch_memory_op(int op, XEN_GU case XENMEM_set_memory_map: { struct compat_foreign_memory_map cmp; - struct xen_foreign_memory_map *nat = (void *)COMPAT_ARG_XLAT_VIRT_BASE; + struct xen_foreign_memory_map *nat = COMPAT_ARG_XLAT_VIRT_BASE; if ( copy_from_guest(&cmp, arg, 1) ) return -EFAULT; @@ -91,7 +91,7 @@ int compat_arch_memory_op(int op, XEN_GU case XENMEM_machine_memory_map: { struct compat_memory_map cmp; - struct xen_memory_map *nat = (void *)COMPAT_ARG_XLAT_VIRT_BASE; + struct xen_memory_map *nat = COMPAT_ARG_XLAT_VIRT_BASE; if ( copy_from_guest(&cmp, arg, 1) ) return -EFAULT; @@ -189,7 +189,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE(mm if ( unlikely(!guest_handle_okay(cmp_uops, count)) ) return -EFAULT; - set_xen_guest_handle(nat_ops, (void *)COMPAT_ARG_XLAT_VIRT_BASE); + set_xen_guest_handle(nat_ops, COMPAT_ARG_XLAT_VIRT_BASE); for ( ; count; count -= i ) { --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -22,6 +22,7 @@ #include <xen/init.h> #include <xen/mm.h> #include <xen/sched.h> +#include <xen/numa.h> #include <xen/guest_access.h> #include <asm/current.h> #include <asm/asm_defns.h> @@ -30,14 +31,13 @@ #include <asm/fixmap.h> #include <asm/hypercall.h> #include <asm/msr.h> -#include <asm/numa.h> #include <public/memory.h> #ifdef CONFIG_COMPAT unsigned int m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; #endif -DEFINE_PER_CPU(char, compat_arg_xlat[COMPAT_ARG_XLAT_SIZE]); +DEFINE_PER_CPU(void *, compat_arg_xlat); /* Top-level master (and idle-domain) page directory. */ l4_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) @@ -293,6 +293,25 @@ void __init zap_low_mappings(void) 0x10, __PAGE_HYPERVISOR); } +int __cpuinit setup_compat_arg_xlat(unsigned int cpu, int node) +{ + unsigned int order = get_order_from_bytes(COMPAT_ARG_XLAT_SIZE); + unsigned long sz = PAGE_SIZE << order; + unsigned int memflags = node != NUMA_NO_NODE ? MEMF_node(node) : 0; + struct page_info *pg; + + pg = alloc_domheap_pages(NULL, order, memflags); + if ( !pg ) + return -ENOMEM; + + for ( ; (sz -= PAGE_SIZE) >= COMPAT_ARG_XLAT_SIZE; ++pg ) + free_domheap_page(pg); + + per_cpu(compat_arg_xlat, cpu) = page_to_virt(pg); + + return 0; +} + void __init subarch_init_memory(void) { unsigned long i, n, v, m2p_start_mfn; @@ -350,6 +369,10 @@ void __init subarch_init_memory(void) share_xen_page_with_privileged_guests(page, XENSHARE_readonly); } } + + if ( setup_compat_arg_xlat(smp_processor_id(), + apicid_to_node[boot_cpu_physical_apicid]) ) + panic("Could not setup argument translation area"); } long subarch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -87,7 +87,7 @@ int compat_vcpu_op(int cmd, int vcpuid, if ( copy_from_guest(&cmp, arg, 1) ) return -EFAULT; - nat = (void *)COMPAT_ARG_XLAT_VIRT_BASE; + nat = COMPAT_ARG_XLAT_VIRT_BASE; XLAT_vcpu_set_singleshot_timer(nat, &cmp); rc = do_vcpu_op(cmd, vcpuid, guest_handle_from_ptr(nat, void)); break; --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -97,7 +97,7 @@ int compat_grant_table_op(unsigned int c struct compat_gnttab_copy copy; } cmp; - set_xen_guest_handle(nat.uop, (void *)COMPAT_ARG_XLAT_VIRT_BASE); + set_xen_guest_handle(nat.uop, COMPAT_ARG_XLAT_VIRT_BASE); switch ( cmd ) { case GNTTABOP_setup_table: --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -27,7 +27,7 @@ int compat_memory_op(unsigned int cmd, X struct compat_translate_gpfn_list xlat; } cmp; - set_xen_guest_handle(nat.hnd, (void *)COMPAT_ARG_XLAT_VIRT_BASE); + set_xen_guest_handle(nat.hnd, COMPAT_ARG_XLAT_VIRT_BASE); split = 0; switch ( op ) { --- a/xen/include/asm-x86/percpu.h +++ b/xen/include/asm-x86/percpu.h @@ -1,7 +1,7 @@ #ifndef __X86_PERCPU_H__ #define __X86_PERCPU_H__ -#define PERCPU_SHIFT 13 +#define PERCPU_SHIFT 12 #define PERCPU_SIZE (1UL << PERCPU_SHIFT) /* Separate out the type, so (int[3], foo) works. */ --- a/xen/include/asm-x86/x86_64/uaccess.h +++ b/xen/include/asm-x86/x86_64/uaccess.h @@ -2,8 +2,9 @@ #define __X86_64_UACCESS_H #define COMPAT_ARG_XLAT_VIRT_BASE this_cpu(compat_arg_xlat) -#define COMPAT_ARG_XLAT_SIZE PAGE_SIZE -DECLARE_PER_CPU(char, compat_arg_xlat[COMPAT_ARG_XLAT_SIZE]); +#define COMPAT_ARG_XLAT_SIZE (2*PAGE_SIZE) +DECLARE_PER_CPU(void *, compat_arg_xlat); +int setup_compat_arg_xlat(unsigned int cpu, int node); #define is_compat_arg_xlat_range(addr, size) ({ \ unsigned long __off; \ __off = (unsigned long)(addr) - (unsigned long)COMPAT_ARG_XLAT_VIRT_BASE; \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
