From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dario Faggioli Subject: [PATCHv2 1 of 2] libxl: extend pCPUs specification for vcpu-pin. Date: Mon, 23 Jan 2012 19:21:11 +0100 Message-ID: <1327342871.2476.14.camel@Abyss> References: <1327342219.2476.9.camel@Abyss> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0333325683652929383==" Return-path: In-Reply-To: <1327342219.2476.9.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 --===============0333325683652929383== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-HSJ4rRTmFqKvjNgQmyFS" --=-HSJ4rRTmFqKvjNgQmyFS Content-Type: multipart/mixed; boundary="=-uCoRyQsJyRl6p9yJMpZ+" --=-uCoRyQsJyRl6p9yJMpZ+ 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 370924e204dc tools/libxl/libxl_utils.h --- a/tools/libxl/libxl_utils.h Mon Jan 23 15:10:43 2012 +0000 +++ b/tools/libxl/libxl_utils.h Mon Jan 23 18:02:41 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 370924e204dc tools/libxl/xl_cmdimpl.c --- a/tools/libxl/xl_cmdimpl.c Mon Jan 23 15:10:43 2012 +0000 +++ b/tools/libxl/xl_cmdimpl.c Mon Jan 23 18:02:41 2012 +0000 @@ -3503,13 +3503,77 @@ 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, ret =3D 0; + + 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)) { + if (*toka =3D=3D '^') { + /* Add the cpu to the removal list */ + toka++; + cpuida =3D strtoul(toka, &endptr, 10); + if (toka =3D=3D endptr) { + fprintf(stderr, "Error: Invalid argument.\n"); + ret =3D EINVAL; + goto vcpp_out; + } + libxl_cpumap_set(&exclude_cpumap, cpuida); + } else { + /* Valid (range of) cpu(s) */ + cpuida =3D cpuidb =3D strtoul(toka, &endptr, 10); + if (endptr =3D=3D toka) { + fprintf(stderr, "Error: Invalid argument.\n"); + ret =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"); + ret =3D EINVAL; + goto vcpp_out; + } + } + while (cpuida <=3D cpuidb) { + libxl_cpumap_set(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 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); @@ -3526,32 +3590,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) --=-uCoRyQsJyRl6p9yJMpZ+ 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 IyBIRyBjaGFuZ2VzZXQgcGF0Y2gNCiMgUGFyZW50IDM3MDkyNGUyMDRkYzI5ZTEyY2Q4MDdkZDcz MDk3NGQ2YjJiYzUzZDMNCmxpYnhsOiBleHRlbmQgcENQVXMgc3BlY2lmaWNhdGlvbiBmb3IgdmNw dS1waW4uDQoNCkFsbG93IGZvciAiXjxjcHVpZD4iIHN5bnRheCB3aGlsZSBzcGVjaWZ5aW5nIHRo ZSBwQ1BVcyBsaXN0DQpkdXJpbmcgYSB2Y3B1LXBpbi4gVGhpcyBlbmFibGVzIGRvaW5nIHRoZSBm b2xsb3dpbmc6DQoNCiB4bCB2Y3B1LXBpbiAxIDEgMC00LF4yDQoNCmFuZCBhY2hpZXZpbmc6DQoN CiB4bCB2Y3B1LWxpc3QNCiBOYW1lICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJRCAg VkNQVSAgIENQVSBTdGF0ZSAgIFRpbWUocykgQ1BVIEFmZmluaXR5DQogLi4uDQogU3F1ZWV6ZV9w diAgICAgICAgICAgICAgICAgICAgICAgICAgIDEgICAgIDEgICAgMyAgIC1iLSAgICAgICAyLjQg IDAtMSwzLTQNCiAuLi4NCg0KU2lnbmVkLW9mZi1ieTogRGFyaW8gRmFnZ2lvbGkgPGRhcmlvLmZh Z2dpb2xpQGNpdHJpeC5jb20+DQoNCmRpZmYgLXIgMzcwOTI0ZTIwNGRjIHRvb2xzL2xpYnhsL2xp YnhsX3V0aWxzLmgNCi0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3V0aWxzLmgJTW9uIEphbiAyMyAx NToxMDo0MyAyMDEyICswMDAwDQorKysgYi90b29scy9saWJ4bC9saWJ4bF91dGlscy5oCU1vbiBK YW4gMjMgMTg6MDI6NDEgMjAxMiArMDAwMA0KQEAgLTcxLDYgKzcxLDggQEAgaW50IGxpYnhsX2Nw dW1hcF90ZXN0KGxpYnhsX2NwdW1hcCAqY3B1bQ0KIHZvaWQgbGlieGxfY3B1bWFwX3NldChsaWJ4 bF9jcHVtYXAgKmNwdW1hcCwgaW50IGNwdSk7DQogdm9pZCBsaWJ4bF9jcHVtYXBfcmVzZXQobGli eGxfY3B1bWFwICpjcHVtYXAsIGludCBjcHUpOw0KICNkZWZpbmUgbGlieGxfZm9yX2VhY2hfY3B1 KHZhciwgbWFwKSBmb3IgKHZhciA9IDA7IHZhciA8IChtYXApLnNpemUgKiA4OyB2YXIrKykNCisj ZGVmaW5lIGxpYnhsX2Zvcl9lYWNoX3NldF9jcHUodiwgbSkgZm9yICh2ID0gMDsgdiA8IChtKS5z aXplICogODsgdisrKSBcDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaWYgKGxpYnhsX2NwdW1hcF90ZXN0KCYobSksIHYpKQ0KIA0KIGludCBsaWJ4bF9jcHVh cnJheV9hbGxvYyhsaWJ4bF9jdHggKmN0eCwgbGlieGxfY3B1YXJyYXkgKmNwdWFycmF5KTsNCiAN CmRpZmYgLXIgMzcwOTI0ZTIwNGRjIHRvb2xzL2xpYnhsL3hsX2NtZGltcGwuYw0KLS0tIGEvdG9v bHMvbGlieGwveGxfY21kaW1wbC5jCU1vbiBKYW4gMjMgMTU6MTA6NDMgMjAxMiArMDAwMA0KKysr IGIvdG9vbHMvbGlieGwveGxfY21kaW1wbC5jCU1vbiBKYW4gMjMgMTg6MDI6NDEgMjAxMiArMDAw MA0KQEAgLTM1MDMsMTMgKzM1MDMsNzcgQEAgaW50IG1haW5fdmNwdWxpc3QoaW50IGFyZ2MsIGNo YXIgKiphcmd2KQ0KICAgICByZXR1cm4gMDsNCiB9DQogDQorc3RhdGljIGludCB2Y3B1cGluX3Bh cnNlKGNoYXIgKmNwdSwgbGlieGxfY3B1bWFwICpjcHVtYXApDQorew0KKyAgICBsaWJ4bF9jcHVt YXAgZXhjbHVkZV9jcHVtYXA7DQorICAgIHVpbnQzMl90IGNwdWlkYSwgY3B1aWRiOw0KKyAgICBj aGFyICplbmRwdHIsICp0b2thLCAqdG9rYiwgKnNhdmVwdHIgPSBOVUxMOw0KKyAgICBpbnQgaSwg cmV0ID0gMDsNCisNCisgICAgaWYgKCFzdHJjbXAoY3B1LCAiYWxsIikpIHsNCisgICAgICAgIG1l bXNldChjcHVtYXAtPm1hcCwgLTEsIGNwdW1hcC0+c2l6ZSk7DQorICAgICAgICByZXR1cm4gMDsN CisgICAgfQ0KKw0KKyAgICBpZiAobGlieGxfY3B1bWFwX2FsbG9jKGN0eCwgJmV4Y2x1ZGVfY3B1 bWFwKSkgew0KKyAgICAgICAgZnByaW50ZihzdGRlcnIsICJFcnJvcjogRmFpbGVkIHRvIGFsbG9j YXRlIGNwdW1hcC5cbiIpOw0KKyAgICAgICAgcmV0dXJuIEVOT01FTTsNCisgICAgfQ0KKw0KKyAg ICBmb3IgKHRva2EgPSBzdHJ0b2tfcihjcHUsICIsIiwgJnNhdmVwdHIpOyB0b2thOw0KKyAgICAg ICAgIHRva2EgPSBzdHJ0b2tfcihOVUxMLCAiLCIsICZzYXZlcHRyKSkgew0KKyAgICAgICAgaWYg KCp0b2thID09ICdeJykgew0KKyAgICAgICAgICAgIC8qIEFkZCB0aGUgY3B1IHRvIHRoZSByZW1v dmFsIGxpc3QgKi8NCisgICAgICAgICAgICB0b2thKys7DQorICAgICAgICAgICAgY3B1aWRhID0g c3RydG91bCh0b2thLCAmZW5kcHRyLCAxMCk7DQorICAgICAgICAgICAgaWYgKHRva2EgPT0gZW5k cHRyKSB7DQorICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRXJyb3I6IEludmFsaWQg YXJndW1lbnQuXG4iKTsNCisgICAgICAgICAgICAgICAgcmV0ID0gRUlOVkFMOw0KKyAgICAgICAg ICAgICAgICBnb3RvIHZjcHBfb3V0Ow0KKyAgICAgICAgICAgIH0NCisgICAgICAgICAgICBsaWJ4 bF9jcHVtYXBfc2V0KCZleGNsdWRlX2NwdW1hcCwgY3B1aWRhKTsNCisgICAgICAgIH0gZWxzZSB7 DQorICAgICAgICAgICAgLyogVmFsaWQgKHJhbmdlIG9mKSBjcHUocykgKi8NCisgICAgICAgICAg ICBjcHVpZGEgPSBjcHVpZGIgPSBzdHJ0b3VsKHRva2EsICZlbmRwdHIsIDEwKTsNCisgICAgICAg ICAgICBpZiAoZW5kcHRyID09IHRva2EpIHsNCisgICAgICAgICAgICAgICAgZnByaW50ZihzdGRl cnIsICJFcnJvcjogSW52YWxpZCBhcmd1bWVudC5cbiIpOw0KKyAgICAgICAgICAgICAgICByZXQg PSBFSU5WQUw7DQorICAgICAgICAgICAgICAgIGdvdG8gdmNwcF9vdXQ7DQorICAgICAgICAgICAg fQ0KKyAgICAgICAgICAgIGlmICgqZW5kcHRyID09ICctJykgew0KKyAgICAgICAgICAgICAgICB0 b2tiID0gZW5kcHRyICsgMTsNCisgICAgICAgICAgICAgICAgY3B1aWRiID0gc3RydG91bCh0b2ti LCAmZW5kcHRyLCAxMCk7DQorICAgICAgICAgICAgICAgIGlmIChlbmRwdHIgPT0gdG9rYiB8fCBj cHVpZGEgPiBjcHVpZGIpIHsNCisgICAgICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAi RXJyb3I6IEludmFsaWQgYXJndW1lbnQuXG4iKTsNCisgICAgICAgICAgICAgICAgICAgIHJldCA9 IEVJTlZBTDsNCisgICAgICAgICAgICAgICAgICAgIGdvdG8gdmNwcF9vdXQ7DQorICAgICAgICAg ICAgICAgIH0NCisgICAgICAgICAgICB9DQorICAgICAgICAgICAgd2hpbGUgKGNwdWlkYSA8PSBj cHVpZGIpIHsNCisgICAgICAgICAgICAgICAgbGlieGxfY3B1bWFwX3NldChjcHVtYXAsIGNwdWlk YSk7DQorICAgICAgICAgICAgICAgIGNwdWlkYSsrOw0KKyAgICAgICAgICAgIH0NCisgICAgICAg IH0NCisgICAgfQ0KKw0KKyAgICAvKiBDbGVhciBhbGwgdGhlIGNwdXMgZnJvbSB0aGUgcmVtb3Zh bCBsaXN0ICovDQorICAgIGxpYnhsX2Zvcl9lYWNoX3NldF9jcHUoaSwgZXhjbHVkZV9jcHVtYXAp IHsNCisgICAgICAgIGxpYnhsX2NwdW1hcF9yZXNldChjcHVtYXAsIGkpOw0KKyAgICB9DQorDQor dmNwcF9vdXQ6DQorICAgIGxpYnhsX2NwdW1hcF9kaXNwb3NlKCZleGNsdWRlX2NwdW1hcCk7DQor DQorICAgIHJldHVybiByZXQ7DQorfQ0KKw0KIHN0YXRpYyB2b2lkIHZjcHVwaW4oY29uc3QgY2hh ciAqZCwgY29uc3QgY2hhciAqdmNwdSwgY2hhciAqY3B1KQ0KIHsNCiAgICAgbGlieGxfdmNwdWlu Zm8gKnZjcHVpbmZvOw0KICAgICBsaWJ4bF9jcHVtYXAgY3B1bWFwOw0KIA0KLSAgICB1aW50MzJf dCB2Y3B1aWQsIGNwdWlkYSwgY3B1aWRiOw0KLSAgICBjaGFyICplbmRwdHIsICp0b2thLCAqdG9r YjsNCisgICAgdWludDMyX3QgdmNwdWlkOw0KKyAgICBjaGFyICplbmRwdHI7DQogICAgIGludCBp LCBuYl92Y3B1Ow0KIA0KICAgICB2Y3B1aWQgPSBzdHJ0b3VsKHZjcHUsICZlbmRwdHIsIDEwKTsN CkBAIC0zNTI2LDMyICszNTkwLDkgQEAgc3RhdGljIHZvaWQgdmNwdXBpbihjb25zdCBjaGFyICpk LCBjb25zdA0KICAgICBpZiAobGlieGxfY3B1bWFwX2FsbG9jKGN0eCwgJmNwdW1hcCkpIHsNCiAg ICAgICAgIGdvdG8gdmNwdXBpbl9vdXQ7DQogICAgIH0NCi0gICAgaWYgKHN0cmNtcChjcHUsICJh bGwiKSkgew0KLSAgICAgICAgZm9yICh0b2thID0gc3RydG9rKGNwdSwgIiwiKSwgaSA9IDA7IHRv a2E7IHRva2EgPSBzdHJ0b2soTlVMTCwgIiwiKSwgKytpKSB7DQotICAgICAgICAgICAgY3B1aWRh ID0gc3RydG91bCh0b2thLCAmZW5kcHRyLCAxMCk7DQotICAgICAgICAgICAgaWYgKHRva2EgPT0g ZW5kcHRyKSB7DQotICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCAiRXJyb3I6IEludmFs aWQgYXJndW1lbnQuXG4iKTsNCi0gICAgICAgICAgICAgICAgZ290byB2Y3B1cGluX291dDE7DQot ICAgICAgICAgICAgfQ0KLSAgICAgICAgICAgIGlmICgqZW5kcHRyID09ICctJykgew0KLSAgICAg ICAgICAgICAgICB0b2tiID0gZW5kcHRyICsgMTsNCi0gICAgICAgICAgICAgICAgY3B1aWRiID0g c3RydG91bCh0b2tiLCAmZW5kcHRyLCAxMCk7DQotICAgICAgICAgICAgICAgIGlmICgodG9rYiA9 PSBlbmRwdHIpIHx8IChjcHVpZGEgPiBjcHVpZGIpKSB7DQotICAgICAgICAgICAgICAgICAgICBm cHJpbnRmKHN0ZGVyciwgIkVycm9yOiBJbnZhbGlkIGFyZ3VtZW50LlxuIik7DQotICAgICAgICAg ICAgICAgICAgICBnb3RvIHZjcHVwaW5fb3V0MTsNCi0gICAgICAgICAgICAgICAgfQ0KLSAgICAg ICAgICAgICAgICB3aGlsZSAoY3B1aWRhIDw9IGNwdWlkYikgew0KLSAgICAgICAgICAgICAgICAg ICAgbGlieGxfY3B1bWFwX3NldCgmY3B1bWFwLCBjcHVpZGEpOw0KLSAgICAgICAgICAgICAgICAg ICAgKytjcHVpZGE7DQotICAgICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICB9IGVsc2Ugew0K LSAgICAgICAgICAgICAgICBsaWJ4bF9jcHVtYXBfc2V0KCZjcHVtYXAsIGNwdWlkYSk7DQotICAg ICAgICAgICAgfQ0KLSAgICAgICAgfQ0KLSAgICB9DQotICAgIGVsc2Ugew0KLSAgICAgICAgbWVt c2V0KGNwdW1hcC5tYXAsIC0xLCBjcHVtYXAuc2l6ZSk7DQotICAgIH0NCisNCisgICAgaWYgKHZj cHVwaW5fcGFyc2UoY3B1LCAmY3B1bWFwKSkNCisgICAgICAgIGdvdG8gdmNwdXBpbl9vdXQxOw0K IA0KICAgICBpZiAodmNwdWlkICE9IC0xKSB7DQogICAgICAgICBpZiAobGlieGxfc2V0X3ZjcHVh ZmZpbml0eShjdHgsIGRvbWlkLCB2Y3B1aWQsICZjcHVtYXApID09IC0xKSB7DQo= --=-uCoRyQsJyRl6p9yJMpZ+-- --=-HSJ4rRTmFqKvjNgQmyFS 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) iEYEABECAAYFAk8dpRcACgkQk4XaBE3IOsTtBgCfTPTmZxlAcq2C8O3QDs26GTbZ QrYAnAi61uScwF0fdN8L1d1wPNgIQIbC =lNcC -----END PGP SIGNATURE----- --=-HSJ4rRTmFqKvjNgQmyFS-- --===============0333325683652929383== 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 --===============0333325683652929383==--