[PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[Ryan Harper]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

This series of patches relates to the cpus parameter and pinning vcpus.
The first patch is a clean-up of getVcpuInfo, which previously only
returned the vcpu to cpu mapping.  This was insufficient for extracting
affinity information.  The patch extends getVcpuInfo to return a dict of
all the fields in xm vcpu-list for a domain.  It also fixes a couple
users of the function and moves them to a new vcpu_to_cpu function which
retains the old behavior of getVcpuInfo.

The second patch adds multiple cpumask support to the cpus variable. We
currently support two formats:

cpus = [ "0", "2-4" ] and cpus = "0|2-4".  The documentation encourages
the use of the python list notation.

The third patch introduces a testcase for the cpus parameter in the
create subset.

The forth patch adds support for the keyword 'all' to the vcpu-pin
operation.  Using 'all' in place of a specific vcpu will apply the
cpumask to all vcpus in the domain.

The fifth patch creates a testcase for the 'all' keyword in the vcpu-pin
subset.

[-- Attachment #2: Type: text/plain, Size: 1278 bytes --]

17 files changed, 278 insertions(+), 60 deletions(-)
docs/man/xm.pod.1                                             |    4 
tools/examples/xmexample.hvm                                  |    9 -
tools/examples/xmexample.vti                                  |    9 -
tools/examples/xmexample1                                     |    9 -
tools/examples/xmexample2                                     |   11 +
tools/examples/xmexample3                                     |   12 -
tools/python/xen/xend/XendDomain.py                           |   17 +-
tools/python/xen/xend/XendDomainInfo.py                       |   64 +++++--
tools/python/xen/xend/server/SrvDomain.py                     |    2 
tools/python/xen/xm/main.py                                   |    9 -
tools/xm-test/lib/XmTestLib/Xm.py                             |   31 +++
tools/xm-test/tests/create/17_create_cpusparm_pos.py          |   81 ++++++++++
tools/xm-test/tests/create/Makefile.am                        |    3 
tools/xm-test/tests/vcpu-disable/01_vcpu-disable_basic_pos.py |   16 +
tools/xm-test/tests/vcpu-pin/01_vcpu-pin_basic_pos.py         |    4 
tools/xm-test/tests/vcpu-pin/02_vcpu-pin_all_pos.py           |   54 ++++++
tools/xm-test/tests/vcpu-pin/Makefile.am                      |    3 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

[PATCH 1 of 5] Change getVcpuInfo to return more information

[Ryan Harper]

3 files changed, 41 insertions(+), 10 deletions(-)
tools/xm-test/lib/XmTestLib/Xm.py                             |   31 ++++++++--
tools/xm-test/tests/vcpu-disable/01_vcpu-disable_basic_pos.py |   16 ++++-
tools/xm-test/tests/vcpu-pin/01_vcpu-pin_basic_pos.py         |    4 -


# HG changeset patch
# User Ryan Harper <ryanh@us.ibm.com>
# Date 1155579355 18000
# Node ID 889b941effc8d050057a7edf3575067014e36d18
# Parent  ec03b24a2d83273ec62db8596506b80577a0e41e
Change getVcpuInfo to return more information

diff -r ec03b24a2d83 -r 889b941effc8 tools/xm-test/lib/XmTestLib/Xm.py
--- a/tools/xm-test/lib/XmTestLib/Xm.py	Tue Aug 15 19:53:55 2006 +0100
+++ b/tools/xm-test/lib/XmTestLib/Xm.py	Mon Aug 14 13:15:55 2006 -0500
@@ -170,16 +170,35 @@ def getVcpuInfo(domain):
 
     lines = output.split("\n")
 
-    vcpus = {}
-
+    vcpus = []
     for line in lines[1:]:
         cols = re.split(" +", line)
+        info = {}
+        info['domain'] = cols[0]
+        info['id'] = cols[1]
+        info['vcpu'] = cols[2]
         if cols[3] == '-':
-            vcpus[int(cols[2])] = None
+            info['cpu'] = None
         else:
-            vcpus[int(cols[2])] = int(cols[3])
+            info['cpu'] = cols[3]
+        info['state'] = cols[4]
+        info['time'] = cols[5]
+        # make sure we join 'any' 'cpu' into single value
+        info['affinity'] = " ".join(cols[6:])
+        vcpus.append(info)
 
     return vcpus
+
+def vcpu_to_cpu(domain):
+
+    vcpuinfo = getVcpuInfo(domain)
+    vcpus = {}
+
+    for info in vcpuinfo:
+        vcpus[int(info['vcpu'])] = info['cpu']
+
+    return vcpus
+
 
 def getInfo(key):
 
@@ -240,6 +259,6 @@ if __name__ == "__main__":
     print "Domain-0 CPU: " + cpu
     print "Domain-0 state: " + state
     
-    v = getVcpuInfo("Domain-0")
+    v = vcpu_to_cpu("Domain-0")
     for key in v.keys():
-        print "VCPU%i is on CPU %i" % (key, v[key])
+        print "VCPU%i is on CPU %s" % (key, v[key])
diff -r ec03b24a2d83 -r 889b941effc8 tools/xm-test/tests/vcpu-disable/01_vcpu-disable_basic_pos.py
--- a/tools/xm-test/tests/vcpu-disable/01_vcpu-disable_basic_pos.py	Tue Aug 15 19:53:55 2006 +0100
+++ b/tools/xm-test/tests/vcpu-disable/01_vcpu-disable_basic_pos.py	Mon Aug 14 13:15:55 2006 -0500
@@ -49,6 +49,18 @@ except DomainError, e:
         print e.extra
     FAIL(str(e))
 
+# wait for both vcpus to come up
+vcpus_up = 0
+start = int(time.time())
+print "waiting for all VCPUS to come up"
+while vcpus_up != 2:
+    vcpus_up = len(filter(lambda x: x is not None, vcpu_to_cpu(domain.getName())))
+    # 20 second timeout
+    if int(time.time()) >= start+20:
+       FAIL("Failed to bring all VCPUS online for test");
+    time.sleep(1)
+    
+
 # Disable VCPU 1
 cmd = "xm vcpu-set %s 1" % domain.getName()
 status, output = safecmd(cmd)
@@ -57,7 +69,7 @@ if check_status and status != 0:
 
 # Wait for the change to become active
 for i in [1,2,3,4,5,6,7,8,9,10]:
-    domUvcpu1 = getVcpuInfo(domain.getName())[1]
+    domUvcpu1 = vcpu_to_cpu(domain.getName())[1]
     status, output = traceCommand("xm vcpu-list")
     if domUvcpu1 is None:
         break
@@ -74,7 +86,7 @@ if check_status and status != 0:
     FAIL("\"%s\" returned invalid %i != 0" %(cmd,status))
 
 for i in [1,2,3,4,5,6,7,8,9,10]:
-    domUvcpu1 = getVcpuInfo(domain.getName())[1]
+    domUvcpu1 = vcpu_to_cpu(domain.getName())[1]
     if domUvcpu1 is not None:
         break
     time.sleep(1)
diff -r ec03b24a2d83 -r 889b941effc8 tools/xm-test/tests/vcpu-pin/01_vcpu-pin_basic_pos.py
--- a/tools/xm-test/tests/vcpu-pin/01_vcpu-pin_basic_pos.py	Tue Aug 15 19:53:55 2006 +0100
+++ b/tools/xm-test/tests/vcpu-pin/01_vcpu-pin_basic_pos.py	Mon Aug 14 13:15:55 2006 -0500
@@ -32,7 +32,7 @@ if status != 0:
 if status != 0:
     FAIL("xm vcpu-pin returned invalid %i != 0" % status)
 
-cpu = getVcpuInfo(domain.getName())[0]
+cpu = int(vcpu_to_cpu(domain.getName())[0])
 
 if cpu != 0:
     FAIL("failed to switch VCPU 0 to CPU 0")
@@ -42,7 +42,7 @@ if status != 0:
 if status != 0:
     FAIL("xm vcpu-pin returned invalid %i != 0" % status)
 
-cpu = getVcpuInfo(domain.getName())[0]
+cpu = int(vcpu_to_cpu(domain.getName())[0])
 
 if cpu != 1:
     FAIL("failed to switch VCPU 0 to CPU 1")

[PATCH 2 of 5] Add support for specifying multi cpumasks in cpus parameter

[Ryan Harper]

6 files changed, 74 insertions(+), 40 deletions(-)
tools/examples/xmexample.hvm            |    9 ++--
tools/examples/xmexample.vti            |    9 ++--
tools/examples/xmexample1               |    9 ++--
tools/examples/xmexample2               |   11 ++++-
tools/examples/xmexample3               |   12 +++--
tools/python/xen/xend/XendDomainInfo.py |   64 ++++++++++++++++++++-----------


# HG changeset patch
# User Ryan Harper <ryanh@us.ibm.com>
# Date 1155579390 18000
# Node ID 7281c7aa89220b5bb20c9275a65dee37be6da298
# Parent  889b941effc8d050057a7edf3575067014e36d18
Add support for specifying multi cpumasks in cpus parameter

diff -r 889b941effc8 -r 7281c7aa8922 tools/examples/xmexample.hvm
--- a/tools/examples/xmexample.hvm	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/examples/xmexample.hvm	Mon Aug 14 13:16:30 2006 -0500
@@ -47,10 +47,11 @@ name = "ExampleHVMDomain"
 # enable/disable HVM guest APIC, default=0 (disabled)
 #apic=0
 
-# List of which CPUS this domain is allowed to use, default Xen picks
-#cpus = ""         # leave to Xen to pick
-#cpus = "0"        # all vcpus run on CPU0
-#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+# Specify which CPUS the domains' vcpus can use
+#cpus = ""               # leave to Xen to pick
+#cpus = "0"              # all vcpus run on CPU0
+#cpus = "0-3,5,^1"       # all vcpus run on cpus 0,2,3,5
+#cpus = [ "0-1", "2-3" ] # VCPU0 on CPU0-1, VCPU1 on CPU2-3
 
 # Optionally define mac and/or bridge for the network interfaces.
 # Random MACs are assigned if not given.
diff -r 889b941effc8 -r 7281c7aa8922 tools/examples/xmexample.vti
--- a/tools/examples/xmexample.vti	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/examples/xmexample.vti	Mon Aug 14 13:16:30 2006 -0500
@@ -30,10 +30,11 @@ name = "ExampleVTIDomain"
 # the number of cpus guest platform has, default=1
 #vcpus=1
 
-# List of which CPUS this domain is allowed to use, default Xen picks
-#cpus = ""         # leave to Xen to pick
-#cpus = "0"        # all vcpus run on CPU0
-#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+# Specify which CPUS the domains' vcpus can use
+#cpus = ""               # leave to Xen to pick
+#cpus = "0"              # all vcpus run on CPU0
+#cpus = "0-3,5,^1"       # all vcpus run on cpus 0,2,3,5
+#cpus = [ "0-1", "2-3" ] # VCPU0 on CPU0-1, VCPU1 on CPU2-3
 
 # Optionally define mac and/or bridge for the network interfaces.
 # Random MACs are assigned if not given.
diff -r 889b941effc8 -r 7281c7aa8922 tools/examples/xmexample1
--- a/tools/examples/xmexample1	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/examples/xmexample1	Mon Aug 14 13:16:30 2006 -0500
@@ -30,10 +30,11 @@ name = "ExampleDomain"
 # on each call to 'xm create'.
 #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
 
-# List of which CPUS this domain is allowed to use, default Xen picks
-#cpus = ""         # leave to Xen to pick
-#cpus = "0"        # all vcpus run on CPU0
-#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+# Specify which CPUS the domains' vcpus can use
+#cpus = ""               # leave to Xen to pick
+#cpus = "0"              # all vcpus run on CPU0
+#cpus = "0-3,5,^1"       # all vcpus run on cpus 0,2,3,5
+#cpus = [ "0-1", "2-3" ] # VCPU0 on CPU0-1, VCPU1 on CPU2-3
 
 # Number of Virtual CPUS to use, default is 1
 #vcpus = 1
diff -r 889b941effc8 -r 7281c7aa8922 tools/examples/xmexample2
--- a/tools/examples/xmexample2	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/examples/xmexample2	Mon Aug 14 13:16:30 2006 -0500
@@ -59,11 +59,18 @@ name = "VM%d" % vmid
 # on each call to 'xm create'.
 #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
 
-# List of which CPUS this domain is allowed to use, default Xen picks
+# List of which CPUS vcpus are allowed to use, default Xen picks
 #cpus = ""         # leave to Xen to pick
 #cpus = "0"        # all vcpus run on CPU0
 #cpus = "0-3,5,^1" # run on cpus 0,2,3,5
-#cpus = "%s" % vmid # set based on vmid (mod number of CPUs)
+#cpus = "0-1, 2-3" # run VCPU0 on CPU0-1, VCPU1 on CPU2-3
+
+# Specify which CPUS the domains' vcpus can use
+#cpus = ""               # leave to Xen to pick
+#cpus = "0"              # all vcpus run on CPU0
+#cpus = "0-3,5,^1"       # all vcpus run on cpus 0,2,3,5
+#cpus = [ "0-1", "2-3" ] # VCPU0 on CPU0-1, VCPU1 on CPU2-3
+#cpus = "%s" % vmid      # all vcpus run on CPU(vmid) (mod number of CPUs)
 
 # Number of Virtual CPUS to use, default is 1
 #vcpus = 1
diff -r 889b941effc8 -r 7281c7aa8922 tools/examples/xmexample3
--- a/tools/examples/xmexample3	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/examples/xmexample3	Mon Aug 14 13:16:30 2006 -0500
@@ -59,11 +59,13 @@ name = "VM%d" % vmid
 # on each call to 'xm create'.
 #uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
 
-# List of which CPUS this domain is allowed to use, default Xen picks
-#cpus = ""         # leave to Xen to pick
-#cpus = "0"        # all vcpus run on CPU0
-#cpus = "0-3,5,^1" # run on cpus 0,2,3,5
-cpus = "%s" % vmid # set based on vmid (mod number of CPUs)
+# Specify which CPUS the domains' vcpus can use
+#cpus = ""               # leave to Xen to pick
+#cpus = "0"              # all vcpus run on CPU0
+#cpus = "0-3,5,^1"       # all vcpus run on cpus 0,2,3,5
+#cpus = [ "0-1", "2-3" ] # VCPU0 on CPU0-1, VCPU1 on CPU2-3
+cpus = "%s" % vmid       # all vcpus run on CPU(vmid) (mod number of CPUs)
+
 
 #----------------------------------------------------------------------------
 # Define network interfaces.
diff -r 889b941effc8 -r 7281c7aa8922 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py	Mon Aug 14 13:15:55 2006 -0500
+++ b/tools/python/xen/xend/XendDomainInfo.py	Mon Aug 14 13:16:30 2006 -0500
@@ -328,27 +328,47 @@ def parseConfig(config):
            else:
                result['cpus'] = str(result['cpu'])
 
-        # convert 'cpus' string to list of ints
-        # 'cpus' supports a list of ranges (0-3), seperated by
-        # commas, and negation, (^1).  
-        # Precedence is settled by  order of the string:
-        #     "0-3,^1"   -> [0,2,3]
-        #     "0-3,^1,1" -> [0,1,2,3]
-        if result['cpus']:
-            cpus = []
-            for c in result['cpus'].split(','):
-                if c.find('-') != -1:             
-                    (x,y) = c.split('-')
-                    for i in range(int(x),int(y)+1):
-                        cpus.append(int(i))
-                else:
-                    # remove this element from the list 
-                    if c[0] == '^':
-                        cpus = [x for x in cpus if x != int(c[1:])]
+        if result['cpus'] is not None:
+            # see if cpus string specifies multiple cpumasks, or just one
+            # e.g: "[ '2-5', '0-1', '0-3,^1', '5' ]" vs. "0-3,5"
+            if result['cpus'].startswith("["):
+                # the below was tested with the following sample string
+                # "[4, '2-5','2-5', '1-3,6,^2', '2-6','1' 1-7,^2 ]" and resulted in
+                # ['4', '2-5', '2-5', '1-3,6,^2', '2-6', '1']
+                result['cpus'] = filter(lambda x: len(x), map(lambda x: x.strip(", "),
+                           result['cpus'].replace('[',"").replace(']',"").split("'")))
+
+            # convert non list-base value into list of cpumasks
+            # cpus = "4|2-5,^4|1-3,5,^2|1|^2" ->
+            # ['4', '2-5,^4', '1-3,5,^2', '1', '^2'] 
+            # also takes care of cpus = "4"
+            else:
+                result['cpus'] = result['cpus'].split("|")
+
+            # convert 'cpus' list of strings into a list of list of ints
+            # 'cpus' supports a list of ranges (0-3), seperated by
+            # commas, and negation, (^1).  
+            # Precedence is settled by  order of the string:
+            #     "0-3,^1"   -> [0,2,3]
+            #     "0-3,^1,1" -> [0,1,2,3]
+            new_cpus = []
+            for x in result['cpus']:
+                cpus = []
+                for c in x.split(','):
+                    if c.find('-') != -1:             
+                        (x,y) = c.split('-')
+                        for i in range(int(x),int(y)+1):
+                            cpus.append(int(i))
                     else:
-                        cpus.append(int(c))
-
-            result['cpus'] = cpus
+                        # remove this element from the list 
+                        if c[0] == '^':
+                            cpus = [x for x in cpus if x != int(c[1:])]
+                        else:
+                            cpus.append(int(c))
+
+                new_cpus.append(cpus)
+            
+            result['cpus'] = new_cpus
         
     except ValueError, exn:
         raise VmError(
@@ -1274,7 +1294,9 @@ class XendDomainInfo:
             # distribution for NUMA systems.
             if self.info['cpus'] is not None and len(self.info['cpus']) > 0:
                 for v in range(0, self.info['max_vcpu_id']+1):
-                    xc.vcpu_setaffinity(self.domid, v, self.info['cpus'])
+                    # map each vcpu to a cpumask in the list
+                    cpumask = self.info['cpus'][v % len(self.info['cpus'])]
+                    xc.vcpu_setaffinity(self.domid, v, cpumask)
 
             # set domain maxmem in KiB
             xc.domain_setmaxmem(self.domid, self.info['maxmem'] * 1024)

[PATCH 3 of 5] Add testcase for multi-cpumask cpus parameter

[Ryan Harper]

2 files changed, 83 insertions(+), 1 deletion(-)
tools/xm-test/tests/create/17_create_cpusparm_pos.py |   81 ++++++++++++++++++
tools/xm-test/tests/create/Makefile.am               |    3 


# HG changeset patch
# User Ryan Harper <ryanh@us.ibm.com>
# Date 1155579423 18000
# Node ID 734570be7e0592f20e6f97089c89541feed03abc
# Parent  7281c7aa89220b5bb20c9275a65dee37be6da298
Add testcase for multi-cpumask cpus parameter

diff -r 7281c7aa8922 -r 734570be7e05 tools/xm-test/tests/create/Makefile.am
--- a/tools/xm-test/tests/create/Makefile.am	Mon Aug 14 13:16:30 2006 -0500
+++ b/tools/xm-test/tests/create/Makefile.am	Mon Aug 14 13:17:03 2006 -0500
@@ -14,7 +14,8 @@ TESTS = 01_create_basic_pos.test \
 	13_create_multinic_pos.test \
 	14_create_blockroot_pos.test \
 	15_create_smallmem_pos.test \
-	16_create_smallmem_neg.test
+	16_create_smallmem_neg.test \
+	17_create_cpusparm_pos.py
 
 EXTRA_DIST = $(TESTS)
 
diff -r 7281c7aa8922 -r 734570be7e05 tools/xm-test/tests/create/17_create_cpusparm_pos.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/xm-test/tests/create/17_create_cpusparm_pos.py	Mon Aug 14 13:17:03 2006 -0500
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+
+# Copyright (C) International Business Machines Corp., 2006
+# Authors: Dan Smith <danms@us.ibm.com>
+#        : Ryan Harper <ryanh@us.ibm.com>
+#
+# This test will examine Xend's cpu/cpus parameter parsing ability.  The cpus
+# parameter controls which physical cpus the domain's vcpus run upon.  We can
+# set a single cpumask for all vcpus, or we can build up lists of cpumasks 
+# to be applied individually.  The test covers the following cases:
+#
+# single vcpu tests
+# multi-vcpu tests using same values
+# multi-vcpu tests using differing values per-vcpu
+# multi-vcpu tests as above, list notation
+#
+# format: (#vcpus, cpus= value, list of resulting affinity values)
+cpu_strings=[ (2, '0',    ["0", "0"]),
+              (2, '1',    ["1", "1"]),
+              (2, '0|1',  ["0", "1"]),
+              (2, '1|0',  ["1", "0"]),
+              (2, '0-1',  ["0-1", "0-1"]),
+              (2, '[0]',        ["0", "0"]),
+              (2, '[1]',        ["1", "1"]),
+              (2, '[0, 1]',     ["0", "1"]),
+              (2, '[1, 0]',     ["1", "0"]),
+              (2, '["0-1"]',    ["0-1", "0-1"]),
+              (2, '["0-1,^1"]', ["0", "0"]),
+              (4, '0',             ["0", "0", "0", "0"]),
+              (4, '1',             ["1", "1", "1", "1"]),
+              (4, '0|1|2|3',       ["0", "1", "2", "3"]),
+              (4, '1,3|0,2|0|0-3', ["1,3", "0,2", "0", "0-3"]),
+              (4, '[0]',                        ["0", "0", "0", "0"]),
+              (4, '[1]',                        ["1", "1", "1", "1"]),
+              (4, '[0, 1, 2, 3]',               ["0", "1", "2", "3"]),
+              (4, '["1,3", "0,2", "0", "0-3"]', ["1,3", "0,2", "0", "0-3"]) ]
+
+
+              
+from XmTestLib import *
+
+
+# Verify that we can run this test on this host
+min_smplevel = min(map(lambda (x,y,z): x, cpu_strings))
+cpus = smpConcurrencyLevel()
+if len(filter(lambda (x,y,z): x<=cpus, cpu_strings)) < 1:
+    print "*** NOTE: This machine does not have enough logical processors"
+    print "          to run this test properly.  Retry on a machine that"
+    print "          has at least %s logical processors." %(min_smplevel)
+    SKIP("Host not capable of running test")
+
+
+# for each test string, start up the domain and then examine vcpuinfo to
+# determine whether the affinity value for a particular vcpu was correct.
+# filter out tests that the host can't run
+for (x,y,z) in filter(lambda (x,y,z): x<=cpus, cpu_strings):
+    # we have to work around extraConfig adding leading double quotes
+    y = y.replace("\"", "'")
+    domain = XmTestDomain(extraConfig={"vcpus": x, "cpus": y})
+
+    #kick off domain
+    try:
+        console = domain.start()
+    except DomainError, e:
+        FAIL("Unable to start a domain with vcpus=%s cpus=%s"%(x, y))
+
+    # get vcpuinfo on the domain's vcpus.
+    vcpuinfo = getVcpuInfo(domain.getName())
+
+    # for each vcpu, check the affinity value
+    for a in range(0,x):
+
+        # if the host smp level is equal to required level, then the resulting
+        # affinity value is truncated to 'any cpu' by xend, if we fail to match
+        # we also check if we can match with 'any cpu'
+        if vcpuinfo[a]['affinity'] != z[a] and \
+            (cpus == x and vcpuinfo[a]['affinity'] != "any cpu"):
+            FAIL("Failed to set VCPU affinity for cpus=%s ([%s] != [%s])"%(
+                 y, vcpuinfo[a]['affinity'], z[a]))
+
+    domain.destroy()

[PATCH 4 of 5] Add keyword 'all' to vcpu-pin

[Ryan Harper]

4 files changed, 24 insertions(+), 8 deletions(-)
docs/man/xm.pod.1                         |    4 +++-
tools/python/xen/xend/XendDomain.py       |   17 +++++++++++++----
tools/python/xen/xend/server/SrvDomain.py |    2 +-
tools/python/xen/xm/main.py               |    9 +++++++--


# HG changeset patch
# User Ryan Harper <ryanh@us.ibm.com>
# Date 1155579483 18000
# Node ID 556a93b6cca9b99b2ad0a2d6dcc24dc1a3a581ad
# Parent  734570be7e0592f20e6f97089c89541feed03abc
Add keyword 'all' to vcpu-pin

diff -r 734570be7e05 -r 556a93b6cca9 docs/man/xm.pod.1
--- a/docs/man/xm.pod.1	Mon Aug 14 13:17:03 2006 -0500
+++ b/docs/man/xm.pod.1	Mon Aug 14 13:18:03 2006 -0500
@@ -393,7 +393,9 @@ specified, VCPU information for all doma
 
 =item B<vcpu-pin> I<domain-id> I<vcpu> I<cpus>
 
-Pins the the VCPU to only run on the specific CPUs.  
+Pins the the VCPU to only run on the specific CPUs.  The keyword
+I<all> can be used to apply the I<cpus> list to all VCPUs in the
+domain.
 
 Normally VCPUs can float between available CPUs whenever Xen deems a
 different run state is appropriate.  Pinning can be used to restrict
diff -r 734570be7e05 -r 556a93b6cca9 tools/python/xen/xend/XendDomain.py
--- a/tools/python/xen/xend/XendDomain.py	Mon Aug 14 13:17:03 2006 -0500
+++ b/tools/python/xen/xend/XendDomain.py	Mon Aug 14 13:18:03 2006 -0500
@@ -466,10 +466,19 @@ class XendDomain:
         if not dominfo:
             raise XendInvalidDomain(str(domid))
 
-        try:
-            return xc.vcpu_setaffinity(dominfo.getDomid(), vcpu, cpumap)
-        except Exception, ex:
-            raise XendError(str(ex))
+        # if vcpu is keyword 'all', apply the cpumap to all vcpus
+        vcpus = [ vcpu ]
+        if str(vcpu).lower() == "all":
+            vcpus = range(0, int(dominfo.getVCpuCount()))
+       
+        # set the same cpumask for all vcpus
+        rc = 0
+        for v in vcpus:
+            try:
+                rc = xc.vcpu_setaffinity(dominfo.getDomid(), int(v), cpumap)
+            except Exception, ex:
+                raise XendError(str(ex))
+        return rc
 
     def domain_cpu_bvt_set(self, domid, mcuadv, warpback, warpvalue, warpl,
                            warpu):
diff -r 734570be7e05 -r 556a93b6cca9 tools/python/xen/xend/server/SrvDomain.py
--- a/tools/python/xen/xend/server/SrvDomain.py	Mon Aug 14 13:17:03 2006 -0500
+++ b/tools/python/xen/xend/server/SrvDomain.py	Mon Aug 14 13:18:03 2006 -0500
@@ -97,7 +97,7 @@ class SrvDomain(SrvDir):
     def op_pincpu(self, _, req):
         fn = FormFn(self.xd.domain_pincpu,
                     [['dom', 'int'],
-                     ['vcpu', 'int'],
+                     ['vcpu', 'str'],
                      ['cpumap', 'str']])
         val = fn(req.args, {'dom': self.dom.domid})
         return val
diff -r 734570be7e05 -r 556a93b6cca9 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py	Mon Aug 14 13:17:03 2006 -0500
+++ b/tools/python/xen/xm/main.py	Mon Aug 14 13:18:03 2006 -0500
@@ -613,7 +613,12 @@ def cpu_make_map(cpulist):
             for i in range(int(x),int(y)+1):
                 cpus.append(int(i))
         else:
-            cpus.append(int(c))
+            # remove this element from the list
+            if c[0] == '^':
+                cpus = [x for x in cpus if x != int(c[1:])]
+            else:
+                cpus.append(int(c))
+
     cpus.sort()
     return cpus
 
@@ -621,7 +626,7 @@ def xm_vcpu_pin(args):
     arg_check(args, "vcpu-pin", 3)
 
     dom  = args[0]
-    vcpu = int(args[1])
+    vcpu = args[1]
     cpumap = cpu_make_map(args[2])
     
     server.xend.domain.pincpu(dom, vcpu, cpumap)

[PATCH 5 of 5] Add testcase for vcpu-pin all

[Ryan Harper]

2 files changed, 56 insertions(+), 1 deletion(-)
tools/xm-test/tests/vcpu-pin/02_vcpu-pin_all_pos.py |   54 +++++++++++++++++++
tools/xm-test/tests/vcpu-pin/Makefile.am            |    3 -


# HG changeset patch
# User Ryan Harper <ryanh@us.ibm.com>
# Date 1155579519 18000
# Node ID 27fdbe03de014cf640190081d2a61da246dac7a1
# Parent  556a93b6cca9b99b2ad0a2d6dcc24dc1a3a581ad
Add testcase for vcpu-pin all

diff -r 556a93b6cca9 -r 27fdbe03de01 tools/xm-test/tests/vcpu-pin/Makefile.am
--- a/tools/xm-test/tests/vcpu-pin/Makefile.am	Mon Aug 14 13:18:03 2006 -0500
+++ b/tools/xm-test/tests/vcpu-pin/Makefile.am	Mon Aug 14 13:18:39 2006 -0500
@@ -1,7 +1,8 @@
 
 SUBDIRS =
 
-TESTS = 01_vcpu-pin_basic_pos.test
+TESTS = 01_vcpu-pin_basic_pos.test \
+	02_vcpu-pin_all_pos.py
 
 XFAIL_TESTS = 
 
diff -r 556a93b6cca9 -r 27fdbe03de01 tools/xm-test/tests/vcpu-pin/02_vcpu-pin_all_pos.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/xm-test/tests/vcpu-pin/02_vcpu-pin_all_pos.py	Mon Aug 14 13:18:39 2006 -0500
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+
+# Copyright (C) International Business Machines Corp., 2005
+# Author(s): Dan Smith <danms@us.ibm.com>
+#          : Ryan Harper <ryanh@us.ibm.com
+
+# 1) Make sure we have a multi cpu system
+# 2) Create a multi vcpu domain all on CPU1 
+#    and pin all vcpus to CPU0
+
+import sys;
+
+from XmTestLib import *
+
+# Verify that we can run this test on this host
+if smpConcurrencyLevel() <= 1:
+    print "*** NOTE: This machine does not have more than one physical"
+    print "          or logical cpu.  The vcpu-pin test cannot be run!"
+    SKIP("Host not capable of running test")
+
+vcpus = 2
+domain = XmTestDomain(extraConfig={"cpus": "1", "vcpus": vcpus})
+
+try:
+    domain.start(noConsole=True)
+except DomainError, e:
+    if verbose:
+        print "Failed to create test domain because:"
+        print e.extra
+    FAIL(str(e))
+
+# wait for both vcpus to come up
+vcpus_up = 0
+start = int(time.time())
+print "waiting for all VCPUS to come up"
+while vcpus_up != vcpus:
+    vcpus_up = len(filter(lambda x: x is not None, 
+             vcpu_to_cpu(domain.getName())))
+    # 20 second timeout
+    if int(time.time()) >= start+20:
+        FAIL("Failed to bring all VCPUS online for test")
+        time.sleep(1)
+
+status, output = traceCommand("xm vcpu-pin %s all 0" % domain.getName())
+
+if status != 0:
+    FAIL("xm vcpu-pin returned invalid %i != 0" % status)
+
+v2c = vcpu_to_cpu(domain.getName())
+for vcpu in range(0,vcpus):
+    if int(v2c[vcpu]) != 0:
+        FAIL("failed to switch VCPU %s to CPU 0"%(vcpu))
+
+domain.stop()

Re: [PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[Daniel Veillard]

On Wed, Aug 16, 2006 at 03:49:34PM -0500, Ryan Harper wrote:
> This series of patches relates to the cpus parameter and pinning vcpus.
> The first patch is a clean-up of getVcpuInfo, which previously only
> returned the vcpu to cpu mapping.  This was insufficient for extracting
> affinity information.  The patch extends getVcpuInfo to return a dict of
> all the fields in xm vcpu-list for a domain.  It also fixes a couple
> users of the function and moves them to a new vcpu_to_cpu function which
> retains the old behavior of getVcpuInfo.

  How is that affecting the xend sxp API ? This may break libvirt 0.1.4
which uses those. 

Daniel

-- 
Red Hat Virtualization group http://redhat.com/virtualization/
Daniel Veillard      | virtualization library  http://libvirt.org/
veillard@redhat.com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine  http://rpmfind.net/

Re: [PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[Ryan Harper]

* Daniel Veillard <veillard@redhat.com> [2006-08-16 16:03]:
> On Wed, Aug 16, 2006 at 03:49:34PM -0500, Ryan Harper wrote:
> > This series of patches relates to the cpus parameter and pinning vcpus.
> > The first patch is a clean-up of getVcpuInfo, which previously only
> > returned the vcpu to cpu mapping.  This was insufficient for extracting
> > affinity information.  The patch extends getVcpuInfo to return a dict of
> > all the fields in xm vcpu-list for a domain.  It also fixes a couple
> > users of the function and moves them to a new vcpu_to_cpu function which
> > retains the old behavior of getVcpuInfo.
> 
>   How is that affecting the xend sxp API ? This may break libvirt 0.1.4
> which uses those. 

This change is to XmTestLib, ie, for the test cases only.  Sorry for not
being more clear on that.

-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
ryanh@us.ibm.com

Re: [PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[Ryan Harper]

* Ryan Harper <ryanh@us.ibm.com> [2006-08-16 16:06]:
> * Daniel Veillard <veillard@redhat.com> [2006-08-16 16:03]:
> > On Wed, Aug 16, 2006 at 03:49:34PM -0500, Ryan Harper wrote:
> > > This series of patches relates to the cpus parameter and pinning vcpus.
> > > The first patch is a clean-up of getVcpuInfo, which previously only
> > > returned the vcpu to cpu mapping.  This was insufficient for extracting
> > > affinity information.  The patch extends getVcpuInfo to return a dict of
> > > all the fields in xm vcpu-list for a domain.  It also fixes a couple
> > > users of the function and moves them to a new vcpu_to_cpu function which
> > > retains the old behavior of getVcpuInfo.
> > 
> >   How is that affecting the xend sxp API ? This may break libvirt 0.1.4
> > which uses those. 

The cpus parameter and vcpu 'all' changes add new behavior and do not
modify any existing behavior, so no changes to the sxp API.

> 
> This change is to XmTestLib, ie, for the test cases only.  Sorry for not
> being more clear on that.

I misread your question, but the above was referring to the getVcpuInfo
change, which was in XmTestLib.

> 
> -- 
> Ryan Harper
> Software Engineer; Linux Technology Center
> IBM Corp., Austin, Tx
> (512) 838-9253   T/L: 678-9253
> ryanh@us.ibm.com

-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
(512) 838-9253   T/L: 678-9253
ryanh@us.ibm.com

Re: [PATCH 0 of 5] multiple cpumask and vcpu-pin all keyword

[Daniel Veillard]

On Wed, Aug 16, 2006 at 04:12:47PM -0500, Ryan Harper wrote:
> * Ryan Harper <ryanh@us.ibm.com> [2006-08-16 16:06]:
> > * Daniel Veillard <veillard@redhat.com> [2006-08-16 16:03]:
> > > On Wed, Aug 16, 2006 at 03:49:34PM -0500, Ryan Harper wrote:
> > > > This series of patches relates to the cpus parameter and pinning vcpus.
> > > > The first patch is a clean-up of getVcpuInfo, which previously only
> > > > returned the vcpu to cpu mapping.  This was insufficient for extracting
> > > > affinity information.  The patch extends getVcpuInfo to return a dict of
> > > > all the fields in xm vcpu-list for a domain.  It also fixes a couple
> > > > users of the function and moves them to a new vcpu_to_cpu function which
> > > > retains the old behavior of getVcpuInfo.
> > > 
> > >   How is that affecting the xend sxp API ? This may break libvirt 0.1.4
> > > which uses those. 
> 
> The cpus parameter and vcpu 'all' changes add new behavior and do not
> modify any existing behavior, so no changes to the sxp API.

  Okay, thanks :-)

Daniel

-- 
Red Hat Virtualization group http://redhat.com/virtualization/
Daniel Veillard      | virtualization library  http://libvirt.org/
veillard@redhat.com  | libxml GNOME XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | Rpmfind RPM search engine  http://rpmfind.net/