Jiang, Yunhong
2009-Dec-10 13:30 UTC
[Xen-devel] [PATCH 7/7] The main flow for memory hotadd
The main flow for memory hotadd.
The basic work flow to handle the memory hotadd is:
Update node information
Map new pages to xen 1:1 mapping
Setup frametable for new memory range
Setup m2p table for new memory range
Put the new pages to domheap
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
diff -r 6fd4bbf064d1 xen/arch/x86/platform_hypercall.c
--- a/xen/arch/x86/platform_hypercall.c Thu Dec 10 06:33:20 2009 +0800
+++ b/xen/arch/x86/platform_hypercall.c Thu Dec 10 06:33:20 2009 +0800
@@ -469,6 +469,11 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
op->u.cpu_add.pxm);
break;
+ case XENPF_mem_hotadd:
+ ret = memory_add(op->u.mem_add.spfn,
+ op->u.mem_add.epfn,
+ op->u.mem_add.pxm);
+ break;
default:
ret = -ENOSYS;
break;
diff -r 6fd4bbf064d1 xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c Thu Dec 10 06:33:20 2009 +0800
+++ b/xen/arch/x86/x86_64/mm.c Thu Dec 10 06:33:20 2009 +0800
@@ -23,6 +23,7 @@
#include <xen/mm.h>
#include <xen/sched.h>
#include <xen/numa.h>
+#include <xen/nodemask.h>
#include <xen/guest_access.h>
#include <asm/current.h>
#include <asm/asm_defns.h>
@@ -32,6 +33,7 @@
#include <asm/hypercall.h>
#include <asm/msr.h>
#include <asm/setup.h>
+#include <asm/numa.h>
#include <public/memory.h>
/* Parameters for PFN/MADDR compression. */
@@ -1309,6 +1311,126 @@ unsigned int domain_clamp_alloc_bitsize(
return min(d->arch.physaddr_bitsize, bits);
}
+int transfer_pages_to_heap(struct mem_hotadd_info *info)
+{
+ unsigned long i;
+ struct page_info *pg;
+
+ /*
+ * Mark the allocated page before put free pages to buddy allocator
+ * to avoid merge in free_heap_pages
+ */
+ for (i = info->spfn; i < info->cur; i++)
+ {
+ pg = mfn_to_page(i);
+ pg->count_info = PGC_state_inuse;
+ }
+
+ init_domheap_pages(pfn_to_paddr(info->cur),
pfn_to_paddr(info->epfn));
+
+ return 0;
+}
+
+int mem_hotadd_check(unsigned long spfn, unsigned long epfn)
+{
+ /* TBD: Need make sure cover to m2p/ft page table */
+ return 1;
+}
+
+int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm)
+{
+ struct mem_hotadd_info info;
+ int ret, node;
+ unsigned long old_max = max_page, old_total = total_pages;
+ unsigned long i;
+
+ printk("memory_add %lx ~ %lx with pxm %x\n", spfn, epfn, pxm);
+
+ /* the memory range should at least be 2M aligned */
+ if ( (spfn | epfn) & ((1UL << PAGETABLE_ORDER) - 1) )
+ return -EINVAL;
+
+ if ( (spfn | epfn) & pfn_hole_mask)
+ return -EINVAL;
+
+ if ( epfn < max_page )
+ return -EINVAL;
+
+ if ( (node = setup_node(pxm)) == -1 )
+ return -EINVAL;
+
+ if ( !valid_numa_range(spfn << PAGE_SHIFT, epfn << PAGE_SHIFT,
node) )
+ {
+ dprintk(XENLOG_WARNING, "spfn %lx ~ epfn %lx pxm %x node %x"
+ "is not numa valid", spfn, epfn, pxm, node);
+ return -EINVAL;
+ }
+
+ if ( !mem_hotadd_check(spfn, epfn) )
+ return -EINVAL;
+
+ if ( !node_online(node) )
+ {
+ dprintk(XENLOG_WARNING, "node %x pxm %x is not
online\n",node, pxm);
+ NODE_DATA(node)->node_id = node;
+ NODE_DATA(node)->node_start_pfn = spfn;
+ NODE_DATA(node)->node_spanned_pages + epfn -
node_start_pfn(node);
+ node_set_online(node);
+ }else
+ {
+ if (NODE_DATA(node)->node_start_pfn > spfn)
+ NODE_DATA(node)->node_start_pfn = spfn;
+ if (node_end_pfn(node) < epfn)
+ NODE_DATA(node)->node_spanned_pages = epfn -
node_start_pfn(node);
+ }
+ ret = map_pages_to_xen((unsigned long)mfn_to_virt(spfn), spfn,
+ epfn - spfn, PAGE_HYPERVISOR);
+
+ if ( ret )
+ return ret;
+
+ ret = -EINVAL;
+ info.spfn = spfn;
+ info.epfn = epfn;
+ info.cur = spfn;
+
+ ret = extend_frame_table(&info);
+ if (ret)
+ goto destroy_frametable;
+ /* Set max_page as setup_m2p_table will use it*/
+ max_page = epfn;
+ max_pdx = pfn_to_pdx(max_page - 1) + 1;
+ total_pages += epfn - spfn;
+
+ set_pdx_range(spfn, epfn);
+ ret = setup_m2p_table(&info);
+
+ if ( ret )
+ goto destroy_m2p;
+
+ for ( i = old_max; i < epfn; i++ )
+ iommu_map_page(dom0, i, i);
+
+ /* We can''t revert any more */
+ transfer_pages_to_heap(&info);
+
+ share_hotadd_m2p_table(&info);
+
+ return 0;
+
+destroy_m2p:
+ destroy_m2p_mapping(&info);
+destroy_frametable:
+ cleanup_frame_table(&info);
+ destroy_xen_mappings((unsigned long)mfn_to_virt(spfn),
+ (unsigned long)mfn_to_virt(epfn));
+ max_page = old_max;
+ total_pages = old_total;
+ max_pdx = pfn_to_pdx(max_page - 1) + 1;
+ return ret;
+}
+
#include "compat/mm.c"
/*
diff -r 6fd4bbf064d1 xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h Thu Dec 10 06:33:20 2009 +0800
+++ b/xen/include/asm-x86/mm.h Thu Dec 10 06:33:20 2009 +0800
@@ -530,6 +530,12 @@ int donate_page(
int map_ldt_shadow_page(unsigned int);
+#ifdef CONFIG_X86_64
+extern int memory_add(unsigned long spfn, unsigned long epfn, unsigned int
pxm);
+#else
+int memory_add(uint64_t spfn, uint64_t epfn, uint32_t pxm) {return -ENOSYS};
+#endif
+
#ifdef CONFIG_COMPAT
void domain_set_alloc_bitsize(struct domain *d);
unsigned int domain_clamp_alloc_bitsize(struct domain *d, unsigned int bits);
diff -r 6fd4bbf064d1 xen/include/public/platform.h
--- a/xen/include/public/platform.h Thu Dec 10 06:33:20 2009 +0800
+++ b/xen/include/public/platform.h Thu Dec 10 06:33:20 2009 +0800
@@ -346,6 +346,15 @@ struct xenpf_cpu_hotadd
uint32_t pxm;
};
+#define XENPF_mem_hotadd 59
+struct xenpf_mem_hotadd
+{
+ uint64_t spfn;
+ uint64_t epfn;
+ uint32_t pxm;
+ uint32_t flags;
+};
+
struct xen_platform_op {
uint32_t cmd;
uint32_t interface_version; /* XENPF_INTERFACE_VERSION */
@@ -364,6 +373,7 @@ struct xen_platform_op {
struct xenpf_pcpuinfo pcpu_info;
struct xenpf_cpu_ol cpu_ol;
struct xenpf_cpu_hotadd cpu_add;
+ struct xenpf_mem_hotadd mem_add;
uint8_t pad[128];
} u;
};
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel