From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCHv3 1 of 2] libxl: extend pCPUs specification for vcpu-pin. Date: Wed, 25 Jan 2012 15:37:53 +0100 Message-ID: <1327502273.2723.19.camel@Abyss> References: <1327500920.2723.11.camel@Abyss> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4175367600534927591==" Return-path: In-Reply-To: <1327500920.2723.11.camel@Abyss> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel Cc: "Ian.Campbell" , George Dunlap , Juergen Gross , Ian Jackson List-Id: xen-devel@lists.xenproject.org --===============4175367600534927591== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-k+39NQ5VqV2/znaiDeQU" --=-k+39NQ5VqV2/znaiDeQU Content-Type: multipart/mixed; boundary="=-fTs9J/Zljhf/O4TV79Dv" --=-fTs9J/Zljhf/O4TV79Dv Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable [Resending with patch attached, in case the client mangled the body of =20 the message (although it really shouldn't!)]=20 Allow for "^" syntax while specifying the pCPUs list during a vcpu-pin. This enables doing the following: xl vcpu-pin 1 1 0-4,^2 and achieving: xl vcpu-list Name ID VCPU CPU State Time(s) CPU Aff= inity ... Squeeze_pv 1 1 3 -b- 2.4 0-1,3-4 ... Negative ranges are also supported, such as "0-4,^1-2" to mean "0,3-4" Signed-off-by: Dario Faggioli diff -r a2a8089b1ffb tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Tue Jan 24 16:46:17 2012 +0000 +++ b/tools/libxl/libxl_utils.h Wed Jan 25 11:40:22 2012 +0000 @@ -71,6 +71,8 @@ int libxl_cpumap_test(libxl_cpumap *cpum void libxl_cpumap_set(libxl_cpumap *cpumap, int cpu); void libxl_cpumap_reset(libxl_cpumap *cpumap, int cpu); #define libxl_for_each_cpu(var, map) for (var =3D 0; var < (map).size * 8;= var++) +#define libxl_for_each_set_cpu(v, m) for (v =3D 0; v < (m).size * 8; v++) = \ + if (libxl_cpumap_test(&(m), v= )) =20 int libxl_cpuarray_alloc(libxl_ctx *ctx, libxl_cpuarray *cpuarray); =20 diff -r a2a8089b1ffb tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Tue Jan 24 16:46:17 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Wed Jan 25 11:40:22 2012 +0000 @@ -3503,13 +3503,72 @@ int main_vcpulist(int argc, char **argv) return 0; } =20 +static int vcpupin_parse(char *cpu, libxl_cpumap *cpumap) +{ + libxl_cpumap exclude_cpumap; + uint32_t cpuida, cpuidb; + char *endptr, *toka, *tokb, *saveptr =3D NULL; + int i, rc =3D 0, rmcpu; + + if (!strcmp(cpu, "all")) { + memset(cpumap->map, -1, cpumap->size); + return 0; + } + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) { + fprintf(stderr, "Error: Failed to allocate cpumap.\n"); + return ENOMEM; + } + + for (toka =3D strtok_r(cpu, ",", &saveptr); toka; + toka =3D strtok_r(NULL, ",", &saveptr)) { + rmcpu =3D 0; + if (*toka =3D=3D '^') { + /* This (These) Cpu(s) will be removed from the map */ + toka++; + rmcpu =3D 1; + } + /* Extract a valid (range of) cpu(s) */ + cpuida =3D cpuidb =3D strtoul(toka, &endptr, 10); + if (endptr =3D=3D toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc =3D EINVAL; + goto vcpp_out; + } + if (*endptr =3D=3D '-') { + tokb =3D endptr + 1; + cpuidb =3D strtoul(tokb, &endptr, 10); + if (endptr =3D=3D tokb || cpuida > cpuidb) { + fprintf(stderr, "Error: Invalid argument.\n"); + rc =3D EINVAL; + goto vcpp_out; + } + } + while (cpuida <=3D cpuidb) { + rmcpu =3D=3D 0 ? libxl_cpumap_set(cpumap, cpuida) : + libxl_cpumap_set(&exclude_cpumap, cpuida); + cpuida++; + } + } + + /* Clear all the cpus from the removal list */ + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return rc; +} + static void vcpupin(const char *d, const char *vcpu, char *cpu) { libxl_vcpuinfo *vcpuinfo; libxl_cpumap cpumap; =20 - uint32_t vcpuid, cpuida, cpuidb; - char *endptr, *toka, *tokb; + uint32_t vcpuid; + char *endptr; int i, nb_vcpu; =20 vcpuid =3D strtoul(vcpu, &endptr, 10); @@ -3526,32 +3585,9 @@ static void vcpupin(const char *d, const if (libxl_cpumap_alloc(ctx, &cpumap)) { goto vcpupin_out; } - if (strcmp(cpu, "all")) { - for (toka =3D strtok(cpu, ","), i =3D 0; toka; toka =3D strtok(NUL= L, ","), ++i) { - cpuida =3D strtoul(toka, &endptr, 10); - if (toka =3D=3D endptr) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - if (*endptr =3D=3D '-') { - tokb =3D endptr + 1; - cpuidb =3D strtoul(tokb, &endptr, 10); - if ((tokb =3D=3D endptr) || (cpuida > cpuidb)) { - fprintf(stderr, "Error: Invalid argument.\n"); - goto vcpupin_out1; - } - while (cpuida <=3D cpuidb) { - libxl_cpumap_set(&cpumap, cpuida); - ++cpuida; - } - } else { - libxl_cpumap_set(&cpumap, cpuida); - } - } - } - else { - memset(cpumap.map, -1, cpumap.size); - } + + if (vcpupin_parse(cpu, &cpumap)) + goto vcpupin_out1; =20 if (vcpuid !=3D -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, &cpumap) =3D=3D -1)= { --=20 <> (Raistlin Majere) ------------------------------------------------------------------- Dario Faggioli, Ph.D, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) --=-fTs9J/Zljhf/O4TV79Dv Content-Disposition: attachment; filename="generalize-vcpupin-parsig.patch" Content-Type: text/x-patch; name="generalize-vcpupin-parsig.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gNCiMgUGFyZW50IGEyYTgwODliMWZmYmY1NzU3Y2EzMTkxY2I4 Zjc0YTVmMWVkN2ZlZDENCmxpYnhsOiBleHRlbmQgcENQVXMgc3BlY2lmaWNhdGlvbiBmb3IgdmNw dS1waW4uDQoNCkFsbG93IGZvciAiXjxjcHVpZD4iIHN5bnRheCB3aGlsZSBzcGVjaWZ5aW5nIHRo ZSBwQ1BVcyBsaXN0DQpkdXJpbmcgYSB2Y3B1LXBpbi4gVGhpcyBlbmFibGVzIGRvaW5nIHRoZSBm b2xsb3dpbmc6DQoNCiB4bCB2Y3B1LXBpbiAxIDEgMC00LF4yDQoNCmFuZCBhY2hpZXZpbmc6DQoN CiB4bCB2Y3B1LWxpc3QNCiBOYW1lICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJRCAg VkNQVSAgIENQVSBTdGF0ZSAgIFRpbWUocykgQ1BVIEFmZmluaXR5DQogLi4uDQogU3F1ZWV6ZV9w diAgICAgICAgICAgICAgICAgICAgICAgICAgIDEgICAgIDEgICAgMyAgIC1iLSAgICAgICAyLjQg IDAtMSwzLTQNCiAuLi4NCg0KU2lnbmVkLW9mZi1ieTogRGFyaW8gRmFnZ2lvbGkgPGRhcmlvLmZh Z2dpb2xpQGNpdHJpeC5jb20+DQoNCmRpZmYgLXIgYTJhODA4OWIxZmZiIHRvb2xzL2xpYnhsL2xp YnhsX3V0aWxzLmgNCi0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmgJVHVlIEphbiAyNCAx Njo0NjoxNyAyMDEyICswMDAwDQorKysgYi90b29scy9saWJ4bC9saWJ4bF91dGlscy5oCVdlZCBK YW4gMjUgMTE6NDA6MjIgMjAxMiArMDAwMA0KQEAgLTcxLDYgKzcxLDggQEAgaW50IGxpYnhsX2Nw dW1hcF90ZXN0KGxpYnhsX2NwdW1hcCAqY3B1bQ0KIHZvaWQgbGlieGxfY3B1bWFwX3NldChsaWJ4 bF9jcHVtYXAgKmNwdW1hcCwgaW50IGNwdSk7DQogdm9pZCBsaWJ4bF9jcHVtYXBfcmVzZXQobGli eGxfY3B1bWFwICpjcHVtYXAsIGludCBjcHUpOw0KICNkZWZpbmUgbGlieGxfZm9yX2VhY2hfY3B1 KHZhciwgbWFwKSBmb3IgKHZhciA9IDA7IHZhciA8IChtYXApLnNpemUgKiA4OyB2YXIrKykNCisj ZGVmaW5lIGxpYnhsX2Zvcl9lYWNoX3NldF9jcHUodiwgbSkgZm9yICh2ID0gMDsgdiA8IChtKS5z aXplICogODsgdisrKSBcDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKGxpYnhsX2NwdW1hcF90ZXN0KCYobSksIHYpKQ0KIA0KIGludCBsaWJ4bF9jcHVh cnJheV9hbGxvYyhsaWJ4bF9jdHggKmN0eCwgbGlieGxfY3B1YXJyYXkgKmNwdWFycmF5KTsNCiAN CmRpZmYgLXIgYTJhODA4OWIxZmZiIHRvb2xzL2xpYnhsL3hsX2NtZGltcGwuYw0KLS0tIGEvdG9v bHMvbGlieGwveGxfY21kaW1wbC5jCVR1ZSBKYW4gMjQgMTY6NDY6MTcgMjAxMiArMDAwMA0KKysr IGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCVdlZCBKYW4gMjUgMTE6NDA6MjIgMjAxMiArMDAw MA0KQEAgLTM1MDMsMTMgKzM1MDMsNzIgQEAgaW50IG1haW5fdmNwdWxpc3QoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQ0KICAgICByZXR1cm4gMDsNCiB9DQogDQorc3RhdGljIGludCB2Y3B1cGluX3Bh cnNlKGNoYXIgKmNwdSwgbGlieGxfY3B1bWFwICpjcHVtYXApDQorew0KKyAgICBsaWJ4bF9jcHVt YXAgZXhjbHVkZV9jcHVtYXA7DQorICAgIHVpbnQzMl90IGNwdWlkYSwgY3B1aWRiOw0KKyAgICBj aGFyICplbmRwdHIsICp0b2thLCAqdG9rYiwgKnNhdmVwdHIgPSBOVUxMOw0KKyAgICBpbnQgaSwg cmMgPSAwLCBybWNwdTsNCisNCisgICAgaWYgKCFzdHJjbXAoY3B1LCAiYWxsIikpIHsNCisgICAg ICAgIG1lbXNldChjcHVtYXAtPm1hcCwgLTEsIGNwdW1hcC0+c2l6ZSk7DQorICAgICAgICByZXR1 cm4gMDsNCisgICAgfQ0KKw0KKyAgICBpZiAobGlieGxfY3B1bWFwX2FsbG9jKGN0eCwgJmV4Y2x1 ZGVfY3B1bWFwKSkgew0KKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJFcnJvcjogRmFpbGVkIHRv IGFsbG9jYXRlIGNwdW1hcC5cbiIpOw0KKyAgICAgICAgcmV0dXJuIEVOT01FTTsNCisgICAgfQ0K Kw0KKyAgICBmb3IgKHRva2EgPSBzdHJ0b2tfcihjcHUsICIsIiwgJnNhdmVwdHIpOyB0b2thOw0K KyAgICAgICAgIHRva2EgPSBzdHJ0b2tfcihOVUxMLCAiLCIsICZzYXZlcHRyKSkgew0KKyAgICAg ICAgcm1jcHUgPSAwOw0KKyAgICAgICAgaWYgKCp0b2thID09ICdeJykgew0KKyAgICAgICAgICAg IC8qIFRoaXMgKFRoZXNlKSBDcHUocykgd2lsbCBiZSByZW1vdmVkIGZyb20gdGhlIG1hcCAqLw0K KyAgICAgICAgICAgIHRva2ErKzsNCisgICAgICAgICAgICBybWNwdSA9IDE7DQorICAgICAgICB9 DQorICAgICAgICAvKiBFeHRyYWN0IGEgdmFsaWQgKHJhbmdlIG9mKSBjcHUocykgKi8NCisgICAg ICAgIGNwdWlkYSA9IGNwdWlkYiA9IHN0cnRvdWwodG9rYSwgJmVuZHB0ciwgMTApOw0KKyAgICAg ICAgaWYgKGVuZHB0ciA9PSB0b2thKSB7DQorICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJF cnJvcjogSW52YWxpZCBhcmd1bWVudC5cbiIpOw0KKyAgICAgICAgICAgIHJjID0gRUlOVkFMOw0K KyAgICAgICAgICAgIGdvdG8gdmNwcF9vdXQ7DQorICAgICAgICB9DQorICAgICAgICBpZiAoKmVu ZHB0ciA9PSAnLScpIHsNCisgICAgICAgICAgICB0b2tiID0gZW5kcHRyICsgMTsNCisgICAgICAg ICAgICBjcHVpZGIgPSBzdHJ0b3VsKHRva2IsICZlbmRwdHIsIDEwKTsNCisgICAgICAgICAgICBp ZiAoZW5kcHRyID09IHRva2IgfHwgY3B1aWRhID4gY3B1aWRiKSB7DQorICAgICAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAiRXJyb3I6IEludmFsaWQgYXJndW1lbnQuXG4iKTsNCisgICAgICAg ICAgICAgICAgcmMgPSBFSU5WQUw7DQorICAgICAgICAgICAgICAgIGdvdG8gdmNwcF9vdXQ7DQor ICAgICAgICAgICAgfQ0KKyAgICAgICAgfQ0KKyAgICAgICAgd2hpbGUgKGNwdWlkYSA8PSBjcHVp ZGIpIHsNCisgICAgICAgICAgICBybWNwdSA9PSAwID8gbGlieGxfY3B1bWFwX3NldChjcHVtYXAs IGNwdWlkYSkgOg0KKyAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9jcHVtYXBfc2V0KCZl eGNsdWRlX2NwdW1hcCwgY3B1aWRhKTsNCisgICAgICAgICAgICBjcHVpZGErKzsNCisgICAgICAg IH0NCisgICAgfQ0KKw0KKyAgICAvKiBDbGVhciBhbGwgdGhlIGNwdXMgZnJvbSB0aGUgcmVtb3Zh bCBsaXN0ICovDQorICAgIGxpYnhsX2Zvcl9lYWNoX3NldF9jcHUoaSwgZXhjbHVkZV9jcHVtYXAp IHsNCisgICAgICAgIGxpYnhsX2NwdW1hcF9yZXNldChjcHVtYXAsIGkpOw0KKyAgICB9DQorDQor dmNwcF9vdXQ6DQorICAgIGxpYnhsX2NwdW1hcF9kaXNwb3NlKCZleGNsdWRlX2NwdW1hcCk7DQor DQorICAgIHJldHVybiByYzsNCit9DQorDQogc3RhdGljIHZvaWQgdmNwdXBpbihjb25zdCBjaGFy ICpkLCBjb25zdCBjaGFyICp2Y3B1LCBjaGFyICpjcHUpDQogew0KICAgICBsaWJ4bF92Y3B1aW5m byAqdmNwdWluZm87DQogICAgIGxpYnhsX2NwdW1hcCBjcHVtYXA7DQogDQotICAgIHVpbnQzMl90 IHZjcHVpZCwgY3B1aWRhLCBjcHVpZGI7DQotICAgIGNoYXIgKmVuZHB0ciwgKnRva2EsICp0b2ti Ow0KKyAgICB1aW50MzJfdCB2Y3B1aWQ7DQorICAgIGNoYXIgKmVuZHB0cjsNCiAgICAgaW50IGks IG5iX3ZjcHU7DQogDQogICAgIHZjcHVpZCA9IHN0cnRvdWwodmNwdSwgJmVuZHB0ciwgMTApOw0K QEAgLTM1MjYsMzIgKzM1ODUsOSBAQCBzdGF0aWMgdm9pZCB2Y3B1cGluKGNvbnN0IGNoYXIgKmQs IGNvbnN0DQogICAgIGlmIChsaWJ4bF9jcHVtYXBfYWxsb2MoY3R4LCAmY3B1bWFwKSkgew0KICAg ICAgICAgZ290byB2Y3B1cGluX291dDsNCiAgICAgfQ0KLSAgICBpZiAoc3RyY21wKGNwdSwgImFs bCIpKSB7DQotICAgICAgICBmb3IgKHRva2EgPSBzdHJ0b2soY3B1LCAiLCIpLCBpID0gMDsgdG9r YTsgdG9rYSA9IHN0cnRvayhOVUxMLCAiLCIpLCArK2kpIHsNCi0gICAgICAgICAgICBjcHVpZGEg PSBzdHJ0b3VsKHRva2EsICZlbmRwdHIsIDEwKTsNCi0gICAgICAgICAgICBpZiAodG9rYSA9PSBl bmRwdHIpIHsNCi0gICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJFcnJvcjogSW52YWxp ZCBhcmd1bWVudC5cbiIpOw0KLSAgICAgICAgICAgICAgICBnb3RvIHZjcHVwaW5fb3V0MTsNCi0g ICAgICAgICAgICB9DQotICAgICAgICAgICAgaWYgKCplbmRwdHIgPT0gJy0nKSB7DQotICAgICAg ICAgICAgICAgIHRva2IgPSBlbmRwdHIgKyAxOw0KLSAgICAgICAgICAgICAgICBjcHVpZGIgPSBz dHJ0b3VsKHRva2IsICZlbmRwdHIsIDEwKTsNCi0gICAgICAgICAgICAgICAgaWYgKCh0b2tiID09 IGVuZHB0cikgfHwgKGNwdWlkYSA+IGNwdWlkYikpIHsNCi0gICAgICAgICAgICAgICAgICAgIGZw cmludGYoc3RkZXJyLCAiRXJyb3I6IEludmFsaWQgYXJndW1lbnQuXG4iKTsNCi0gICAgICAgICAg ICAgICAgICAgIGdvdG8gdmNwdXBpbl9vdXQxOw0KLSAgICAgICAgICAgICAgICB9DQotICAgICAg ICAgICAgICAgIHdoaWxlIChjcHVpZGEgPD0gY3B1aWRiKSB7DQotICAgICAgICAgICAgICAgICAg ICBsaWJ4bF9jcHVtYXBfc2V0KCZjcHVtYXAsIGNwdWlkYSk7DQotICAgICAgICAgICAgICAgICAg ICArK2NwdWlkYTsNCi0gICAgICAgICAgICAgICAgfQ0KLSAgICAgICAgICAgIH0gZWxzZSB7DQot ICAgICAgICAgICAgICAgIGxpYnhsX2NwdW1hcF9zZXQoJmNwdW1hcCwgY3B1aWRhKTsNCi0gICAg ICAgICAgICB9DQotICAgICAgICB9DQotICAgIH0NCi0gICAgZWxzZSB7DQotICAgICAgICBtZW1z ZXQoY3B1bWFwLm1hcCwgLTEsIGNwdW1hcC5zaXplKTsNCi0gICAgfQ0KKw0KKyAgICBpZiAodmNw dXBpbl9wYXJzZShjcHUsICZjcHVtYXApKQ0KKyAgICAgICAgZ290byB2Y3B1cGluX291dDE7DQog DQogICAgIGlmICh2Y3B1aWQgIT0gLTEpIHsNCiAgICAgICAgIGlmIChsaWJ4bF9zZXRfdmNwdWFm ZmluaXR5KGN0eCwgZG9taWQsIHZjcHVpZCwgJmNwdW1hcCkgPT0gLTEpIHsNCg== --=-fTs9J/Zljhf/O4TV79Dv-- --=-k+39NQ5VqV2/znaiDeQU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk8gE8EACgkQk4XaBE3IOsRrtgCgo7CSOL7p1/PkUfl78v169six u2YAnRbAU0h9hj4gM9KgQMLyzuM34ySe =45UL -----END PGP SIGNATURE----- --=-k+39NQ5VqV2/znaiDeQU-- --===============4175367600534927591== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============4175367600534927591==--