[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 07/24] pc: add node-id property to CPU
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH v2 07/24] pc: add node-id property to CPU |
Date: |
Tue, 9 May 2017 15:14:21 +0200 |
On Fri, 5 May 2017 17:29:23 -0300
Eduardo Habkost <address@hidden> wrote:
> On Wed, May 03, 2017 at 02:57:01PM +0200, Igor Mammedov wrote:
> > it will allow switching from cpu_index to property based
> > numa mapping in follow up patches.
> >
> > Signed-off-by: Igor Mammedov <address@hidden>
> > ---
> > hw/i386/pc.c | 17 +++++++++++++++++
> > target/i386/cpu.c | 1 +
> > 2 files changed, 18 insertions(+)
> >
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> > index 9cec0c1..4a4fb1c 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -1893,6 +1893,7 @@ static void pc_cpu_pre_plug(HotplugHandler
> > *hotplug_dev,
> > DeviceState *dev, Error **errp)
> > {
> > int idx;
> > + int node_id;
> > CPUState *cs;
> > CPUArchId *cpu_slot;
> > X86CPUTopoInfo topo;
> > @@ -1982,6 +1983,22 @@ static void pc_cpu_pre_plug(HotplugHandler
> > *hotplug_dev,
> >
> > cs = CPU(cpu);
> > cs->cpu_index = idx;
> > +
> > + node_id = numa_get_node_for_cpu(cs->cpu_index);
> > + if (node_id == nb_numa_nodes) {
> > + /* 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 */
> > + node_id = 0;
> > + }
> > + if (cs->numa_node == CPU_UNSET_NUMA_NODE_ID) {
> > + cs->numa_node = node_id;
>
> I suggest moving the above lines to cpu_common_realizefn(), and
> deleting the code in numa_post_machine_init().
>
> If you want to do this in v3 of this series, or as a follow-up
> patch, it's up to you.
maybe not to realize time, but yep I'm thinking about moving
this whole hunk into a helper function that could be reused
by pc/arm/spapr without duplicating.
I'd do it as follow-up.
> > + } else if (cs->numa_node != node_id) {
> > + error_setg(errp, "node-id %d must match numa node specified"
> > + "with -numa option for cpu-index %d",
> > + cs->numa_node, cs->cpu_index);
> > + return;
> > + }
> > }
> >
> > static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 13c0985..007a5bd 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -3982,6 +3982,7 @@ static Property x86_cpu_properties[] = {
> > DEFINE_PROP_INT32("core-id", X86CPU, core_id, -1),
> > DEFINE_PROP_INT32("socket-id", X86CPU, socket_id, -1),
> > #endif
> > + DEFINE_PROP_INT32("node-id", CPUState, numa_node,
> > CPU_UNSET_NUMA_NODE_ID),
>
> This changes the default from 0 to CPU_UNSET_NUMA_NODE_ID, but it
> looks like there's no existing i386 or PC code that ever looks at
> CPUState::numa_node. Maybe worth mentioning in the commit
> message.
In preceding hunk there is code which still effectively keeps it 0 by default
with comment explaining that it's so for legacy reasons.
I can copy comment in commit message as well if that's what you've meant.
for PC it would affect only HMP 'info numa' output,
but pc_cpu_pre_plug() in this patch takes care of it
to ensure that old behavior is preserved.
>
> > DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false),
> > { .name = "hv-spinlocks", .info = &qdev_prop_spinlocks },
> > DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false),
> > --
> > 2.7.4
> >
>
- Re: [Qemu-devel] [PATCH v2 05/24] numa: move source of default CPUs to NUMA node mapping into boards, (continued)
[Qemu-devel] [PATCH v2 07/24] pc: add node-id property to CPU, Igor Mammedov, 2017/05/03
[Qemu-devel] [PATCH v2 09/24] numa: add check that board supports cpu_index to node mapping, Igor Mammedov, 2017/05/03
Re: [Qemu-devel] [PATCH v2 09/24] numa: add check that board supports cpu_index to node mapping, Andrew Jones, 2017/05/04
Re: [Qemu-devel] [PATCH v2 09/24] numa: add check that board supports cpu_index to node mapping, David Gibson, 2017/05/04
[Qemu-devel] [PATCH v2 10/24] numa: mirror cpu to node mapping in MachineState::possible_cpus, Igor Mammedov, 2017/05/03