[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.10 21/23] numa: remove node_cpu bitmaps as
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [PATCH for-2.10 21/23] numa: remove node_cpu bitmaps as they are no longer used |
Date: |
Tue, 28 Mar 2017 16:13:41 +1100 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Wed, Mar 22, 2017 at 02:32:46PM +0100, Igor Mammedov wrote:
> Postfactum "CPU(s) present in multiple NUMA nodes" check
> was the last user of node_cpu bitmaps, but it's not need
> as machine_set_cpu_numa_node() does the similar check at
> the time mapping is set for cpus (i.e. when -numa cpus=
> is parsed) and ensures that cpu can be mapped only to
> one node.
>
> Remove duplicate check based on node_cpu bitmaps and
> since the last user is gone remove node_cpu as well,
> which completes internal transition from legacy bitmap
> based mapping storage to possible_cpus storage.
>
> Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: David Gibson <address@hidden>
> ---
> include/sysemu/numa.h | 1 -
> numa.c | 42 ------------------------------------------
> 2 files changed, 43 deletions(-)
>
> diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
> index 345bb94..796ee94 100644
> --- a/include/sysemu/numa.h
> +++ b/include/sysemu/numa.h
> @@ -17,7 +17,6 @@ struct numa_addr_range {
>
> typedef struct node_info {
> uint64_t node_mem;
> - unsigned long *node_cpu;
> struct HostMemoryBackend *node_memdev;
> bool present;
> QLIST_HEAD(, numa_addr_range) addr; /* List to store address ranges */
> diff --git a/numa.c b/numa.c
> index 523558f..088fae3 100644
> --- a/numa.c
> +++ b/numa.c
> @@ -177,7 +177,6 @@ static void numa_node_parse(MachineState *ms,
> NumaNodeOptions *node,
> cpus->value, max_cpus);
> return;
> }
> - bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1);
> props = mc->cpu_index_to_instance_props(ms, cpus->value);
> props.node_id = nodenr;
> props.has_node_id = true;
> @@ -261,51 +260,12 @@ end:
> return 0;
> }
>
> -static char *enumerate_cpus(unsigned long *cpus, int max_cpus)
> -{
> - int cpu;
> - bool first = true;
> - GString *s = g_string_new(NULL);
> -
> - for (cpu = find_first_bit(cpus, max_cpus);
> - cpu < max_cpus;
> - cpu = find_next_bit(cpus, max_cpus, cpu + 1)) {
> - g_string_append_printf(s, "%s%d", first ? "" : " ", cpu);
> - first = false;
> - }
> - return g_string_free(s, FALSE);
> -}
> -
> -static void validate_numa_cpus(void)
> -{
> - int i;
> - unsigned long *seen_cpus = bitmap_new(max_cpus);
> -
> - for (i = 0; i < nb_numa_nodes; i++) {
> - if (bitmap_intersects(seen_cpus, numa_info[i].node_cpu, max_cpus)) {
> - bitmap_and(seen_cpus, seen_cpus,
> - numa_info[i].node_cpu, max_cpus);
> - error_report("CPU(s) present in multiple NUMA nodes: %s",
> - enumerate_cpus(seen_cpus, max_cpus));
> - g_free(seen_cpus);
> - exit(EXIT_FAILURE);
> - }
> - bitmap_or(seen_cpus, seen_cpus,
> - numa_info[i].node_cpu, max_cpus);
> - }
> - g_free(seen_cpus);
> -}
> -
> void parse_numa_opts(MachineState *ms)
> {
> int i;
> const CPUArchIdList *possible_cpus;
> MachineClass *mc = MACHINE_GET_CLASS(ms);
>
> - for (i = 0; i < MAX_NODES; i++) {
> - numa_info[i].node_cpu = bitmap_new(max_cpus);
> - }
> -
> if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
> exit(1);
> }
> @@ -397,12 +357,10 @@ void parse_numa_opts(MachineState *ms)
> props = mc->cpu_index_to_instance_props(ms, i);
> props.has_node_id = true;
>
> - set_bit(i, numa_info[props.node_id].node_cpu);
> machine_set_cpu_numa_node(ms, &props, &error_fatal);
> }
> }
>
> - validate_numa_cpus();
> } else {
> numa_set_mem_node_id(0, ram_size, 0);
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- Re: [Qemu-devel] [PATCH for-2.10 15/23] QMP: include CpuInstanceProperties into query_cpus output output, (continued)
- [Qemu-devel] [PATCH for-2.10 16/23] tests: numa: add case for QMP command query-cpus, Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 17/23] numa: remove no longer used numa_get_node_for_cpu(), Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 18/23] numa: remove no longer need numa_post_machine_init(), Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 20/23] numa: use possible_cpus for not mapped CPUs check, Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 19/23] machine: call machine init from wrapper, Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 21/23] numa: remove node_cpu bitmaps as they are no longer used, Igor Mammedov, 2017/03/22
- Re: [Qemu-devel] [PATCH for-2.10 21/23] numa: remove node_cpu bitmaps as they are no longer used,
David Gibson <=
- [Qemu-devel] [PATCH for-2.10 23/23] tests: check -numa node, cpu=props_list usecase, Igor Mammedov, 2017/03/22
- [Qemu-devel] [PATCH for-2.10 22/23] numa: add '-numa cpu, ...' option for property based node mapping, Igor Mammedov, 2017/03/22