diff -r b9071cba1c2d xen/arch/ia64/xen/mm.c --- a/xen/arch/ia64/xen/mm.c Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/arch/ia64/xen/mm.c Wed Nov 14 11:20:52 2007 +0000 @@ -2144,16 +2144,18 @@ dom0vp_unexpose_foreign_p2m(struct domai // mfn: frame: machine page frame // flags: GNTMAP_readonly | GNTMAP_application_map | GNTMAP_contains_pte int -create_grant_host_mapping(unsigned long gpaddr, - unsigned long mfn, unsigned int flags) +create_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, + unsigned int flags, unsigned int cache_flags) { struct domain* d = current->domain; struct page_info* page; int ret; - if (flags & (GNTMAP_device_map | - GNTMAP_application_map | GNTMAP_contains_pte)) { - gdprintk(XENLOG_INFO, "%s: flags 0x%x\n", __func__, flags); + if ((flags & (GNTMAP_device_map | + GNTMAP_application_map | GNTMAP_contains_pte)) || + (cache_flags)) { + gdprintk(XENLOG_INFO, "%s: flags 0x%x cache_flags 0x%x\n", + __func__, flags, cache_flags); return GNTST_general_error; } diff -r b9071cba1c2d xen/arch/powerpc/mm.c --- a/xen/arch/powerpc/mm.c Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/arch/powerpc/mm.c Wed Nov 14 10:35:22 2007 +0000 @@ -168,7 +168,7 @@ static int destroy_grant_va_mapping( } int create_grant_host_mapping( - unsigned long addr, unsigned long frame, unsigned int flags) + unsigned long addr, unsigned long frame, unsigned int flags, unsigned int cache_flags) { if (flags & GNTMAP_application_map) { printk("%s: GNTMAP_application_map not supported\n", __func__); @@ -177,6 +177,11 @@ int create_grant_host_mapping( } if (flags & GNTMAP_contains_pte) { printk("%s: GNTMAP_contains_pte not supported\n", __func__); + BUG(); + return GNTST_general_error; + } + if (cache_flags) { + printk("%s: cache_flags not supported\n", __func__); BUG(); return GNTST_general_error; } diff -r b9071cba1c2d xen/arch/x86/mm.c --- a/xen/arch/x86/mm.c Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/arch/x86/mm.c Wed Nov 14 10:32:22 2007 +0000 @@ -849,12 +849,14 @@ void put_page_from_l1e(l1_pgentry_t l1e, void put_page_from_l1e(l1_pgentry_t l1e, struct domain *d) { unsigned long pfn = l1e_get_pfn(l1e); - struct page_info *page = mfn_to_page(pfn); + struct page_info *page; struct domain *e; struct vcpu *v; if ( !(l1e_get_flags(l1e) & _PAGE_PRESENT) || !mfn_valid(pfn) ) return; + + page = mfn_to_page(pfn); e = page_get_owner(page); @@ -2763,8 +2765,8 @@ static int destroy_grant_va_mapping( return replace_grant_va_mapping(addr, frame, l1e_empty(), v); } -int create_grant_host_mapping( - uint64_t addr, unsigned long frame, unsigned int flags) +int create_grant_host_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, unsigned int cache_flags) { l1_pgentry_t pte = l1e_from_pfn(frame, GRANT_PTE_FLAGS); @@ -2772,6 +2774,13 @@ int create_grant_host_mapping( l1e_add_flags(pte,_PAGE_USER); if ( !(flags & GNTMAP_readonly) ) l1e_add_flags(pte,_PAGE_RW); + + if ( (cache_flags & GTF_PAT) ) + l1e_add_flags(pte,_PAGE_PAT); + if ( (cache_flags & GTF_PWT) ) + l1e_add_flags(pte,_PAGE_PWT); + if ( (cache_flags & GTF_PCD) ) + l1e_add_flags(pte,_PAGE_PCD); if ( flags & GNTMAP_contains_pte ) return create_grant_pte_mapping(addr, pte, current); diff -r b9071cba1c2d xen/common/grant_table.c --- a/xen/common/grant_table.c Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/common/grant_table.c Wed Nov 14 15:17:00 2007 +0000 @@ -198,6 +198,7 @@ __gnttab_map_grant_ref( int handle; unsigned long frame = 0; int rc = GNTST_okay; + unsigned int cache_flags = 0; struct active_grant_entry *act; struct grant_mapping *mt; grant_entry_t *sha; @@ -326,36 +327,86 @@ __gnttab_map_grant_ref( frame = act->frame; + cache_flags = (sha->flags & (GTF_PAT | GTF_PWT | GTF_PCD) ); + spin_unlock(&rd->grant_table->lock); - if ( unlikely(!mfn_valid(frame)) || - unlikely(!((op->flags & GNTMAP_readonly) ? - get_page(mfn_to_page(frame), rd) : - get_page_and_type(mfn_to_page(frame), rd, - PGT_writable_page))) ) - { - if ( !rd->is_dying ) - gdprintk(XENLOG_WARNING, "Could not pin grant frame %lx\n", frame); - rc = GNTST_general_error; - goto undo_out; - } + /* Could be an iomem page for remapping */ + if ( is_iomem_page(frame) ) + { + /* + * Only allow iomem GNTMAP_host_map mappings of pages from + * dom0 that have the correct iomem permissions set up. + * GNTMAP_device_map of iomem page makes no sense + */ + if ( rd->domain_id != 0 || + !iomem_access_permitted(rd, frame, frame) || + !(op->flags & GNTMAP_host_map) || + op->flags & GNTMAP_device_map) + { + gdprintk(XENLOG_WARNING, + "Iomem mapping not permitted %lx (domain %d)\n", + frame, rd->domain_id); + rc = GNTST_general_error; + goto undo_out; + } + + /* Reference counting for in-range I/O pages. */ + if ( mfn_valid(frame) && + !((op->flags & GNTMAP_readonly) ? + get_page(mfn_to_page(frame), rd) : + get_page_and_type(mfn_to_page(frame), rd, + PGT_writable_page))) + { + if ( !rd->is_dying ) + gdprintk(XENLOG_WARNING, + "Could not pin grant frame %lx\n", frame); + rc = GNTST_general_error; + goto undo_out; + } - if ( op->flags & GNTMAP_host_map ) - { - rc = create_grant_host_mapping(op->host_addr, frame, op->flags); + rc = create_grant_host_mapping(op->host_addr, frame, op->flags, + cache_flags); if ( rc != GNTST_okay ) { - if ( !(op->flags & GNTMAP_readonly) ) + if ( mfn_valid(frame) && + !(op->flags & GNTMAP_readonly) ) put_page_type(mfn_to_page(frame)); put_page(mfn_to_page(frame)); goto undo_out; } - - if ( op->flags & GNTMAP_device_map ) - { - (void)get_page(mfn_to_page(frame), rd); - if ( !(op->flags & GNTMAP_readonly) ) - get_page_type(mfn_to_page(frame), PGT_writable_page); + } + else + { + if ( unlikely(!mfn_valid(frame)) || + unlikely(!((op->flags & GNTMAP_readonly) ? + get_page(mfn_to_page(frame), rd) : + get_page_and_type(mfn_to_page(frame), rd, + PGT_writable_page))) ) + { + if ( !rd->is_dying ) + gdprintk(XENLOG_WARNING, "Could not pin grant frame %lx\n", frame); + rc = GNTST_general_error; + goto undo_out; + } + + if ( op->flags & GNTMAP_host_map ) + { + rc = create_grant_host_mapping(op->host_addr, frame, op->flags, 0); + if ( rc != GNTST_okay ) + { + if ( !(op->flags & GNTMAP_readonly) ) + put_page_type(mfn_to_page(frame)); + put_page(mfn_to_page(frame)); + goto undo_out; + } + + if ( op->flags & GNTMAP_device_map ) + { + (void)get_page(mfn_to_page(frame), rd); + if ( !(op->flags & GNTMAP_readonly) ) + get_page_type(mfn_to_page(frame), PGT_writable_page); + } } } @@ -576,10 +627,27 @@ __gnttab_unmap_common_complete(struct gn goto unmap_out; } - if ( op->flags & GNTMAP_readonly ) - put_page(mfn_to_page(op->frame)); - else - put_page_and_type(mfn_to_page(op->frame)); + if ( is_iomem_page(op->frame) ) + { + /* Shouldn't be able to get a mapping of iomem from domain != 0 */ + BUG_ON(rd->domain_id != 0); + + /* Only do refcounting on in-range mfns */ + if ( mfn_valid(op->frame) ) + { + if ( op->flags & GNTMAP_readonly ) + put_page(mfn_to_page(op->frame)); + else + put_page_and_type(mfn_to_page(op->frame)); + } + } + else + { + if ( op->flags & GNTMAP_readonly ) + put_page(mfn_to_page(op->frame)); + else + put_page_and_type(mfn_to_page(op->frame)); + } } if ( (op->map->flags & (GNTMAP_device_map|GNTMAP_host_map)) == 0 ) @@ -1602,7 +1670,16 @@ gnttab_release_mappings( { BUG_ON(!(act->pin & GNTPIN_hstr_mask)); act->pin -= GNTPIN_hstr_inc; - gnttab_release_put_page(mfn_to_page(act->frame)); + if ( is_iomem_page(act->frame) ) + { + BUG_ON(rd->domain_id != 0); + /* Only do reference count on in-range mfns */ + if( mfn_valid(act->frame) ) + gnttab_release_put_page_and_type + (mfn_to_page(act->frame)); + } + else + gnttab_release_put_page(mfn_to_page(act->frame)); } } else @@ -1618,7 +1695,16 @@ gnttab_release_mappings( { BUG_ON(!(act->pin & GNTPIN_hstw_mask)); act->pin -= GNTPIN_hstw_inc; - gnttab_release_put_page_and_type(mfn_to_page(act->frame)); + if ( is_iomem_page(act->frame) ) + { + BUG_ON(rd->domain_id != 0); + /* Only do reference count on in-range mfns */ + if( mfn_valid(act->frame) ) + gnttab_release_put_page_and_type + (mfn_to_page(act->frame)); + } + else + gnttab_release_put_page_and_type(mfn_to_page(act->frame)); } if ( (act->pin & (GNTPIN_devw_mask|GNTPIN_hstw_mask)) == 0 ) diff -r b9071cba1c2d xen/include/asm-ia64/grant_table.h --- a/xen/include/asm-ia64/grant_table.h Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/include/asm-ia64/grant_table.h Wed Nov 14 11:47:06 2007 +0000 @@ -8,7 +8,8 @@ #define INITIAL_NR_GRANT_FRAMES 1 // for grant map/unmap -int create_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned int flags); +int create_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, + unsigned int flags, unsigned int cache_flags); int replace_grant_host_mapping(unsigned long gpaddr, unsigned long mfn, unsigned long new_gpaddr, unsigned int flags); // for grant transfer diff -r b9071cba1c2d xen/include/asm-powerpc/grant_table.h --- a/xen/include/asm-powerpc/grant_table.h Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/include/asm-powerpc/grant_table.h Wed Nov 14 11:47:05 2007 +0000 @@ -33,8 +33,8 @@ extern long pte_remove(ulong flags, ulon extern long pte_remove(ulong flags, ulong ptex, ulong avpn, ulong *hi, ulong *lo); -int create_grant_host_mapping( - unsigned long addr, unsigned long frame, unsigned int flags); +int create_grant_host_mapping(unsigned long addr, unsigned long frame, + unsigned int flags, unsigned int cache_flags); int replace_grant_host_mapping( unsigned long addr, unsigned long frame, unsigned long new_addr, unsigned int flags); diff -r b9071cba1c2d xen/include/asm-x86/grant_table.h --- a/xen/include/asm-x86/grant_table.h Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/include/asm-x86/grant_table.h Wed Nov 14 13:48:18 2007 +0000 @@ -13,8 +13,8 @@ * Caller must own caller's BIGLOCK, is responsible for flushing the TLB, and * must hold a reference to the page. */ -int create_grant_host_mapping( - uint64_t addr, unsigned long frame, unsigned int flags); +int create_grant_host_mapping(uint64_t addr, unsigned long frame, + unsigned int flags, unsigned int cache_flags); int replace_grant_host_mapping( uint64_t addr, unsigned long frame, uint64_t new_addr, unsigned int flags); diff -r b9071cba1c2d xen/include/public/grant_table.h --- a/xen/include/public/grant_table.h Wed Nov 14 09:17:29 2007 +0000 +++ b/xen/include/public/grant_table.h Wed Nov 14 11:59:43 2007 +0000 @@ -119,6 +119,7 @@ typedef struct grant_entry grant_entry_t * GTF_readonly: Restrict @domid to read-only mappings and accesses. [GST] * GTF_reading: Grant entry is currently mapped for reading by @domid. [XEN] * GTF_writing: Grant entry is currently mapped for writing by @domid. [XEN] + * GTF_PAT, GTF_PWT, GTF_PCD: Cache attribute flags for the grant [GST] */ #define _GTF_readonly (2) #define GTF_readonly (1U<<_GTF_readonly) @@ -126,6 +127,12 @@ typedef struct grant_entry grant_entry_t #define GTF_reading (1U<<_GTF_reading) #define _GTF_writing (4) #define GTF_writing (1U<<_GTF_writing) +#define _GTF_PAT (5) +#define GTF_PAT (1U<<_GTF_PAT) +#define _GTF_PWT (6) +#define GTF_PWT (1U<<_GTF_PWT) +#define _GTF_PCD (7) +#define GTF_PCD (1U<<_GTF_PCD) /* * Subflags for GTF_accept_transfer: