[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v3 17/21] x86/mm: move compat descriptor handling code
Move them along side the non-compat variants. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- xen/arch/x86/pv/descriptor-tables.c | 40 ++++++++++++++++++++++++++++++++++++ xen/arch/x86/x86_64/compat/mm.c | 41 ------------------------------------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/pv/descriptor-tables.c b/xen/arch/x86/pv/descriptor-tables.c index 12dc45b671..a302812774 100644 --- a/xen/arch/x86/pv/descriptor-tables.c +++ b/xen/arch/x86/pv/descriptor-tables.c @@ -177,6 +177,46 @@ long do_update_descriptor(u64 pa, u64 desc) return ret; } +int compat_set_gdt(XEN_GUEST_HANDLE_PARAM(uint) frame_list, + unsigned int entries) +{ + unsigned int i, nr_pages = (entries + 511) / 512; + unsigned long frames[16]; + long ret; + + /* Rechecked in pv_set_gdt, but ensures a sane limit for copy_from_user(). */ + if ( entries > FIRST_RESERVED_GDT_ENTRY ) + return -EINVAL; + + if ( !guest_handle_okay(frame_list, nr_pages) ) + return -EFAULT; + + for ( i = 0; i < nr_pages; ++i ) + { + unsigned int frame; + + if ( __copy_from_guest(&frame, frame_list, 1) ) + return -EFAULT; + frames[i] = frame; + guest_handle_add_offset(frame_list, 1); + } + + domain_lock(current->domain); + + if ( (ret = pv_set_gdt(current, frames, entries)) == 0 ) + flush_tlb_local(); + + domain_unlock(current->domain); + + return ret; +} + +int compat_update_descriptor(u32 pa_lo, u32 pa_hi, u32 desc_lo, u32 desc_hi) +{ + return do_update_descriptor(pa_lo | ((u64)pa_hi << 32), + desc_lo | ((u64)desc_hi << 32)); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index dc41f61c71..df91020620 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -6,47 +6,6 @@ #include <asm/mem_paging.h> #include <asm/mem_sharing.h> -#include <asm/pv/processor.h> - -int compat_set_gdt(XEN_GUEST_HANDLE_PARAM(uint) frame_list, unsigned int entries) -{ - unsigned int i, nr_pages = (entries + 511) / 512; - unsigned long frames[16]; - long ret; - - /* Rechecked in pv_set_gdt, but ensures a sane limit for copy_from_user(). */ - if ( entries > FIRST_RESERVED_GDT_ENTRY ) - return -EINVAL; - - if ( !guest_handle_okay(frame_list, nr_pages) ) - return -EFAULT; - - for ( i = 0; i < nr_pages; ++i ) - { - unsigned int frame; - - if ( __copy_from_guest(&frame, frame_list, 1) ) - return -EFAULT; - frames[i] = frame; - guest_handle_add_offset(frame_list, 1); - } - - domain_lock(current->domain); - - if ( (ret = pv_set_gdt(current, frames, entries)) == 0 ) - flush_tlb_local(); - - domain_unlock(current->domain); - - return ret; -} - -int compat_update_descriptor(u32 pa_lo, u32 pa_hi, u32 desc_lo, u32 desc_hi) -{ - return do_update_descriptor(pa_lo | ((u64)pa_hi << 32), - desc_lo | ((u64)desc_hi << 32)); -} - int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { struct compat_machphys_mfn_list xmml; -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |