Re: [Qemu-devel] [PATCH v2 2/5] i386/cpu: Consolidate die-id validity in smp context

[Like Xu]

On 2019/5/22 1:12, Dr. David Alan Gilbert wrote:
* Like Xu (like...@linux.intel.com) wrote:
Following the legacy smp check rules, the die_id validity is added to
the same contexts as leagcy smp variables such as hmp_hotpluggable_cpus(),
machine_set_cpu_numa_node(), cpu_slot_to_string() and pc_cpu_pre_plug().
Signed-off-by: Like Xu <like...@linux.intel.com>
---
  hmp.c             |  3 +++
  hw/core/machine.c | 12 ++++++++++++
  hw/i386/pc.c      | 11 +++++++++++
  3 files changed, 26 insertions(+)

diff --git a/hmp.c b/hmp.c
index 56a3ed7375..7deb7b7226 100644
--- a/hmp.c
+++ b/hmp.c
@@ -3112,6 +3112,9 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict 
*qdict)
          if (c->has_socket_id) {
              monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", 
c->socket_id);
          }
+        if (c->has_die_id) {
+            monitor_printf(mon, "    die-id: \"%" PRIu64 "\"\n", c->die_id);
+        }
          if (c->has_core_id) {
              monitor_printf(mon, "    core-id: \"%" PRIu64 "\"\n", c->core_id);
          }
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 5d046a43e3..5116429732 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -659,6 +659,11 @@ void machine_set_cpu_numa_node(MachineState *machine,
              return;
          }
  
+        if (props->has_die_id && !slot->props.has_die_id) {
+            error_setg(errp, "die-id is not supported");
+            return;
+        }
+
          /* skip slots with explicit mismatch */
          if (props->has_thread_id && props->thread_id != 
slot->props.thread_id) {
                  continue;
@@ -668,6 +673,10 @@ void machine_set_cpu_numa_node(MachineState *machine,
                  continue;
          }
  
+        if (props->has_die_id && props->die_id != slot->props.die_id) {
+                continue;
+        }
+
          if (props->has_socket_id && props->socket_id != 
slot->props.socket_id) {
                  continue;
          }
@@ -925,6 +934,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu)
      if (cpu->props.has_socket_id) {
          g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);
      }
+    if (cpu->props.has_die_id) {
+        g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);
+    }
      if (cpu->props.has_core_id) {
          if (s->len) {
              g_string_append_printf(s, ", ");
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 83ab53c814..00be2463af 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2321,6 +2321,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
              error_setg(errp, "Invalid CPU socket-id: %u must be in range 
0:%u",
                         cpu->socket_id, max_socket);
              return;
+        } else if (cpu->die_id > max_socket) {
+            error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u",
+                       cpu->die_id, max_socket);
+            return;

Can you explain why the die_id is related to max_socket?
I'd assumed you could have a 2 socket system where each socket has 4
dies.

Dr David,thanks for your comments and sorry for the slow reply.

You're right about this and the check rule for cpu->die_id in 
pc_cpu_pre_plug() should be:

        "else if (cpu->die_id > (pcms->smp_dies - 1))"


However, for the HMP side of it:


Acked-by: Dr. David Alan Gilbert <dgilb...@redhat.com>

          }
          if (cpu->core_id < 0) {
              error_setg(errp, "CPU core-id is not set");
@@ -2378,6 +2382,13 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
      }
      cpu->socket_id = topo.pkg_id;
  
+    if (cpu->die_id != -1 && cpu->die_id != topo.die_id) {
+        error_setg(errp, "property die-id: %u doesn't match set apic-id:"
+            " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo.die_id);
+        return;
+    }
+    cpu->die_id = topo.die_id;
+
      if (cpu->core_id != -1 && cpu->core_id != topo.core_id) {
          error_setg(errp, "property core-id: %u doesn't match set apic-id:"
              " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id, topo.core_id);
--
2.21.0

--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK