From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCH 1 of 3] libxl: extend pCPUs specification for vcpu-pin. Date: Wed, 11 Jan 2012 17:58:59 +0000 Message-ID: <1326304739.12973.1.camel@Abyss> References: <1326304198.2401.6.camel@Abyss> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8700287909111958057==" Return-path: In-Reply-To: <1326304198.2401.6.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" , Ian Jackson List-Id: xen-devel@lists.xenproject.org --===============8700287909111958057== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-vjWktQsj5cH8ZdAXfFoK" --=-vjWktQsj5cH8ZdAXfFoK Content-Type: multipart/mixed; boundary="=-GQccQM3Pp0wIV3b1dl2K" --=-GQccQM3Pp0wIV3b1dl2K Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 ... Signed-off-by: Dario Faggioli diff -r 9cdcedc133e5 tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Wed Jan 11 10:34:45 2012 +0100 +++ b/tools/libxl/libxl_utils.h Wed Jan 11 17:38:04 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(var, map) for (var =3D 0; var < (map).size = * 8; var++) \ + if (libxl_cpumap_test(&(map),= var)) =20 int libxl_cpuarray_alloc(libxl_ctx *ctx, libxl_cpuarray *cpuarray); =20 diff -r 9cdcedc133e5 tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Wed Jan 11 10:34:45 2012 +0100 +++ b/tools/libxl/xl_cmdimpl.c Wed Jan 11 17:38:04 2012 +0000 @@ -3501,13 +3501,67 @@ 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; + int i, rmcpu, ret =3D 0; + + if (libxl_cpumap_alloc(ctx, &exclude_cpumap)) + return ENOMEM; + + if (strcmp(cpu, "all")) { + for (toka =3D strtok(cpu, ","), i =3D 0; toka; toka =3D strtok(NUL= L, ","), ++i) { + rmcpu =3D 0; + if (*toka =3D=3D '^') { + toka++; rmcpu =3D 1; + } + cpuida =3D strtoul(toka, &endptr, 10); + if (toka =3D=3D endptr) { + fprintf(stderr, "Error: Invalid argument.\n"); + ret =3D EINVAL; + goto vcpp_out; + } + if (rmcpu) { + libxl_cpumap_set(&exclude_cpumap, cpuida); + } else 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"); + ret =3D EINVAL; + goto vcpp_out; + } + while (cpuida <=3D cpuidb) { + libxl_cpumap_set(cpumap, cpuida); + ++cpuida; + } + } else { + libxl_cpumap_set(cpumap, cpuida); + } + } + + libxl_for_each_set_cpu(i, exclude_cpumap) { + libxl_cpumap_reset(cpumap, i); + } + } else { + memset(cpumap->map, -1, cpumap->size); + } + +vcpp_out: + libxl_cpumap_dispose(&exclude_cpumap); + + return ret; +} + 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); @@ -3524,32 +3578,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, http://retis.sssup.it/people/faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK) PhD Candidate, ReTiS Lab, Scuola Superiore Sant'Anna, Pisa (Italy) --=-GQccQM3Pp0wIV3b1dl2K 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 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gNCiMgUGFyZW50IDljZGNlZGMxMzNlNTIyN2M2MzVkYmIwMGJk NDc3OTAxNTMxMTEwN2ENCmxpYnhsOiBleHRlbmQgcENQVXMgc3BlY2lmaWNhdGlvbiBmb3IgdmNw dS1waW4uDQoNCkFsbG93IGZvciAiXjxjcHVpZD4iIHN5bnRheCB3aGlsZSBzcGVjaWZ5aW5nIHRo ZSBwQ1BVcyBsaXN0DQpkdXJpbmcgYSB2Y3B1LXBpbi4gVGhpcyBlbmFibGVzIGRvaW5nIHRoZSBm b2xsb3dpbmc6DQoNCiB4bCB2Y3B1LXBpbiAxIDEgMC00LF4yDQoNCmFuZCBhY2hpZXZpbmc6DQoN CiB4bCB2Y3B1LWxpc3QNCiBOYW1lICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJRCAg VkNQVSAgIENQVSBTdGF0ZSAgIFRpbWUocykgQ1BVIEFmZmluaXR5DQogLi4uDQogU3F1ZWV6ZV9w diAgICAgICAgICAgICAgICAgICAgICAgICAgIDEgICAgIDEgICAgMyAgIC1iLSAgICAgICAyLjQg IDAtMSwzLTQNCiAuLi4NCg0KU2lnbmVkLW9mZi1ieTogRGFyaW8gRmFnZ2lvbGkgPGRhcmlvLmZh Z2dpb2xpQGNpdHJpeC5jb20+DQoNCmRpZmYgLXIgOWNkY2VkYzEzM2U1IHRvb2xzL2xpYnhsL2xp YnhsX3V0aWxzLmgNCi0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmgJV2VkIEphbiAxMSAx MDozNDo0NSAyMDEyICswMTAwDQorKysgYi90b29scy9saWJ4bC9saWJ4bF91dGlscy5oCVdlZCBK YW4gMTEgMTc6Mzg6MDQgMjAxMiArMDAwMA0KQEAgLTcxLDYgKzcxLDggQEAgaW50IGxpYnhsX2Nw dW1hcF90ZXN0KGxpYnhsX2NwdW1hcCAqY3B1bQ0KIHZvaWQgbGlieGxfY3B1bWFwX3NldChsaWJ4 bF9jcHVtYXAgKmNwdW1hcCwgaW50IGNwdSk7DQogdm9pZCBsaWJ4bF9jcHVtYXBfcmVzZXQobGli eGxfY3B1bWFwICpjcHVtYXAsIGludCBjcHUpOw0KICNkZWZpbmUgbGlieGxfZm9yX2VhY2hfY3B1 KHZhciwgbWFwKSBmb3IgKHZhciA9IDA7IHZhciA8IChtYXApLnNpemUgKiA4OyB2YXIrKykNCisj ZGVmaW5lIGxpYnhsX2Zvcl9lYWNoX3NldF9jcHUodmFyLCBtYXApIGZvciAodmFyID0gMDsgdmFy IDwgKG1hcCkuc2l6ZSAqIDg7IHZhcisrKSBcDQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGxpYnhsX2NwdW1hcF90ZXN0KCYobWFwKSwgdmFyKSkNCiAN CiBpbnQgbGlieGxfY3B1YXJyYXlfYWxsb2MobGlieGxfY3R4ICpjdHgsIGxpYnhsX2NwdWFycmF5 ICpjcHVhcnJheSk7DQogDQpkaWZmIC1yIDljZGNlZGMxMzNlNSB0b29scy9saWJ4bC94bF9jbWRp bXBsLmMNCi0tLSBhL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYwlXZWQgSmFuIDExIDEwOjM0OjQ1 IDIwMTIgKzAxMDANCisrKyBiL3Rvb2xzL2xpYnhsL3hsX2NtZGltcGwuYwlXZWQgSmFuIDExIDE3 OjM4OjA0IDIwMTIgKzAwMDANCkBAIC0zNTAxLDEzICszNTAxLDY3IEBAIGludCBtYWluX3ZjcHVs aXN0KGludCBhcmdjLCBjaGFyICoqYXJndikNCiAgICAgcmV0dXJuIDA7DQogfQ0KIA0KK3N0YXRp YyBpbnQgdmNwdXBpbl9wYXJzZShjaGFyICpjcHUsIGxpYnhsX2NwdW1hcCAqY3B1bWFwKQ0KK3sN CisgICAgbGlieGxfY3B1bWFwIGV4Y2x1ZGVfY3B1bWFwOw0KKyAgICB1aW50MzJfdCBjcHVpZGEs IGNwdWlkYjsNCisgICAgY2hhciAqZW5kcHRyLCAqdG9rYSwgKnRva2I7DQorICAgIGludCBpLCBy bWNwdSwgcmV0ID0gMDsNCisNCisgICAgaWYgKGxpYnhsX2NwdW1hcF9hbGxvYyhjdHgsICZleGNs dWRlX2NwdW1hcCkpDQorICAgICAgICByZXR1cm4gRU5PTUVNOw0KKw0KKyAgICBpZiAoc3RyY21w KGNwdSwgImFsbCIpKSB7DQorICAgICAgICBmb3IgKHRva2EgPSBzdHJ0b2soY3B1LCAiLCIpLCBp ID0gMDsgdG9rYTsgdG9rYSA9IHN0cnRvayhOVUxMLCAiLCIpLCArK2kpIHsNCisgICAgICAgICAg ICBybWNwdSA9IDA7DQorICAgICAgICAgICAgaWYgKCp0b2thID09ICdeJykgew0KKyAgICAgICAg ICAgICAgICB0b2thKys7IHJtY3B1ID0gMTsNCisgICAgICAgICAgICB9DQorICAgICAgICAgICAg Y3B1aWRhID0gc3RydG91bCh0b2thLCAmZW5kcHRyLCAxMCk7DQorICAgICAgICAgICAgaWYgKHRv a2EgPT0gZW5kcHRyKSB7DQorICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRXJyb3I6 IEludmFsaWQgYXJndW1lbnQuXG4iKTsNCisgICAgICAgICAgICAgICAgcmV0ID0gRUlOVkFMOw0K KyAgICAgICAgICAgICAgICBnb3RvIHZjcHBfb3V0Ow0KKyAgICAgICAgICAgIH0NCisgICAgICAg ICAgICBpZiAocm1jcHUpIHsNCisgICAgICAgICAgICAgICAgbGlieGxfY3B1bWFwX3NldCgmZXhj bHVkZV9jcHVtYXAsIGNwdWlkYSk7DQorICAgICAgICAgICAgfSBlbHNlIGlmICgqZW5kcHRyID09 ICctJykgew0KKyAgICAgICAgICAgICAgICB0b2tiID0gZW5kcHRyICsgMTsNCisgICAgICAgICAg ICAgICAgY3B1aWRiID0gc3RydG91bCh0b2tiLCAmZW5kcHRyLCAxMCk7DQorICAgICAgICAgICAg ICAgIGlmICgodG9rYiA9PSBlbmRwdHIpIHx8IChjcHVpZGEgPiBjcHVpZGIpKSB7DQorICAgICAg ICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkVycm9yOiBJbnZhbGlkIGFyZ3VtZW50Llxu Iik7DQorICAgICAgICAgICAgICAgICAgICByZXQgPSBFSU5WQUw7DQorICAgICAgICAgICAgICAg ICAgICBnb3RvIHZjcHBfb3V0Ow0KKyAgICAgICAgICAgICAgICB9DQorICAgICAgICAgICAgICAg IHdoaWxlIChjcHVpZGEgPD0gY3B1aWRiKSB7DQorICAgICAgICAgICAgICAgICAgICBsaWJ4bF9j cHVtYXBfc2V0KGNwdW1hcCwgY3B1aWRhKTsNCisgICAgICAgICAgICAgICAgICAgICsrY3B1aWRh Ow0KKyAgICAgICAgICAgICAgICB9DQorICAgICAgICAgICAgfSBlbHNlIHsNCisgICAgICAgICAg ICAgICAgbGlieGxfY3B1bWFwX3NldChjcHVtYXAsIGNwdWlkYSk7DQorICAgICAgICAgICAgfQ0K KyAgICAgICAgfQ0KKw0KKyAgICAgICAgbGlieGxfZm9yX2VhY2hfc2V0X2NwdShpLCBleGNsdWRl X2NwdW1hcCkgew0KKyAgICAgICAgICAgIGxpYnhsX2NwdW1hcF9yZXNldChjcHVtYXAsIGkpOw0K KyAgICAgICAgfQ0KKyAgICB9IGVsc2Ugew0KKyAgICAgICAgbWVtc2V0KGNwdW1hcC0+bWFwLCAt MSwgY3B1bWFwLT5zaXplKTsNCisgICAgfQ0KKw0KK3ZjcHBfb3V0Og0KKyAgICBsaWJ4bF9jcHVt YXBfZGlzcG9zZSgmZXhjbHVkZV9jcHVtYXApOw0KKw0KKyAgICByZXR1cm4gcmV0Ow0KK30NCisN CiBzdGF0aWMgdm9pZCB2Y3B1cGluKGNvbnN0IGNoYXIgKmQsIGNvbnN0IGNoYXIgKnZjcHUsIGNo YXIgKmNwdSkNCiB7DQogICAgIGxpYnhsX3ZjcHVpbmZvICp2Y3B1aW5mbzsNCiAgICAgbGlieGxf Y3B1bWFwIGNwdW1hcDsNCiANCi0gICAgdWludDMyX3QgdmNwdWlkLCBjcHVpZGEsIGNwdWlkYjsN Ci0gICAgY2hhciAqZW5kcHRyLCAqdG9rYSwgKnRva2I7DQorICAgIHVpbnQzMl90IHZjcHVpZDsN CisgICAgY2hhciAqZW5kcHRyOw0KICAgICBpbnQgaSwgbmJfdmNwdTsNCiANCiAgICAgdmNwdWlk ID0gc3RydG91bCh2Y3B1LCAmZW5kcHRyLCAxMCk7DQpAQCAtMzUyNCwzMiArMzU3OCw5IEBAIHN0 YXRpYyB2b2lkIHZjcHVwaW4oY29uc3QgY2hhciAqZCwgY29uc3QNCiAgICAgaWYgKGxpYnhsX2Nw dW1hcF9hbGxvYyhjdHgsICZjcHVtYXApKSB7DQogICAgICAgICBnb3RvIHZjcHVwaW5fb3V0Ow0K ICAgICB9DQotICAgIGlmIChzdHJjbXAoY3B1LCAiYWxsIikpIHsNCi0gICAgICAgIGZvciAodG9r YSA9IHN0cnRvayhjcHUsICIsIiksIGkgPSAwOyB0b2thOyB0b2thID0gc3RydG9rKE5VTEwsICIs IiksICsraSkgew0KLSAgICAgICAgICAgIGNwdWlkYSA9IHN0cnRvdWwodG9rYSwgJmVuZHB0ciwg MTApOw0KLSAgICAgICAgICAgIGlmICh0b2thID09IGVuZHB0cikgew0KLSAgICAgICAgICAgICAg ICBmcHJpbnRmKHN0ZGVyciwgIkVycm9yOiBJbnZhbGlkIGFyZ3VtZW50LlxuIik7DQotICAgICAg ICAgICAgICAgIGdvdG8gdmNwdXBpbl9vdXQxOw0KLSAgICAgICAgICAgIH0NCi0gICAgICAgICAg ICBpZiAoKmVuZHB0ciA9PSAnLScpIHsNCi0gICAgICAgICAgICAgICAgdG9rYiA9IGVuZHB0ciAr IDE7DQotICAgICAgICAgICAgICAgIGNwdWlkYiA9IHN0cnRvdWwodG9rYiwgJmVuZHB0ciwgMTAp Ow0KLSAgICAgICAgICAgICAgICBpZiAoKHRva2IgPT0gZW5kcHRyKSB8fCAoY3B1aWRhID4gY3B1 aWRiKSkgew0KLSAgICAgICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJFcnJvcjogSW52 YWxpZCBhcmd1bWVudC5cbiIpOw0KLSAgICAgICAgICAgICAgICAgICAgZ290byB2Y3B1cGluX291 dDE7DQotICAgICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICAgICAgd2hpbGUgKGNwdWlkYSA8 PSBjcHVpZGIpIHsNCi0gICAgICAgICAgICAgICAgICAgIGxpYnhsX2NwdW1hcF9zZXQoJmNwdW1h cCwgY3B1aWRhKTsNCi0gICAgICAgICAgICAgICAgICAgICsrY3B1aWRhOw0KLSAgICAgICAgICAg ICAgICB9DQotICAgICAgICAgICAgfSBlbHNlIHsNCi0gICAgICAgICAgICAgICAgbGlieGxfY3B1 bWFwX3NldCgmY3B1bWFwLCBjcHVpZGEpOw0KLSAgICAgICAgICAgIH0NCi0gICAgICAgIH0NCi0g ICAgfQ0KLSAgICBlbHNlIHsNCi0gICAgICAgIG1lbXNldChjcHVtYXAubWFwLCAtMSwgY3B1bWFw LnNpemUpOw0KLSAgICB9DQorDQorICAgIGlmICh2Y3B1cGluX3BhcnNlKGNwdSwgJmNwdW1hcCkp DQorICAgICAgICBnb3RvIHZjcHVwaW5fb3V0MTsNCiANCiAgICAgaWYgKHZjcHVpZCAhPSAtMSkg ew0KICAgICAgICAgaWYgKGxpYnhsX3NldF92Y3B1YWZmaW5pdHkoY3R4LCBkb21pZCwgdmNwdWlk LCAmY3B1bWFwKSA9PSAtMSkgew0K --=-GQccQM3Pp0wIV3b1dl2K-- --=-vjWktQsj5cH8ZdAXfFoK 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) iEYEABECAAYFAk8NzeMACgkQk4XaBE3IOsTm1ACfRmKrPRE+v6ZEpnl7InKI2AEA b/AAnRPlNHAjapzaASkFm16wmFhCr9Jh =fv6F -----END PGP SIGNATURE----- --=-vjWktQsj5cH8ZdAXfFoK-- --===============8700287909111958057== 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 --===============8700287909111958057==--