From: Pierre Morel <pmorel@linux.ibm.com>
To: qemu-s390x@nongnu.org
Cc: thuth@redhat.com, ehabkost@redhat.com, david@redhat.com,
cohuck@redhat.com, richard.henderson@linaro.org,
qemu-devel@nongnu.org, armbru@redhat.com, pasic@linux.ibm.com,
borntraeger@de.ibm.com, pbonzini@redhat.com, eblake@redhat.com
Subject: [PATCH v1 8/9] s390x: numa: define drawers and books for NUMA
Date: Wed, 14 Jul 2021 18:53:15 +0200 [thread overview]
Message-ID: <1626281596-31061-9-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1626281596-31061-1-git-send-email-pmorel@linux.ibm.com>
S390 uses 5 levels of CPU topology, we implement the four lower levels:
drawers, books, sockets and cores.
Until now drawers and books were not defined, this patch add the
definition for drawers and books to the machine.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
---
hw/core/machine.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 6f59fb0b7f..a193ffcd3b 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -692,6 +692,16 @@ void machine_set_cpu_numa_node(MachineState *machine,
return;
}
+ if (props->has_drawer_id && !slot->props.has_drawer_id) {
+ error_setg(errp, "drawer-id is not supported");
+ return;
+ }
+
+ if (props->has_book_id && !slot->props.has_book_id) {
+ error_setg(errp, "book-id is not supported");
+ return;
+ }
+
/* skip slots with explicit mismatch */
if (props->has_thread_id && props->thread_id != slot->props.thread_id) {
continue;
@@ -705,6 +715,14 @@ void machine_set_cpu_numa_node(MachineState *machine,
continue;
}
+ if (props->has_drawer_id && props->drawer_id != slot->props.drawer_id) {
+ continue;
+ }
+
+ if (props->has_book_id && props->book_id != slot->props.book_id) {
+ continue;
+ }
+
if (props->has_socket_id && props->socket_id != slot->props.socket_id) {
continue;
}
--
2.25.1
next prev parent reply other threads:[~2021-07-14 17:04 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-14 16:53 [PATCH v1 0/9] s390x: CPU Topology Pierre Morel
2021-07-14 16:53 ` [PATCH v1 1/9] s390x: smp: s390x dedicated smp parsing Pierre Morel
2021-07-16 8:54 ` Cornelia Huck
2021-07-16 9:14 ` Daniel P. Berrangé
2021-07-16 10:59 ` Pierre Morel
[not found] ` <e4865ad6-f8ec-e7ba-66ef-9c95334ba9b3@linux.ibm.com>
2021-07-19 15:43 ` Cornelia Huck
2021-07-19 15:52 ` Daniel P. Berrangé
2021-07-20 7:37 ` Pierre Morel
2021-07-20 8:33 ` Pierre Morel
2021-07-16 10:47 ` Pierre Morel
2021-07-14 16:53 ` [PATCH v1 2/9] s390x: toplogy: adding drawers and books to " Pierre Morel
2021-07-15 6:16 ` Markus Armbruster
2021-07-15 8:19 ` Pierre Morel
2021-07-15 10:48 ` Markus Armbruster
2021-07-16 9:10 ` Cornelia Huck
2021-07-16 9:18 ` Daniel P. Berrangé
2021-07-16 10:44 ` Cornelia Huck
2021-07-16 10:49 ` Daniel P. Berrangé
2021-07-19 15:50 ` Cornelia Huck
2021-07-20 7:52 ` Pierre Morel
2021-07-20 8:20 ` Cornelia Huck
2021-07-20 8:46 ` Pierre Morel
2021-07-20 9:00 ` Cornelia Huck
2021-07-20 9:19 ` Daniel P. Berrangé
2021-07-20 12:29 ` Pierre Morel
2021-07-16 9:23 ` Daniel P. Berrangé
2021-07-16 11:08 ` Pierre Morel
2021-07-14 16:53 ` [PATCH v1 3/9] s390x: cpu topology: CPU topology objects and structures Pierre Morel
2021-07-14 16:53 ` [PATCH v1 4/9] s390x: Topology list entries and SYSIB 15.x.x Pierre Morel
2021-07-14 16:53 ` [PATCH v1 5/9] s390x: topology: implementating Store Topology System Information Pierre Morel
2021-07-14 16:53 ` [PATCH v1 6/9] s390x: kvm: topology: interception of PTF instruction Pierre Morel
2021-07-16 9:22 ` Cornelia Huck
2021-07-16 11:23 ` Pierre Morel
2021-07-16 11:56 ` Cornelia Huck
2021-07-14 16:53 ` [PATCH v1 7/9] s390x: SCLP: reporting the maximum nested topology entries Pierre Morel
2021-07-16 9:24 ` Cornelia Huck
2021-07-16 11:12 ` Pierre Morel
2021-07-14 16:53 ` Pierre Morel [this message]
2021-07-14 16:53 ` [PATCH v1 9/9] s390x: numa: implement NUMA for S390x Pierre Morel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1626281596-31061-9-git-send-email-pmorel@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=armbru@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).