Message ID | 1493816238-33120-15-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, May 03, 2017 at 02:57:08PM +0200, Igor Mammedov wrote: > it's safe to remove thread node_id != core node_id error > branch as machine_set_cpu_numa_node() also does mismatch > check and is called even before any CPU is created. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr.c | 4 ++-- > hw/ppc/spapr_cpu_core.c | 14 ++------------ > 2 files changed, 4 insertions(+), 14 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 7f58ee4..bcb91e7 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2863,8 +2863,8 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > goto out; > } > > - node_id = numa_get_node_for_cpu(cc->core_id); > - if (node_id == nb_numa_nodes) { > + node_id = core_slot->props.node_id; > + if (!core_slot->props.has_node_id) { > /* by default CPUState::numa_node was 0 if it's not set via CLI > * keep it this way for now but in future we probably should > * refuse to start up with incomplete numa mapping */ > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index 9de7a56..a17ea07 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -181,7 +181,6 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) > > sc->threads = g_malloc0(size * cc->nr_threads); > for (i = 0; i < cc->nr_threads; i++) { > - int node_id; > char id[32]; > CPUState *cs; > > @@ -191,17 +190,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) > cs = CPU(obj); > cs->cpu_index = cc->core_id + i; > > - /* Set NUMA node for the added CPUs */ > - node_id = numa_get_node_for_cpu(cs->cpu_index); > - if (node_id != sc->node_id) { > - error_setg(&local_err, "Invalid node-id=%d of thread[cpu-index: %d]" > - " on CPU[core-id: %d, node-id: %d], node-id must be the same", > - node_id, cs->cpu_index, cc->core_id, sc->node_id); > - goto err; > - } > - if (node_id < nb_numa_nodes) { > - cs->numa_node = node_id; > - } > + /* Set NUMA node for the threads belonged to core */ > + cs->numa_node = sc->node_id; > > snprintf(id, sizeof(id), "thread[%d]", i); > object_property_add_child(OBJECT(sc), id, obj, &local_err);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7f58ee4..bcb91e7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2863,8 +2863,8 @@ static void spapr_core_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, goto out; } - node_id = numa_get_node_for_cpu(cc->core_id); - if (node_id == nb_numa_nodes) { + node_id = core_slot->props.node_id; + if (!core_slot->props.has_node_id) { /* by default CPUState::numa_node was 0 if it's not set via CLI * keep it this way for now but in future we probably should * refuse to start up with incomplete numa mapping */ diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 9de7a56..a17ea07 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -181,7 +181,6 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) sc->threads = g_malloc0(size * cc->nr_threads); for (i = 0; i < cc->nr_threads; i++) { - int node_id; char id[32]; CPUState *cs; @@ -191,17 +190,8 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) cs = CPU(obj); cs->cpu_index = cc->core_id + i; - /* Set NUMA node for the added CPUs */ - node_id = numa_get_node_for_cpu(cs->cpu_index); - if (node_id != sc->node_id) { - error_setg(&local_err, "Invalid node-id=%d of thread[cpu-index: %d]" - " on CPU[core-id: %d, node-id: %d], node-id must be the same", - node_id, cs->cpu_index, cc->core_id, sc->node_id); - goto err; - } - if (node_id < nb_numa_nodes) { - cs->numa_node = node_id; - } + /* Set NUMA node for the threads belonged to core */ + cs->numa_node = sc->node_id; snprintf(id, sizeof(id), "thread[%d]", i); object_property_add_child(OBJECT(sc), id, obj, &local_err);
it's safe to remove thread node_id != core node_id error branch as machine_set_cpu_numa_node() also does mismatch check and is called even before any CPU is created. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/ppc/spapr.c | 4 ++-- hw/ppc/spapr_cpu_core.c | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-)