[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v2 for-next v2 8/8] x86/mm: split HVM grant table code to hvm/mm.c
PG_external requires hardware support so the code guarded by that is HVM only. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- xen/arch/x86/hvm/Makefile | 1 + xen/arch/x86/hvm/mm.c | 85 +++++++++++++++++++++++++++++++++++++++ xen/arch/x86/mm.c | 49 ---------------------- xen/include/asm-x86/grant_table.h | 5 +++ 4 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 xen/arch/x86/hvm/mm.c diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 0a3d0f4f7e..3e8d362c8e 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -13,6 +13,7 @@ obj-y += intercept.o obj-y += io.o obj-y += ioreq.o obj-y += irq.o +obj-y += mm.o obj-y += monitor.o obj-y += mtrr.o obj-y += nestedhvm.o diff --git a/xen/arch/x86/hvm/mm.c b/xen/arch/x86/hvm/mm.c new file mode 100644 index 0000000000..8a6950b551 --- /dev/null +++ b/xen/arch/x86/hvm/mm.c @@ -0,0 +1,85 @@ +/****************************************************************************** + * arch/x86/hvm/mm.c + * + * Copyright (c) 2002-2005 K A Fraser + * Copyright (c) 2004 Christian Limpach + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#include <xen/types.h> + +#include <public/grant_table.h> + +#include <asm/p2m.h> + +int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, + unsigned int cache_flags) +{ + p2m_type_t p2mt; + int rc; + + if ( cache_flags || (flags & ~GNTMAP_readonly) != GNTMAP_host_map ) + return GNTST_general_error; + + if ( flags & GNTMAP_readonly ) + p2mt = p2m_grant_map_ro; + else + p2mt = p2m_grant_map_rw; + rc = guest_physmap_add_entry(current->domain, + _gfn(addr >> PAGE_SHIFT), + _mfn(frame), PAGE_ORDER_4K, p2mt); + if ( rc ) + return GNTST_general_error; + else + return GNTST_okay; +} + + +int replace_grant_p2m_mapping( int64_t addr, unsigned long frame, + uint64_t new_addr, unsigned int flags) +{ + unsigned long gfn = (unsigned long)(addr >> PAGE_SHIFT); + p2m_type_t type; + mfn_t old_mfn; + struct domain *d = current->domain; + + if ( new_addr != 0 || (flags & GNTMAP_contains_pte) ) + return GNTST_general_error; + + old_mfn = get_gfn(d, gfn, &type); + if ( !p2m_is_grant(type) || mfn_x(old_mfn) != frame ) + { + put_gfn(d, gfn); + gdprintk(XENLOG_WARNING, + "old mapping invalid (type %d, mfn %" PRI_mfn ", frame %lx)\n", + type, mfn_x(old_mfn), frame); + return GNTST_general_error; + } + guest_physmap_remove_page(d, _gfn(gfn), _mfn(frame), PAGE_ORDER_4K); + + put_gfn(d, gfn); + return GNTST_okay; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 169ae7e4a1..7ddb271097 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1009,29 +1009,6 @@ int vcpu_destroy_pagetables(struct vcpu *v) return rc != -EINTR ? rc : -ERESTART; } -static int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, - unsigned int flags, - unsigned int cache_flags) -{ - p2m_type_t p2mt; - int rc; - - if ( cache_flags || (flags & ~GNTMAP_readonly) != GNTMAP_host_map ) - return GNTST_general_error; - - if ( flags & GNTMAP_readonly ) - p2mt = p2m_grant_map_ro; - else - p2mt = p2m_grant_map_rw; - rc = guest_physmap_add_entry(current->domain, - _gfn(addr >> PAGE_SHIFT), - _mfn(frame), PAGE_ORDER_4K, p2mt); - if ( rc ) - return GNTST_general_error; - else - return GNTST_okay; -} - int create_grant_host_mapping(uint64_t addr, unsigned long frame, unsigned int flags, unsigned int cache_flags) { @@ -1041,32 +1018,6 @@ int create_grant_host_mapping(uint64_t addr, unsigned long frame, return create_grant_pv_mapping(addr, frame, flags, cache_flags); } -static int replace_grant_p2m_mapping( - uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) -{ - unsigned long gfn = (unsigned long)(addr >> PAGE_SHIFT); - p2m_type_t type; - mfn_t old_mfn; - struct domain *d = current->domain; - - if ( new_addr != 0 || (flags & GNTMAP_contains_pte) ) - return GNTST_general_error; - - old_mfn = get_gfn(d, gfn, &type); - if ( !p2m_is_grant(type) || mfn_x(old_mfn) != frame ) - { - put_gfn(d, gfn); - gdprintk(XENLOG_WARNING, - "old mapping invalid (type %d, mfn %" PRI_mfn ", frame %lx)\n", - type, mfn_x(old_mfn), frame); - return GNTST_general_error; - } - guest_physmap_remove_page(d, _gfn(gfn), _mfn(frame), PAGE_ORDER_4K); - - put_gfn(d, gfn); - return GNTST_okay; -} - int replace_grant_host_mapping(uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags) { diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-x86/grant_table.h index 9580dc32dc..f4cfcbe58d 100644 --- a/xen/include/asm-x86/grant_table.h +++ b/xen/include/asm-x86/grant_table.h @@ -21,6 +21,11 @@ int create_grant_pv_mapping(uint64_t addr, unsigned long frame, unsigned int flags, unsigned int cache_flags); int replace_grant_pv_mapping(uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags); +int create_grant_p2m_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, + unsigned int cache_flags); +int replace_grant_p2m_mapping(uint64_t addr, unsigned long frame, + uint64_t new_addr, unsigned int flags); #define gnttab_create_shared_page(d, t, i) \ do { \ -- 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 |