diff options
| -rw-r--r-- | xen/arch/x86/domain.c | 48 | ||||
| -rw-r--r-- | xen/common/domain.c | 6 | ||||
| -rw-r--r-- | xen/common/domctl.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-ia64/domain.h | 3 | ||||
| -rw-r--r-- | xen/include/asm-x86/fixmap.h | 7 | ||||
| -rw-r--r-- | xen/include/xen/domain.h | 6 |
6 files changed, 69 insertions, 5 deletions
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 10844570a3..8d24dbccdc 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -45,6 +45,7 @@ #include <asm/mpspec.h> #include <asm/ldt.h> #include <asm/hypercall.h> +#include <asm/fixmap.h> #include <asm/hvm/hvm.h> #include <asm/hvm/support.h> #include <asm/debugreg.h> @@ -221,6 +222,53 @@ void free_vcpu_struct(struct vcpu *v) free_xenheap_page(v); } +static DEFINE_PER_CPU(struct page_info *[ + PFN_UP(sizeof(struct vcpu_guest_context))], vgc_pages); + +struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + unsigned int i, cpu = smp_processor_id(); + enum fixed_addresses idx = FIX_VGC_BEGIN - + cpu * PFN_UP(sizeof(struct vcpu_guest_context)); + +#ifdef __i386__ + BUILD_BUG_ON(sizeof(struct vcpu_guest_context) > PAGE_SIZE); +#endif + BUG_ON(per_cpu(vgc_pages[0], cpu) != NULL); + + for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) + { + struct page_info *pg = alloc_domheap_page(NULL, 0); + + if ( unlikely(pg == NULL) ) + { + free_vcpu_guest_context(NULL); + return NULL; + } + __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR); + per_cpu(vgc_pages[i], cpu) = pg; + } + return (void *)fix_to_virt(idx); +} + +void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + unsigned int i, cpu = smp_processor_id(); + enum fixed_addresses idx = FIX_VGC_BEGIN - + cpu * PFN_UP(sizeof(struct vcpu_guest_context)); + + BUG_ON(vgc && vgc != (void *)fix_to_virt(idx)); + + for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) + { + if ( !per_cpu(vgc_pages[i], cpu) ) + continue; + __set_fixmap(idx - i, 0, 0); + free_domheap_page(per_cpu(vgc_pages[i], cpu)); + per_cpu(vgc_pages[i], cpu) = NULL; + } +} + #ifdef __x86_64__ static int setup_compat_l4(struct vcpu *v) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1290f655fe..852c968bba 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -832,12 +832,12 @@ long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg) if ( v->vcpu_info == &dummy_vcpu_info ) return -EINVAL; - if ( (ctxt = xmalloc(struct vcpu_guest_context)) == NULL ) + if ( (ctxt = alloc_vcpu_guest_context()) == NULL ) return -ENOMEM; if ( copy_from_guest(ctxt, arg, 1) ) { - xfree(ctxt); + free_vcpu_guest_context(ctxt); return -EFAULT; } @@ -847,7 +847,7 @@ long do_vcpu_op(int cmd, int vcpuid, XEN_GUEST_HANDLE(void) arg) rc = boot_vcpu(d, vcpuid, ctxt); domain_unlock(d); - xfree(ctxt); + free_vcpu_guest_context(ctxt); break; case VCPUOP_up: diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 4d4f8ebe2a..5e13094518 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -295,7 +295,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) < sizeof(struct compat_vcpu_guest_context)); #endif ret = -ENOMEM; - if ( (c.nat = xmalloc(struct vcpu_guest_context)) == NULL ) + if ( (c.nat = alloc_vcpu_guest_context()) == NULL ) goto svc_out; #ifdef CONFIG_COMPAT @@ -318,7 +318,7 @@ long do_domctl(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) } svc_out: - xfree(c.nat); + free_vcpu_guest_context(c.nat); rcu_unlock_domain(d); } break; diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h index 14064ce247..e5b71e0011 100644 --- a/xen/include/asm-ia64/domain.h +++ b/xen/include/asm-ia64/domain.h @@ -25,6 +25,9 @@ struct vcpu; extern void relinquish_vcpu_resources(struct vcpu *v); extern int vcpu_late_initialise(struct vcpu *v); +#define alloc_vcpu_guest_context() xmalloc(struct vcpu_guest_context) +#define free_vcpu_guest_context(vgc) xfree(vgc) + /* given a current domain metaphysical address, return the physical address */ extern unsigned long translate_domain_mpaddr(unsigned long mpaddr, struct p2m_entry* entry); diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 1815acdf18..0614291b9d 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -16,6 +16,7 @@ #include <asm/apicdef.h> #include <asm/acpi.h> #include <asm/page.h> +#include <xen/pfn.h> #include <xen/kexec.h> #include <xen/iommu.h> #include <asm/amd-iommu.h> @@ -34,6 +35,12 @@ enum fixed_addresses { #ifdef __i386__ FIX_PAE_HIGHMEM_0, FIX_PAE_HIGHMEM_END = FIX_PAE_HIGHMEM_0 + NR_CPUS-1, +#define FIX_VGC_END FIX_PAE_HIGHMEM_0 +#define FIX_VGC_BEGIN FIX_PAE_HIGHMEM_END +#else + FIX_VGC_END, + FIX_VGC_BEGIN = FIX_VGC_END + + PFN_UP(sizeof(struct vcpu_guest_context)) * NR_CPUS - 1, #endif FIX_APIC_BASE, FIX_IO_APIC_BASE_0, diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index edffd1f46b..ddebbe14a9 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -32,6 +32,12 @@ void free_domain_struct(struct domain *d); struct vcpu *alloc_vcpu_struct(void); void free_vcpu_struct(struct vcpu *v); +/* Allocate/free a vcpu_guest_context structure. */ +#ifndef alloc_vcpu_guest_context +struct vcpu_guest_context *alloc_vcpu_guest_context(void); +void free_vcpu_guest_context(struct vcpu_guest_context *); +#endif + /* * Initialise/destroy arch-specific details of a VCPU. * - vcpu_initialise() is called after the basic generic fields of the |