xl: enable using ranges of pCPUs when creating cpupools

instead of just list of single pCPUs or NUMA node IDs, as
it happens right now.

On the other hand, after this change, strings containing
pCPUs and NUMA node ranges is supported. The syntax is the
same one supported by the "cpus" and "cpus_soft" config
switch, i.e., "4-8" or "node:1,12-18,^14".

This make things more flexible, more consistent, and also
improves error handling, as the pCPU range parsing routine
already present in xl is more reliable than just a call
to atoi().

While there, remove a redundant error check in the legacy syntax
handling (libxl_bitmap_test() already checks the index being
within the size of the bitmap).

Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Juergen Gross <JGross@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Dario Faggioli authored and Ian Campbell committed 2015-03-18 12:51:24 +00:00
1 parent 62ff09ae2f
commit a86eecbbf5
2 files changed
+33 -6

No files matched your search

+19 -3
View File
@@ -93,10 +93,26 @@ Specifies the cpus of the NUMA-nodes given in C<NODES> (an integer or
a list of integers) to be member of the cpupool. The free cpus in the
specified nodes are allocated in the new cpupool.
=item B<cpus="CPUS">
=item B<cpus="CPU-LIST">
The specified C<CPUS> are allocated in the new cpupool. All cpus must
be free. Must not be specified together with B<nodes>.
Specifies the cpus that will be member of the cpupool. All the specified
cpus must be free, or creation will fail. C<CPU-LIST> may be specified
as follows:
=over 4
=item ["2", "3", "5"]
means that cpus 2,3,5 will be member of the cpupool.
=item "0-3,5,^1"
means that cpus 0,2,3 and 5 will be member of the cpupool. A "node:" or
"nodes:" modifier can be used. E.g., "0,node:1,nodes:2-3,^10-13" means
that pcpus 0, plus all the cpus of NUMA nodes 1,2,3 with the exception
of cpus 10,11,12,13 will be memeber of the cpupool.
=back
If neither B<nodes> nor B<cpus> are specified only the first free cpu
found will be allocated in the new cpupool.
+14 -3
View File
@@ -7341,18 +7341,29 @@ int main_cpupoolcreate(int argc, char **argv)
fprintf(stderr, "no free cpu found\n");
goto out_cfg;
}
} else if (!xlu_cfg_get_list(config, "cpus", &cpus, 0, 0)) {
} else if (!xlu_cfg_get_list(config, "cpus", &cpus, 0, 1)) {
n_cpus = 0;
while ((buf = xlu_cfg_get_listitem(cpus, n_cpus)) != NULL) {
i = atoi(buf);
if ((i < 0) || (i >= freemap.size * 8) ||
!libxl_bitmap_test(&freemap, i)) {
if ((i < 0) || !libxl_bitmap_test(&freemap, i)) {
fprintf(stderr, "cpu %d illegal or not free\n", i);
goto out_cfg;
}
libxl_bitmap_set(&cpumap, i);
n_cpus++;
}
} else if (!xlu_cfg_get_string(config, "cpus", &buf, 0)) {
if (cpurange_parse(buf, &cpumap))
goto out_cfg;
n_cpus = 0;
libxl_for_each_set_bit(i, cpumap) {
if (!libxl_bitmap_test(&freemap, i)) {
fprintf(stderr, "cpu %d illegal or not free\n", i);
goto out_cfg;
}
n_cpus++;
}
} else
n_cpus = 0;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.