Ryan Harper
2006-Jul-11 15:36 UTC
[Xen-devel] [PATCH 3/6] xen: modify memory ops to be NUMA-aware
This patch modifies three memory operations to be NUMA-aware:
increase_reservation
populate_physmap
memory_exchange
These three operations request memory from the domain heap and have been
modified to distribute the request across the physical cpus of the
target domain evenly. This make memory local to the physical cpus
within the domain available for the guest.
--
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253 T/L: 678-9253
diffstat output:
memory.c | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
---
diff -r ac0a7a5a6425 xen/common/memory.c
--- a/xen/common/memory.c Mon Jul 3 17:12:37 2006
+++ b/xen/common/memory.c Sat Jul 8 12:27:19 2006
@@ -40,6 +40,12 @@
struct page_info *page;
unsigned long i;
xen_pfn_t mfn;
+ int max_vcpu_id = 0;
+ struct vcpu *v;
+
+ for_each_vcpu (d, v)
+ if ( v->vcpu_id > max_vcpu_id )
+ max_vcpu_id = v->vcpu_id;
if ( !guest_handle_is_null(extent_list) &&
!guest_handle_okay(extent_list, nr_extents) )
@@ -56,9 +62,11 @@
*preempted = 1;
return i;
}
-
- if ( unlikely((page = alloc_domheap_pages(
- d, extent_order, memflags)) == NULL) )
+ /* spread each allocation across the total number of
+ * vcpus allocated to this domain */
+ if ( unlikely((page = __alloc_domheap_pages( d,
+ (d->vcpu[i % (max_vcpu_id+1)])->processor,
+ extent_order, memflags )) == NULL) )
{
DPRINTK("Could not allocate order=%d extent: "
"id=%d memflags=%x (%ld of %d)\n",
@@ -91,6 +99,12 @@
unsigned long i, j;
xen_pfn_t gpfn;
xen_pfn_t mfn;
+ int max_vcpu_id = 0;
+ struct vcpu *v;
+
+ for_each_vcpu (d, v)
+ if ( v->vcpu_id > max_vcpu_id )
+ max_vcpu_id = v->vcpu_id;
if ( !guest_handle_okay(extent_list, nr_extents) )
return 0;
@@ -110,8 +124,11 @@
if ( unlikely(__copy_from_guest_offset(&gpfn, extent_list, i, 1)) )
goto out;
- if ( unlikely((page = alloc_domheap_pages(
- d, extent_order, memflags)) == NULL) )
+ /* spread each allocation across the total number of
+ * vcpus allocated to this domain */
+ if ( unlikely((page = __alloc_domheap_pages( d,
+ (d->vcpu[i % (max_vcpu_id+1)])->processor,
+ extent_order, memflags )) == NULL) )
{
DPRINTK("Could not allocate order=%d extent: "
"id=%d memflags=%x (%ld of %d)\n",
@@ -293,10 +310,11 @@
unsigned long in_chunk_order, out_chunk_order;
xen_pfn_t gpfn, gmfn, mfn;
unsigned long i, j, k;
- unsigned int memflags = 0;
+ unsigned int memflags = 0, max_vcpu_id = 0;
long rc = 0;
struct domain *d;
struct page_info *page;
+ struct vcpu *v;
if ( copy_from_guest(&exch, arg, 1) )
return -EFAULT;
@@ -367,6 +385,11 @@
}
d = current->domain;
+ /* calc max_vcpu_id */
+ for_each_vcpu (d, v)
+ if ( v->vcpu_id > max_vcpu_id )
+ max_vcpu_id = v->vcpu_id;
+
for ( i = 0; i < (exch.in.nr_extents >> in_chunk_order); i++ )
{
if ( hypercall_preempt_check() )
@@ -412,8 +435,11 @@
/* Allocate a chunk''s worth of anonymous output pages. */
for ( j = 0; j < (1UL << out_chunk_order); j++ )
{
- page = alloc_domheap_pages(
- NULL, exch.out.extent_order, memflags);
+ /* spread each allocation across the total number of
+ * vcpus allocated to this domain */
+ page = __alloc_domheap_pages( NULL,
+ (d->vcpu[j % (max_vcpu_id+1)])->processor,
+ exch.out.extent_order, memflags);
if ( unlikely(page == NULL) )
{
rc = -ENOMEM;
ryanh@us.ibm.com
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Ryan Harper
2006-Jul-17 17:16 UTC
Re: [Xen-devel] [PATCH 3/6] xen: modify memory ops to be NUMA-aware
* Ryan Harper <ryanh@us.ibm.com> [2006-07-11 10:52]:> This patch modifies three memory operations to be NUMA-aware: > > increase_reservation > populate_physmap > memory_exchange > > These three operations request memory from the domain heap and have been > modified to distribute the request across the physical cpus of the > target domain evenly. This make memory local to the physical cpus > within the domain available for the guest.Measuring the overhead has show the distribution to be costly with at the current time, not specific benefit since the best case would be providing local memory in a multi-node guest environment. As we currently don''t export this virtual domain topology to Linux, it can''t take advantage of the local allocations. At this time, most domains created on NUMA machines will modify their config file parameters to ensure they fit within a single NUMA node and render the distribution code useless. This patch removes the extra logic and uses domain''s vcpu 0 processor as the parameter into the heap allocation function. Now domains will use VCPU0 to pick which node to allocate memory from (using cpu_to_node mapping) and we don''t pay for logic that won''t be leveraged. -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx (512) 838-9253 T/L: 678-9253 ryanh@us.ibm.com diffstat output: memory.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) Signed-off-by: Ryan Harper <ryanh@us.ibm.com> --- # HG changeset patch # User Ryan Harper <ryanh@us.ibm.com> # Node ID d5c77144ba21ab00f2cb92405e9f00a3e0951821 # Parent b64b6d6c0440adb7f0cb91c13ca60b0832966cf6 03 increase_reservation/pop_physmap/mem_exch diff -r b64b6d6c0440 -r d5c77144ba21 xen/common/memory.c --- a/xen/common/memory.c Sat Jul 15 07:08:39 2006 +++ b/xen/common/memory.c Sat Jul 15 07:24:04 2006 @@ -40,6 +40,8 @@ struct page_info *page; unsigned long i; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_is_null(extent_list) && !guest_handle_okay(extent_list, nr_extents) ) @@ -57,8 +59,8 @@ return i; } - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -91,6 +93,8 @@ unsigned long i, j; xen_pfn_t gpfn; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_okay(extent_list, nr_extents) ) return 0; @@ -110,8 +114,8 @@ if ( unlikely(__copy_from_guest_offset(&gpfn, extent_list, i, 1)) ) goto out; - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -293,7 +297,7 @@ unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; unsigned long i, j, k; - unsigned int memflags = 0; + unsigned int memflags = 0, cpu; long rc = 0; struct domain *d; struct page_info *page; @@ -367,6 +371,9 @@ } d = current->domain; + /* use domain''s first processor for locality parameter */ + cpu = d->vcpu[0]->processor; + for ( i = 0; i < (exch.in.nr_extents >> in_chunk_order); i++ ) { if ( hypercall_preempt_check() ) @@ -412,8 +419,8 @@ /* Allocate a chunk''s worth of anonymous output pages. */ for ( j = 0; j < (1UL << out_chunk_order); j++ ) { - page = alloc_domheap_pages( - NULL, exch.out.extent_order, memflags); + page = __alloc_domheap_pages( NULL, cpu, + exch.out.extent_order, memflags); if ( unlikely(page == NULL) ) { rc = -ENOMEM; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ryan Harper
2006-Jul-31 19:10 UTC
[Xen-devel] [PATCH 3/6] xen: modify memory ops to be NUMA-aware
>From [1]previous post: > This patch modifies three memory operations to be NUMA-aware: > > increase_reservation > populate_physmap > memory_exchange > > These three operations request memory from the domain heap and have been > modified to distribute the request across the physical cpus of the > target domain evenly. This make memory local to the physical cpus > within the domain available for the guest.Measuring the overhead has shown the distribution to be costly with at the current time, no specific benefit since the best case would be providing local memory in a multi-node guest environment. As we currently don''t export this virtual domain topology to Linux, it can''t take advantage of the local allocations. At this time, most domains created on NUMA machines will modify their config file parameters to ensure they fit within a single NUMA node and render the distribution code useless. This patch removes the extra logic and uses domain''s vcpu 0 processor as the parameter into the heap allocation function. Now domains will use VCPU0 to pick which node to allocate memory from (using cpu_to_node mapping) and we don''t pay for logic that won''t be leveraged. [1] http://lists.xensource.com/archives/html/xen-devel/2006-07/msg00544.html -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx (512) 838-9253 T/L: 678-9253 ryanh@us.ibm.com diffstat output: memory.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) Signed-off-by: Ryan Harper <ryanh@us.ibm.com> --- diff -r f362859d88c4 xen/common/memory.c --- a/xen/common/memory.c Mon Jul 31 10:30:02 2006 -0500 +++ b/xen/common/memory.c Mon Jul 31 10:34:14 2006 -0500 @@ -40,6 +40,8 @@ increase_reservation( struct page_info *page; unsigned long i; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_is_null(extent_list) && !guest_handle_okay(extent_list, nr_extents) ) @@ -57,8 +59,8 @@ increase_reservation( return i; } - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -91,6 +93,8 @@ populate_physmap( unsigned long i, j; xen_pfn_t gpfn; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_okay(extent_list, nr_extents) ) return 0; @@ -110,8 +114,8 @@ populate_physmap( if ( unlikely(__copy_from_guest_offset(&gpfn, extent_list, i, 1)) ) goto out; - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -293,7 +297,7 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; unsigned long i, j, k; - unsigned int memflags = 0; + unsigned int memflags = 0, cpu; long rc = 0; struct domain *d; struct page_info *page; @@ -367,6 +371,9 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem } d = current->domain; + /* use domain''s first processor for locality parameter */ + cpu = d->vcpu[0]->processor; + for ( i = 0; i < (exch.in.nr_extents >> in_chunk_order); i++ ) { if ( hypercall_preempt_check() ) @@ -412,8 +419,8 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem /* Allocate a chunk''s worth of anonymous output pages. */ for ( j = 0; j < (1UL << out_chunk_order); j++ ) { - page = alloc_domheap_pages( - NULL, exch.out.extent_order, memflags); + page = __alloc_domheap_pages( NULL, cpu, + exch.out.extent_order, memflags); if ( unlikely(page == NULL) ) { rc = -ENOMEM; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ryan Harper
2006-Aug-17 22:42 UTC
Re: [Xen-devel] [PATCH 3/6] xen: modify memory ops to be NUMA-aware
* Ryan Harper <ryanh@us.ibm.com> [2006-07-31 14:13]:> >From [1]previous post: > > This patch modifies three memory operations to be NUMA-aware: > > > > increase_reservation > > populate_physmap > > memory_exchange > > > > These three operations request memory from the domain heap and have been > > modified to distribute the request across the physical cpus of the > > target domain evenly. This make memory local to the physical cpus > > within the domain available for the guest. > > Measuring the overhead has shown the distribution to be costly with at > the current time, no specific benefit since the best case would be > providing local memory in a multi-node guest environment. As we > currently don''t export this virtual domain topology to Linux, it can''t > take advantage of the local allocations. At this time, most domains > created on NUMA machines will modify their config file parameters to > ensure they fit within a single NUMA node and render the distribution > code useless. This patch removes the extra logic and uses domain''s vcpu > 0 processor as the parameter into the heap allocation function. > > Now domains will use VCPU0 to pick which node to allocate memory from > (using cpu_to_node mapping) and we don''t pay for logic that won''t be > leveraged. > > > [1] http://lists.xensource.com/archives/html/xen-devel/2006-07/msg00544.html-no changes -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx (512) 838-9253 T/L: 678-9253 ryanh@us.ibm.com diffstat output: memory.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) Signed-off-by: Ryan Harper <ryanh@us.ibm.com> --- Make memory hypercalls NUMA-aware diff -r fa87cea10778 xen/common/memory.c --- a/xen/common/memory.c Tue Aug 15 11:38:13 2006 -0500 +++ b/xen/common/memory.c Tue Aug 15 11:40:17 2006 -0500 @@ -40,6 +40,8 @@ increase_reservation( struct page_info *page; unsigned long i; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_is_null(extent_list) && !guest_handle_okay(extent_list, nr_extents) ) @@ -57,8 +59,8 @@ increase_reservation( return i; } - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -91,6 +93,8 @@ populate_physmap( unsigned long i, j; xen_pfn_t gpfn; xen_pfn_t mfn; + /* use domain''s first processor for locality parameter */ + unsigned int cpu = d->vcpu[0]->processor; if ( !guest_handle_okay(extent_list, nr_extents) ) return 0; @@ -110,8 +114,8 @@ populate_physmap( if ( unlikely(__copy_from_guest_offset(&gpfn, extent_list, i, 1)) ) goto out; - if ( unlikely((page = alloc_domheap_pages( - d, extent_order, memflags)) == NULL) ) + if ( unlikely((page = __alloc_domheap_pages( d, cpu, + extent_order, memflags )) == NULL) ) { DPRINTK("Could not allocate order=%d extent: " "id=%d memflags=%x (%ld of %d)\n", @@ -293,7 +297,7 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; unsigned long i, j, k; - unsigned int memflags = 0; + unsigned int memflags = 0, cpu; long rc = 0; struct domain *d; struct page_info *page; @@ -367,6 +371,9 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem } d = current->domain; + /* use domain''s first processor for locality parameter */ + cpu = d->vcpu[0]->processor; + for ( i = 0; i < (exch.in.nr_extents >> in_chunk_order); i++ ) { if ( hypercall_preempt_check() ) @@ -412,8 +419,8 @@ memory_exchange(XEN_GUEST_HANDLE(xen_mem /* Allocate a chunk''s worth of anonymous output pages. */ for ( j = 0; j < (1UL << out_chunk_order); j++ ) { - page = alloc_domheap_pages( - NULL, exch.out.extent_order, memflags); + page = __alloc_domheap_pages( NULL, cpu, + exch.out.extent_order, memflags); if ( unlikely(page == NULL) ) { rc = -ENOMEM; _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel