Isaku Yamahata
2007-Aug-29 11:28 UTC
[Xen-devel] [PATCH 5/5] xc_core: ia64 xc_core_arch_gpfn_may_present()
# HG changeset patch
# User yamahata@valinux.co.jp
# Date 1188384202 -32400
# Node ID 6642cba9eb6631f40071cdb39f518ef4bf270387
# Parent ab3a6dbca87306bd74c691575226d9071d786c07
prevent warning message when xm dump-core
Using foreign p2m exposure, we can avoid to map the page which isn''t
allocated.
PATCHNAME: xc_core_ia64_prevent_warning
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
diff -r ab3a6dbca873 -r 6642cba9eb66 tools/libxc/xc_core_ia64.c
--- a/tools/libxc/xc_core_ia64.c Wed Aug 29 19:43:21 2007 +0900
+++ b/tools/libxc/xc_core_ia64.c Wed Aug 29 19:43:22 2007 +0900
@@ -23,6 +23,16 @@
#include "xc_efi.h"
#include "xc_dom.h"
#include <inttypes.h>
+
+int
+xc_core_arch_gpfn_may_present(struct xc_core_arch_context *arch_ctxt,
+ unsigned long pfn)
+{
+ if (arch_ctxt->p2m_table.p2m == NULL)
+ return 1; /* default to trying to map the page */
+
+ return xc_ia64_p2m_present(&arch_ctxt->p2m_table, pfn);
+}
static int
xc_memory_map_cmp(const void *lhs__, const void *rhs__)
@@ -158,13 +168,18 @@ memory_map_get_old(int xc_handle, xc_dom
}
int
-xc_core_arch_memory_map_get(int xc_handle, struct xc_core_arch_context *unused,
+xc_core_arch_memory_map_get(int xc_handle,
+ struct xc_core_arch_context *arch_ctxt,
xc_dominfo_t *info, shared_info_t *live_shinfo,
xc_core_memory_map_t **mapp,
unsigned int *nr_entries)
{
int ret = -1;
- xen_ia64_memmap_info_t *memmap_info;
+ unsigned int memmap_info_num_pages;
+ unsigned long memmap_info_pfn;
+
+ xen_ia64_memmap_info_t *memmap_info_live;
+ xen_ia64_memmap_info_t *memmap_info = NULL;
unsigned long map_size;
xc_core_memory_map_t *map;
char *start;
@@ -172,27 +187,46 @@ xc_core_arch_memory_map_get(int xc_handl
char *p;
efi_memory_desc_t *md;
- if ( live_shinfo == NULL ||
- live_shinfo->arch.memmap_info_num_pages == 0 ||
- live_shinfo->arch.memmap_info_pfn == 0 )
+ if ( live_shinfo == NULL )
+ {
+ ERROR("can''t access shared info");
goto old;
-
- map_size = PAGE_SIZE * live_shinfo->arch.memmap_info_num_pages;
- memmap_info = xc_map_foreign_range(xc_handle, info->domid,
- map_size, PROT_READ,
- live_shinfo->arch.memmap_info_pfn);
+ }
+
+ /* copy before use in case someone updating them */
+ memmap_info_num_pages = live_shinfo->arch.memmap_info_num_pages;
+ memmap_info_pfn = live_shinfo->arch.memmap_info_pfn;
+ if ( memmap_info_num_pages == 0 || memmap_info_pfn == 0 )
+ {
+ ERROR("memmap_info_num_pages 0x%x memmap_info_pfn 0x%lx",
+ memmap_info_num_pages, memmap_info_pfn);
+ goto old;
+ }
+
+ map_size = PAGE_SIZE * memmap_info_num_pages;
+ memmap_info_live = xc_map_foreign_range(xc_handle, info->domid,
+ map_size, PROT_READ, memmap_info_pfn);
+ if ( memmap_info_live == NULL )
+ {
+ PERROR("Could not map memmap info.");
+ return -1;
+ }
+ memmap_info = malloc(map_size);
if ( memmap_info == NULL )
{
- PERROR("Could not map memmap info.");
- return -1;
- }
+ munmap(memmap_info_live, map_size);
+ return -1;
+ }
+ memcpy(memmap_info, memmap_info_live, map_size); /* copy before use */
+ munmap(memmap_info_live, map_size);
+
if ( memmap_info->efi_memdesc_size != sizeof(*md) ||
(memmap_info->efi_memmap_size / memmap_info->efi_memdesc_size)
== 0 ||
memmap_info->efi_memmap_size > map_size - sizeof(memmap_info) ||
memmap_info->efi_memdesc_version != EFI_MEMORY_DESCRIPTOR_VERSION )
{
PERROR("unknown memmap header. defaulting to compat mode.");
- munmap(memmap_info, PAGE_SIZE);
+ free(memmap_info);
goto old;
}
@@ -201,7 +235,8 @@ xc_core_arch_memory_map_get(int xc_handl
if ( map == NULL )
{
PERROR("Could not allocate memory for memmap.");
- goto out;
+ free(memmap_info);
+ return -1;
}
*mapp = map;
@@ -221,12 +256,16 @@ xc_core_arch_memory_map_get(int xc_handl
(*nr_entries)++;
}
ret = 0;
-out:
- munmap(memmap_info, map_size);
+
+ xc_ia64_p2m_map(&arch_ctxt->p2m_table, xc_handle, info->domid,
+ memmap_info, 0);
+ if ( memmap_info != NULL )
+ free(memmap_info);
qsort(map, *nr_entries, sizeof(map[0]), &xc_memory_map_cmp);
return ret;
old:
+ DPRINTF("Falling back old method.\n");
return memory_map_get_old(xc_handle, info, live_shinfo, mapp, nr_entries);
}
@@ -253,6 +292,8 @@ xc_core_arch_context_init(struct xc_core
arch_ctxt->nr_vcpus = 0;
for ( i = 0; i < MAX_VIRT_CPUS; i++ )
arch_ctxt->mapped_regs[i] = NULL;
+
+ xc_ia64_p2m_init(&arch_ctxt->p2m_table);
}
void
@@ -262,6 +303,7 @@ xc_core_arch_context_free(struct xc_core
for ( i = 0; i < arch_ctxt->nr_vcpus; i++ )
if ( arch_ctxt->mapped_regs[i] != NULL )
munmap(arch_ctxt->mapped_regs[i],
arch_ctxt->mapped_regs_size);
+ xc_ia64_p2m_unmap(&arch_ctxt->p2m_table);
}
int
diff -r ab3a6dbca873 -r 6642cba9eb66 tools/libxc/xc_core_ia64.h
--- a/tools/libxc/xc_core_ia64.h Wed Aug 29 19:43:21 2007 +0900
+++ b/tools/libxc/xc_core_ia64.h Wed Aug 29 19:43:22 2007 +0900
@@ -21,6 +21,8 @@
#ifndef XC_CORE_IA64_H
#define XC_CORE_IA64_H
+#include "ia64/xc_ia64.h"
+
#define ELF_ARCH_DATA ELFDATA2LSB
#define ELF_ARCH_MACHINE EM_IA_64
@@ -28,6 +30,8 @@ struct xc_core_arch_context {
size_t mapped_regs_size;
int nr_vcpus;
mapped_regs_t* mapped_regs[MAX_VIRT_CPUS];
+
+ struct xen_ia64_p2m_table p2m_table;
};
void
@@ -46,7 +50,10 @@ int
int
xc_core_arch_context_dump(struct xc_core_arch_context* arch_ctxt,
void* args, dumpcore_rtn_t dump_rtn);
-#define xc_core_arch_gpfn_may_present(arch_ctxt, i) (1)
+
+int
+xc_core_arch_gpfn_may_present(struct xc_core_arch_context *arch_ctxt,
+ unsigned long pfn);
#endif /* XC_CORE_IA64_H */
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel