Mukesh Rathor
2013-Jan-12 02:13 UTC
[RFC PATCH 15/16]: PVH xen: elf changes to pref for dom0 PVH.
This patch prepares for dom0 PVH by chaging elf_load_binary() to add a
new parameter to indicate PVH dom0. Add check in iommu.c to check for
iommu enabled for dom0 PVH.
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
diff -r 47d2e652bd4d -r c65051a66d7d xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c Fri Jan 11 16:45:36 2013 -0800
+++ b/xen/arch/x86/domain_build.c Fri Jan 11 16:51:30 2013 -0800
@@ -769,7 +769,7 @@ int __init construct_dom0(
/* Copy the OS image and free temporary buffer. */
elf.dest = (void*)vkern_start;
- rc = elf_load_binary(&elf);
+ rc = elf_load_binary(&elf, 0);
if ( rc < 0 )
{
printk("Failed to load the kernel binary\n");
diff -r 47d2e652bd4d -r c65051a66d7d xen/common/libelf/libelf-loader.c
--- a/xen/common/libelf/libelf-loader.c Fri Jan 11 16:45:36 2013 -0800
+++ b/xen/common/libelf/libelf-loader.c Fri Jan 11 16:51:30 2013 -0800
@@ -17,6 +17,10 @@
*/
#include "libelf-private.h"
+#ifdef __XEN__
+#include <public/xen.h>
+#include <asm/debugger.h>
+#endif
/* ------------------------------------------------------------------------ */
@@ -108,7 +112,8 @@ void elf_set_log(struct elf_binary *elf,
elf->verbose = verbose;
}
-static int elf_load_image(void *dst, const void *src, uint64_t filesz, uint64_t
memsz)
+static int elf_load_image(void *dst, const void *src, uint64_t filesz,
+ uint64_t memsz, int not_used)
{
memcpy(dst, src, filesz);
memset(dst + filesz, 0, memsz - filesz);
@@ -122,11 +127,34 @@ void elf_set_verbose(struct elf_binary *
elf->verbose = 1;
}
-static int elf_load_image(void *dst, const void *src, uint64_t filesz, uint64_t
memsz)
+static int elf_load_image(void *dst, const void *src, uint64_t filesz,
+ uint64_t memsz, int is_pvh_dom0)
{
int rc;
if ( filesz > ULONG_MAX || memsz > ULONG_MAX )
return -1;
+
+ /* raw_copy_to_guest -> copy_to_user_hvm -> __hvm_copy needs curr to
+ * point to the hvm/pvh vcpu. Hence for PVH dom0 we can''t use
that. For now
+ * just use dbg_rw_mem(). */
+ if ( is_pvh_dom0 )
+ {
+ int j, rem;
+ rem = dbg_rw_mem((dbgva_t)dst, (dbgbyte_t *)src, (int)filesz, 0, 1, 0);
+ if ( rem ) {
+ printk("Failed to copy elf binary. len:%ld rem:%d\n",
filesz, rem);
+ return -1;
+ }
+ for (j=0; j < memsz - filesz; j++) {
+ unsigned char zero=0;
+ rem = dbg_rw_mem((dbgva_t)(dst+filesz+j), &zero, 1, 0, 1, 0);
+ if (rem) {
+ printk("Failed to copy to:%p rem:%d\n", dst+filesz+j,
rem);
+ return -1;
+ }
+ }
+ return 0;
+ }
rc = raw_copy_to_guest(dst, src, filesz);
if ( rc != 0 )
return -1;
@@ -260,7 +288,9 @@ void elf_parse_binary(struct elf_binary
__FUNCTION__, elf->pstart, elf->pend);
}
-int elf_load_binary(struct elf_binary *elf)
+/* This function called for dom0 and also from the libraries when building
+ * guests */
+static int _elf_load_binary(struct elf_binary *elf, int is_pvh_dom0)
{
const elf_phdr *phdr;
uint64_t i, count, paddr, offset, filesz, memsz;
@@ -279,7 +309,8 @@ int elf_load_binary(struct elf_binary *e
dest = elf_get_ptr(elf, paddr);
elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p ->
0x%p\n",
__func__, i, dest, dest + filesz);
- if ( elf_load_image(dest, elf->image + offset, filesz, memsz) != 0 )
+ if ( elf_load_image(dest, elf->image + offset, filesz, memsz,
+ is_pvh_dom0) != 0 )
return -1;
}
@@ -287,6 +318,18 @@ int elf_load_binary(struct elf_binary *e
return 0;
}
+#ifdef __XEN__
+int elf_load_binary(struct elf_binary *elf, int is_pvh_dom0)
+{
+ return _elf_load_binary(elf, is_pvh_dom0);
+}
+#else
+int elf_load_binary(struct elf_binary *elf)
+{
+ return _elf_load_binary(elf, 0);
+}
+#endif
+
void *elf_get_ptr(struct elf_binary *elf, unsigned long addr)
{
return elf->dest + addr - elf->pstart;
diff -r 47d2e652bd4d -r c65051a66d7d xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c Fri Jan 11 16:45:36 2013 -0800
+++ b/xen/drivers/passthrough/iommu.c Fri Jan 11 16:51:30 2013 -0800
@@ -120,15 +120,25 @@ int iommu_domain_init(struct domain *d)
return hd->platform_ops->init(d);
}
+static inline void check_dom0_pvh_reqs(struct domain *d)
+{
+ if (!iommu_enabled || iommu_passthrough)
+ panic("For pvh dom0, iommu must be enabled, dom0-passthrough must
"
+ "not be enabled \n");
+}
+
void __init iommu_dom0_init(struct domain *d)
{
struct hvm_iommu *hd = domain_hvm_iommu(d);
+ if ( is_pvh_domain(d) )
+ check_dom0_pvh_reqs(d);
+
if ( !iommu_enabled )
return;
register_keyhandler(''o'', &iommu_p2m_table);
- d->need_iommu = !!iommu_dom0_strict;
+ d->need_iommu = is_pvh_domain(d) || !!iommu_dom0_strict;
if ( need_iommu(d) )
{
struct page_info *page;
@@ -141,7 +151,11 @@ void __init iommu_dom0_init(struct domai
((page->u.inuse.type_info & PGT_type_mask)
== PGT_writable_page) )
mapping |= IOMMUF_writable;
- hd->platform_ops->map_page(d, mfn, mfn, mapping);
+ if ( is_pvh_domain(d) ) {
+ unsigned long gfn = mfn_to_gfn(d, _mfn(mfn));
+ hd->platform_ops->map_page(d, gfn, mfn, mapping);
+ } else
+ hd->platform_ops->map_page(d, mfn, mfn, mapping);
if ( !(i++ & 0xfffff) )
process_pending_softirqs();
}
diff -r 47d2e652bd4d -r c65051a66d7d xen/include/xen/libelf.h
--- a/xen/include/xen/libelf.h Fri Jan 11 16:45:36 2013 -0800
+++ b/xen/include/xen/libelf.h Fri Jan 11 16:51:30 2013 -0800
@@ -192,13 +192,14 @@ int elf_phdr_is_loadable(struct elf_bina
int elf_init(struct elf_binary *elf, const char *image, size_t size);
#ifdef __XEN__
void elf_set_verbose(struct elf_binary *elf);
+int elf_load_binary(struct elf_binary *elf, int is_pvh_dom0);
#else
void elf_set_log(struct elf_binary *elf, elf_log_callback*,
void *log_caller_pointer, int verbose);
+int elf_load_binary(struct elf_binary *elf);
#endif
void elf_parse_binary(struct elf_binary *elf);
-int elf_load_binary(struct elf_binary *elf);
void *elf_get_ptr(struct elf_binary *elf, unsigned long addr);
uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol);