xencomm common code
A message that is not in the archive (sent off-list or not yet received): 1165344436.11779.27.camel@basalt
PATCH 1/1 xencomm common code
Move xencomm code out of arch/powerpc so it can be shared with other architectures. Currently it is only built for PowerPC, leaving IA64's fork untouched.
xen/common/xencomm.c new file +316 -0
@@ -0,0 +1,316 @@ +/* +* 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, write to the Free Software +* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +* +* Copyright (C) IBM Corp. 2006 +* +* Authors: Hollis Blanchard <[email protected]> +* Tristan Gingold <[email protected]> +*/ + +#include <xen/config.h> +#include <xen/mm.h> +#include <xen/sched.h> +#include <xen/xencomm.h> +#include <public/xen.h> +#include <public/xencomm.h> + + +#undef DEBUG +#ifdef DEBUG +static int xencomm_debug =1 ;/* extremely verbose */ +#else +#define xencomm_debug 0 +#endif + +static unsigned long +xencomm_inline_from_guest (void *to,const void *from,unsigned int n, +unsigned int skip) +{ +unsigned long src_paddr =xencomm_inline_addr (from); + + src_paddr += skip; + +while (n >0 ) { +unsigned int chunksz; +unsigned long src_maddr; +unsigned int bytes; + + chunksz =PAGE_SIZE - (src_paddr %PAGE_SIZE ); + + bytes =min (chunksz, n); + + src_maddr =paddr_to_maddr (src_paddr); +if (xencomm_debug) +printk ("%lx[%d] -> %lx\n" , src_maddr, bytes, (unsigned long )to); +memcpy (to, (void *)src_maddr, bytes); + src_paddr += bytes; + to += bytes; + n -= bytes; + } + +/* Always successful. */ +return 0 ; +} + +/** +* xencomm_copy_from_guest: Copy a block of data from domain space. +* @to: Machine address. +* @from: Physical address to a xencomm buffer descriptor. +* @n: Number of bytes to copy. +* @skip: Number of bytes from the start to skip. +* +* Copy data from domain to hypervisor. +* +* Returns number of bytes that could not be copied. +* On success, this will be zero. +*/ +unsigned long +xencomm_copy_from_guest (void *to,const void *from,unsigned int n, +unsigned int skip) +{ +struct xencomm_desc *desc; +unsigned int from_pos =0 ; +unsigned int to_pos =0 ; +unsigned int i =0 ; + +if (xencomm_is_inline (from)) +return xencomm_inline_from_guest (to, from, n, skip); + +/* first we need to access the descriptor */ + desc = (struct xencomm_desc *)paddr_to_maddr ((unsigned long )from); +if (desc ==NULL ) +return n; + +if (desc->magic !=XENCOMM_MAGIC ) { +printk ("%s: error: %p magic was 0x%x\n" , + __func__, desc, desc->magic); +return n; + } + +/* iterate through the descriptor, copying up to a page at a time */ +while ((to_pos < n) && (i < desc->nr_addrs)) { +unsigned long src_paddr = desc->address[i]; +unsigned int pgoffset; +unsigned int chunksz; +unsigned int chunk_skip; + +if (src_paddr ==XENCOMM_INVALID ) { + i++; +continue ; + } + + pgoffset = src_paddr %PAGE_SIZE ; + chunksz =PAGE_SIZE - pgoffset; + + chunk_skip =min (chunksz, skip); + from_pos += chunk_skip; + chunksz -= chunk_skip; + skip -= chunk_skip; + +if (skip ==0 ) { +unsigned long src_maddr; +unsigned long dest = (unsigned long )to + to_pos; +unsigned int bytes =min (chunksz, n - to_pos); + + src_maddr =paddr_to_maddr (src_paddr + chunk_skip); +if (src_maddr ==0 ) +return n - to_pos; + +if (xencomm_debug) +printk ("%lx[%d] -> %lx\n" , src_maddr, bytes, dest); +memcpy ((void *)dest, (void *)src_maddr, bytes); + from_pos += bytes; + to_pos += bytes; + } + + i++; + } + +return n - to_pos; +} + +static unsigned long +xencomm_inline_to_guest (void *to,const void *from,unsigned int n, +unsigned int skip) +{ +unsigned long dest_paddr =xencomm_inline_addr (to); + + dest_paddr += skip; + +while (n >0 ) { +unsigned int chunksz; +unsigned long dest_maddr; +unsigned int bytes; + + chunksz =PAGE_SIZE - (dest_paddr %PAGE_SIZE ); + + bytes =min (chunksz, n); + + dest_maddr =paddr_to_maddr (dest_paddr); +if (xencomm_debug) +printk ("%lx[%d] -> %lx\n" , (unsigned long )from, bytes, dest_maddr); +memcpy ((void *)dest_maddr, (void *)from, bytes); + dest_paddr += bytes; + from += bytes; + n -= bytes; + } + +/* Always successful. */ +return 0 ; +} + +/** +* xencomm_copy_to_guest: Copy a block of data to domain space. +* @to: Physical address to xencomm buffer descriptor. +* @from: Machine address. +* @n: Number of bytes to copy. +* @skip: Number of bytes from the start to skip. +* +* Copy data from hypervisor to domain. +* +* Returns number of bytes that could not be copied. +* On success, this will be zero. +*/ +unsigned long +xencomm_copy_to_guest (void *to,const void *from,unsigned int n, +unsigned int skip) +{ +struct xencomm_desc *desc; +unsigned int from_pos =0 ; +unsigned int to_pos =0 ; +unsigned int i =0 ; + +if (xencomm_is_inline (to)) +return xencomm_inline_to_guest (to, from, n, skip); + +/* first we need to access the descriptor */ + desc = (struct xencomm_desc *)paddr_to_maddr ((unsigned long )to); +if (desc ==NULL ) +return n; + +if (desc->magic !=XENCOMM_MAGIC ) { +printk ("%s error: %p magic was 0x%x\n" , __func__, desc, desc->magic); +return n; + } + +/* iterate through the descriptor, copying up to a page at a time */ +while ((from_pos < n) && (i < desc->nr_addrs)) { +unsigned long dest_paddr = desc->address[i]; +unsigned int pgoffset; +unsigned int chunksz; +unsigned int chunk_skip; + +if (dest_paddr ==XENCOMM_INVALID ) { + i++; +continue ; + } + + pgoffset = dest_paddr %PAGE_SIZE ; + chunksz =PAGE_SIZE - pgoffset; + + chunk_skip =min (chunksz, skip); + to_pos += chunk_skip; + chunksz -= chunk_skip; + skip -= chunk_skip; + +if (skip ==0 ) { +unsigned long dest_maddr; +unsigned long source = (unsigned long )from + from_pos; +unsigned int bytes =min (chunksz, n - from_pos); + + dest_maddr =paddr_to_maddr (dest_paddr + chunk_skip); +if (dest_maddr ==0 ) +return -1 ; + +if (xencomm_debug) +printk ("%lx[%d] -> %lx\n" , source, bytes, dest_maddr); +memcpy ((void *)dest_maddr, (void *)source, bytes); + from_pos += bytes; + to_pos += bytes; + } + + i++; + } + +return n - from_pos; +} + +static int xencomm_inline_add_offset (void **handle,unsigned int bytes) +{ + *handle += bytes; +return 0 ; +} + +/* Offset page addresses in 'handle' to skip 'bytes' bytes. Set completely +* exhausted pages to XENCOMM_INVALID. */ +int xencomm_add_offset (void **handle,unsigned int bytes) +{ +struct xencomm_desc *desc; +int i =0 ; + +if (xencomm_is_inline (*handle)) +return xencomm_inline_add_offset (handle, bytes); + +/* first we need to access the descriptor */ + desc = (struct xencomm_desc *)paddr_to_maddr ((unsigned long )*handle); +if (desc ==NULL ) +return -1 ; + +if (desc->magic !=XENCOMM_MAGIC ) { +printk ("%s error: %p magic was 0x%x\n" , __func__, desc, desc->magic); +return -1 ; + } + +/* iterate through the descriptor incrementing addresses */ +while ((bytes >0 ) && (i < desc->nr_addrs)) { +unsigned long dest_paddr = desc->address[i]; +unsigned int pgoffset; +unsigned int chunksz; +unsigned int chunk_skip; + + pgoffset = dest_paddr %PAGE_SIZE ; + chunksz =PAGE_SIZE - pgoffset; + + chunk_skip =min (chunksz, bytes); +if (chunk_skip == chunksz) { +/* exhausted this page */ + desc->address[i] =XENCOMM_INVALID ; + }else { + desc->address[i] += chunk_skip; + } + bytes -= chunk_skip; + } +return 0 ; +} + +int xencomm_handle_is_null (void *handle) +{ +struct xencomm_desc *desc; +int i; + +if (xencomm_is_inline (handle)) +return xencomm_inline_addr (handle) ==0 ; + + desc = (struct xencomm_desc *)paddr_to_maddr ((unsigned long )handle); +if (desc ==NULL ) +return 1 ; + +for (i =0 ; i < desc->nr_addrs; i++) +if (desc->address[i] !=XENCOMM_INVALID ) +return 0 ; + +return 1 ; +} +
xen/include/xen/xencomm.h new file +115 -0
115 lines not on this page · raw message
xen/common/Makefile +2 -0
@@ -31,5 +31,7 @@ obj-$(crash_debug) += gdbstub.o obj-$(crash_debug) += gdbstub.o obj-$(xenoprof) += xenoprof.o +obj-$(CONFIG_XENCOMM) += xencomm.o + # Object file contains changeset and compiler information. version.o: $(BASEDIR)/include/xen/compile.h
config/powerpc64.mk +2 -0
@@ -1,5 +1,7 @@ CONFIG_POWERPC := y CONFIG_POWERPC := y CONFIG_POWERPC_$(XEN_OS) := y +CONFIG_XENCOMM := y + CFLAGS += -DELFSIZE=64 LIBDIR := lib
xen/arch/powerpc/usercopy.c +3 -218
235 lines not on this page · raw message
Signature · 2 lines
Hollis Blanchard IBM Linux Technology Center
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
PATCH 1/1 avoid xc_get_tot_pages() in the prose builder
In reply to a message not in the archiveAvoid xc_get_tot_pages() in the prose builder.
tools/libxc/powerpc64/xc_prose_build.c +2 -2
@@ -230,6 +230,7 @@ static void free_page_array(xen_pfn_t *p int xc_prose_build(int xc_handle, uint32_t domid, + unsigned int mem_mb, const char *image_name, const char *initrd_name, const char *cmdline,
@@ -257,8 +258,7 @@ int xc_prose_build(int xc_handle,DPRINTF ("cmdline=%s\n" , cmdline); -DPRINTF ("xc_get_tot_pages\n" ); - nr_pages =xc_get_tot_pages (xc_handle, domid); + nr_pages = mem_mb << (20 -PAGE_SHIFT );DPRINTF ("nr_pages 0x%lx\n" , nr_pages); rma_pages =get_rma_pages (devtree);
tools/libxc/xenguest.h +1 -0
@@ -124,6 +124,7 @@ int xc_get_hvm_param( int xc_prose_build(int xc_handle, uint32_t domid, + unsigned int mem_mb, const char *image_name, const char *ramdisk_name, const char *cmdline,
tools/python/xen/xend/image.py +1 -0
@@ -273,6 +282,7 @@ class PPC_ProseImageHandler(LinuxImageHa devtree = FlatDeviceTree.build(self) return xc.prose_build(dom = self.vm.getDomid(), + memsize = mem_mb, image = self.kernel, store_evtchn = store_evtchn, console_evtchn = console_evtchn,
Signature · 2 lines
Hollis Blanchard IBM Linux Technology Center
_______________________________________________
Xen-ppc-devel mailing list
[email protected]
http://lists.xensource.com/xen-ppc-devel
PATCH 1/1 allocate shadow memory for PPC Linux domains
In reply to a message not in the archiveAllocate shadow memory for PPC Linux domains.
tools/python/xen/xend/image.py +9 -0
@@ -246,6 +246,15 @@ class PPC_LinuxImageHandler(LinuxImageHa features = self.vm.getFeatures(), arch_args = devtree.to_bin()) + def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb): + """@param shadow_mem_kb The configured shadow memory, in KiB. + @param maxmem_kb The configured maxmem, in KiB. + @return The corresponding required amount of shadow memory, also in + KiB. + PowerPC currently uses "shadow memory" to refer to the hash table.""" + return max(maxmem_kb / 64, shadow_mem_kb) + + class PPC_ProseImageHandler(LinuxImageHandler): ostype = "prose"
Signature · 2 lines
Hollis Blanchard IBM Linux Technology Center
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Re: [PATCH][XEN][POWERPC] allocate shadow memory for PPC Linux domains
Quoted 3 lines · Hollis Blanchard
Allocate shadow memory for PPC Linux domains.
Signed-off-by Hollis Blanchard <[email protected]>
Just check all these patches into the PPC tree and I¹ll merge them into unstable with the rest. I always check the diff when I merge anyway.
-- Keir
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Re: [Xen-devel] Please pull
Quoted 4 lines · Keir Fraser
Just check all these patches into the PPC tree and I’ll merge them into unstable with the rest. I always check the diff when I merge anyway.
OK, they are now committed.
Please hg pull http://xenbits.xensource.com/xenppc-unstable-merge.hg and let me know if you have any issues or questions.
Signature · 2 lines
Hollis Blanchard IBM Linux Technology Center