From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:c793:0:0:0:0:0 with SMTP id l19csp6372873wrg; Mon, 27 May 2019 05:51:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoay6j3zb7SdlnBxp6b9sKhHQgDnz8PP5Ktu8JOInDtsg0pCx/oCFh5EZtBCmq7bEcQyJ9 X-Received: by 2002:ab0:28f:: with SMTP id 15mr23066835uah.21.1558961478537; Mon, 27 May 2019 05:51:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558961478; cv=none; d=google.com; s=arc-20160816; b=vYyLhtjvS5qO+qyF7T+UBMnNCUNyIb/ndD1tV/2ey+vuqiXxFXFe2XcwNGyEoAw02v e/dQ2S2Ja9PCFl5BaeEjpOk0eb8bjkasyWowWyXjPqdmwYZGA/WDBUQVj04dner6nCRI xzyUmh/KO37Jw3jK5Kfjd/KroGMPiZbDPBW0YH8Qdi2a7akg3iVrVaoY1alO6V1RMzDy NkekPiACh5PDCj+mK98u3qk9r3wF3dNbxnN4KZz5g6ZmQjHXqTdOgIVrWKN02pn69AKO Rxhb+nyK7a0STmSuz34WbDLNWRXzvcDHpZjszAJtcsaWXvbL6n31A8JLjMGRJmbd/ghq ZWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:to:from:date; bh=/+06sC68PNjEKS3ddg9YpzmK49tfHRNQiOpTFurYLzE=; b=h8qFXgmyZ5Q3o6A3gH1/MDaD5uEcasndmpVt4jCIzcBwWZWII2HPxYZ8WhbcaDHEGg IZTbqHTvim340aslW1CtPe/RsPBXc735Whq1K7wBxSCTj/WO4JkiT+DJcGUJGP9Q/ujK 2UJqz2EnOuobHpfczA4O4HpGWcm/wLi6KvyGzWtW2nsJkVzS6vSdqKtWQ77kh8OG4xar 7P1XYLz1v8ebxWuy7CxXW3yFpUrwZOw1bFxSdKuxrM8E+TOfuJSQxVe+l2QYU6cemWP+ OcPN3eSIM/6Ak3an5JmE94DR46kjMwxaaqM/N+a6s6/j5nuexDXbgCtosvp8YrR5Nx2A dHNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h197si6013751vkh.36.2019.05.27.05.51.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 27 May 2019 05:51:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:45477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVF5x-0002h5-Vy for alex.bennee@linaro.org; Mon, 27 May 2019 08:51:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVF5i-0002gz-Ck for qemu-arm@nongnu.org; Mon, 27 May 2019 08:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVF5g-0001zA-IM for qemu-arm@nongnu.org; Mon, 27 May 2019 08:51:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVF5g-0001yW-Ba; Mon, 27 May 2019 08:51:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF2137FDFB; Mon, 27 May 2019 12:50:58 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1C5E10027CA; Mon, 27 May 2019 12:50:56 +0000 (UTC) Date: Mon, 27 May 2019 14:50:52 +0200 From: Igor Mammedov To: Laurent Vivier Message-ID: <20190527145052.258825fb@redhat.com> In-Reply-To: References: <20190524103521.13847-1-lvivier@redhat.com> <20190524161045.314fa2de@redhat.com> <20190524201432.GP10764@habkost.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 27 May 2019 12:50:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-arm] [Qemu-devel] [PATCH v3] numa: improve cpu hotplug error message with a wrong node-id X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Ztm5FtHhICSZ On Mon, 27 May 2019 08:55:49 +0200 Laurent Vivier wrote: > On 24/05/2019 22:14, Eduardo Habkost wrote: > > On Fri, May 24, 2019 at 04:39:12PM +0200, Laurent Vivier wrote: > >> On 24/05/2019 16:10, Igor Mammedov wrote: > >>> On Fri, 24 May 2019 12:35:21 +0200 > >>> Laurent Vivier wrote: > >>> > >>>> On pseries, core-ids are strongly binded to a node-id by the command > >>>> line option. If an user tries to add a CPU to the wrong node, he has > >>>> an error but it is not really helpful: > >>>> > >>>> qemu-system-ppc64 ... -smp 1,maxcpus=64,cores=1,threads=1,sockets=1 \ > >>>> -numa node,nodeid=0 -numa node,nodeid=1 ... > >>>> > >>>> (qemu) device_add power9_v2.0-spapr-cpu-core,core-id=30,node-id=1 > >>>> Error: node-id=1 must match numa node specified with -numa option > >>>> > >>>> This patch improves this error message by giving to the user the good > >>>> topology information (node-id, socket-id and thread-id if they are > >>>> available) to use with the core-id he's providing: > >>>> > >>>> Error: node-id=1 must match numa node specified with -numa option 'node-id 0' > >>>> > >>>> Signed-off-by: Laurent Vivier > >>>> --- > >>>> > >>>> Notes: > >>>> v3: only add the topology to the existing message > >>>> As suggested by Igor replace > >>>> Error: core-id 30 can only be plugged into node-id 0 > >>>> by > >>>> Error: node-id=1 must match numa node specified with -numa option 'node-id 0' > >>>> v2: display full topology in the error message > >>>>>>> numa.c | 25 ++++++++++++++++++++++++- > >>>> 1 file changed, 24 insertions(+), 1 deletion(-) > >>>> > >>>> diff --git a/numa.c b/numa.c > >>>> index 3875e1efda3a..7882ec294be4 100644 > >>>> --- a/numa.c > >>>> +++ b/numa.c > >>>> @@ -458,6 +458,27 @@ void qmp_set_numa_node(NumaOptions *cmd, Error **errp) > >>>> set_numa_options(MACHINE(qdev_get_machine()), cmd, errp); > >>>> } > >>>> +static char *cpu_topology_to_string(const CPUArchId *cpu) > >>>> +{ > >>>> + GString *s = g_string_new(NULL); > >>>> + if (cpu->props.has_socket_id) { > >>>> + g_string_append_printf(s, "socket-id %"PRId64, cpu->props.socket_id); > >>>> + } > >>>> + if (cpu->props.has_node_id) { > >>>> + if (s->len) { > >>>> + g_string_append_printf(s, ", "); > >>>> + } > >>>> + g_string_append_printf(s, "node-id %"PRId64, cpu->props.node_id); > >>>> + } > >>>> + if (cpu->props.has_thread_id) { > >>>> + if (s->len) { > >>>> + g_string_append_printf(s, ", "); > >>>> + } > >>>> + g_string_append_printf(s, "thread-id %"PRId64, cpu->props.thread_id); > >>>> + } > >>>> + return g_string_free(s, false); > >>>> +} > >>> > >>> turns out we already have such helper: cpu_slot_to_string() > >> > >> It doesn't display the node-id but the core-id. And node-id is what we need > >> to know. > > > > I'm confused about what you are trying to do here. > > > > On v1, the message looked like: > > Error: core-id 30 can only be plugged into node-id 0 > > > > which is probably good for spapr. > > > > > > Then I suggested you added the other cpu->props fields. e.g. on > > PC the message would look like: > > Error: socket-id 20, core-id 30, thread-id 40 can only be plugged into node-id 0 > > > > > > But you sent a v2 patch that would print this on PC: > > Error: core-id 30 can only be plugged into socket-id 20, node-id 0, thread-id 40 > > > > which doesn't make sense to me. > > > > > > Then in a reply to v2, Igor suggested: > > > > error_setg(errp, "node-id=%d must match numa node specified " > > "with -numa option '%s'", node_id, topology); > > > > > > Igor suggest would address the problem above. I expected it to become: > > node-id=0 must match numa node specified with -numa option core-id=30 > > and on PC: > > node-id=0 must match numa node specified with -numa option socket-id=20,core-id=30,thread-id=40 > > > > Or maybe it could include the input node-id too: > > node-id=0 must match numa node specified with -numa option node-id=1,core-id=30 > > and on PC: > > node-id=0 must match numa node specified with -numa option node-id=1,socket-id=20,core-id=30,thread-id=40 > > > > Both options would work. > > > > > > But you implemented code that would print: > > Error: node-id=0 must match numa node specified with -numa option 'node-id 1' > > and on PC it would print: > > Error: node-id=0 must match numa node specified with -numa option 'socket-id 20 node-id 1 thread-id=40' > > > > which doesn't make sense to me. > > > > > > I was expecting something like: > > Error: CPU slot core-id=30 is bound to node-id 0, but node-id 1 was specified > > and on PC: > > Error: CPU slot socket-id=20,core-id=30,thread-id=40 is bound to node-id 0, but node-id 1 was specified > > > > > > The idea is to provide the information to the user to help him to know > where the cpu can be plugged when it cannot on the node-id he originally > provided. > > So all the solutions you propose sounds good to me. > > I only need you and Igor agree on the same one. We with Eduardo basically agree on contents/set of properties to print, it is only different phrasing (Eduardo's suggestion is better than what we have now). But lets get to what problem you are going to fix/improve. SO I've went ahead and tried with following CLI: qemu-system-x86_64 -smp 1,maxcpus=4 -numa node,cpus=0-1 -numa node,cpus=2-3 -monitor stdio -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1 end it errored out with: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1: node-id=1 must match numa node specified with -numa option As you see we already have all user provide properties for cpu (including invalid ones) reported, what we are missing is suggestion for valid node-id. How about following error message: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1: invalid node-id, must be 0 > > Thanks, > Laurent From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1C86C04AB3 for ; Mon, 27 May 2019 12:52:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79A992075C for ; Mon, 27 May 2019 12:52:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79A992075C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:45497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVF7S-0003ko-G5 for qemu-devel@archiver.kernel.org; Mon, 27 May 2019 08:52:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVF5l-0002hc-JS for qemu-devel@nongnu.org; Mon, 27 May 2019 08:51:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVF5k-00021C-Ap for qemu-devel@nongnu.org; Mon, 27 May 2019 08:51:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVF5g-0001yW-Ba; Mon, 27 May 2019 08:51:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF2137FDFB; Mon, 27 May 2019 12:50:58 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id E1C5E10027CA; Mon, 27 May 2019 12:50:56 +0000 (UTC) Date: Mon, 27 May 2019 14:50:52 +0200 From: Igor Mammedov To: Laurent Vivier Message-ID: <20190527145052.258825fb@redhat.com> In-Reply-To: References: <20190524103521.13847-1-lvivier@redhat.com> <20190524161045.314fa2de@redhat.com> <20190524201432.GP10764@habkost.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 27 May 2019 12:50:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v3] numa: improve cpu hotplug error message with a wrong node-id X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 27 May 2019 08:55:49 +0200 Laurent Vivier wrote: > On 24/05/2019 22:14, Eduardo Habkost wrote: > > On Fri, May 24, 2019 at 04:39:12PM +0200, Laurent Vivier wrote: > >> On 24/05/2019 16:10, Igor Mammedov wrote: > >>> On Fri, 24 May 2019 12:35:21 +0200 > >>> Laurent Vivier wrote: > >>> > >>>> On pseries, core-ids are strongly binded to a node-id by the command > >>>> line option. If an user tries to add a CPU to the wrong node, he has > >>>> an error but it is not really helpful: > >>>> > >>>> qemu-system-ppc64 ... -smp 1,maxcpus=64,cores=1,threads=1,sockets=1 \ > >>>> -numa node,nodeid=0 -numa node,nodeid=1 ... > >>>> > >>>> (qemu) device_add power9_v2.0-spapr-cpu-core,core-id=30,node-id=1 > >>>> Error: node-id=1 must match numa node specified with -numa option > >>>> > >>>> This patch improves this error message by giving to the user the good > >>>> topology information (node-id, socket-id and thread-id if they are > >>>> available) to use with the core-id he's providing: > >>>> > >>>> Error: node-id=1 must match numa node specified with -numa option 'node-id 0' > >>>> > >>>> Signed-off-by: Laurent Vivier > >>>> --- > >>>> > >>>> Notes: > >>>> v3: only add the topology to the existing message > >>>> As suggested by Igor replace > >>>> Error: core-id 30 can only be plugged into node-id 0 > >>>> by > >>>> Error: node-id=1 must match numa node specified with -numa option 'node-id 0' > >>>> v2: display full topology in the error message > >>>>>>> numa.c | 25 ++++++++++++++++++++++++- > >>>> 1 file changed, 24 insertions(+), 1 deletion(-) > >>>> > >>>> diff --git a/numa.c b/numa.c > >>>> index 3875e1efda3a..7882ec294be4 100644 > >>>> --- a/numa.c > >>>> +++ b/numa.c > >>>> @@ -458,6 +458,27 @@ void qmp_set_numa_node(NumaOptions *cmd, Error **errp) > >>>> set_numa_options(MACHINE(qdev_get_machine()), cmd, errp); > >>>> } > >>>> +static char *cpu_topology_to_string(const CPUArchId *cpu) > >>>> +{ > >>>> + GString *s = g_string_new(NULL); > >>>> + if (cpu->props.has_socket_id) { > >>>> + g_string_append_printf(s, "socket-id %"PRId64, cpu->props.socket_id); > >>>> + } > >>>> + if (cpu->props.has_node_id) { > >>>> + if (s->len) { > >>>> + g_string_append_printf(s, ", "); > >>>> + } > >>>> + g_string_append_printf(s, "node-id %"PRId64, cpu->props.node_id); > >>>> + } > >>>> + if (cpu->props.has_thread_id) { > >>>> + if (s->len) { > >>>> + g_string_append_printf(s, ", "); > >>>> + } > >>>> + g_string_append_printf(s, "thread-id %"PRId64, cpu->props.thread_id); > >>>> + } > >>>> + return g_string_free(s, false); > >>>> +} > >>> > >>> turns out we already have such helper: cpu_slot_to_string() > >> > >> It doesn't display the node-id but the core-id. And node-id is what we need > >> to know. > > > > I'm confused about what you are trying to do here. > > > > On v1, the message looked like: > > Error: core-id 30 can only be plugged into node-id 0 > > > > which is probably good for spapr. > > > > > > Then I suggested you added the other cpu->props fields. e.g. on > > PC the message would look like: > > Error: socket-id 20, core-id 30, thread-id 40 can only be plugged into node-id 0 > > > > > > But you sent a v2 patch that would print this on PC: > > Error: core-id 30 can only be plugged into socket-id 20, node-id 0, thread-id 40 > > > > which doesn't make sense to me. > > > > > > Then in a reply to v2, Igor suggested: > > > > error_setg(errp, "node-id=%d must match numa node specified " > > "with -numa option '%s'", node_id, topology); > > > > > > Igor suggest would address the problem above. I expected it to become: > > node-id=0 must match numa node specified with -numa option core-id=30 > > and on PC: > > node-id=0 must match numa node specified with -numa option socket-id=20,core-id=30,thread-id=40 > > > > Or maybe it could include the input node-id too: > > node-id=0 must match numa node specified with -numa option node-id=1,core-id=30 > > and on PC: > > node-id=0 must match numa node specified with -numa option node-id=1,socket-id=20,core-id=30,thread-id=40 > > > > Both options would work. > > > > > > But you implemented code that would print: > > Error: node-id=0 must match numa node specified with -numa option 'node-id 1' > > and on PC it would print: > > Error: node-id=0 must match numa node specified with -numa option 'socket-id 20 node-id 1 thread-id=40' > > > > which doesn't make sense to me. > > > > > > I was expecting something like: > > Error: CPU slot core-id=30 is bound to node-id 0, but node-id 1 was specified > > and on PC: > > Error: CPU slot socket-id=20,core-id=30,thread-id=40 is bound to node-id 0, but node-id 1 was specified > > > > > > The idea is to provide the information to the user to help him to know > where the cpu can be plugged when it cannot on the node-id he originally > provided. > > So all the solutions you propose sounds good to me. > > I only need you and Igor agree on the same one. We with Eduardo basically agree on contents/set of properties to print, it is only different phrasing (Eduardo's suggestion is better than what we have now). But lets get to what problem you are going to fix/improve. SO I've went ahead and tried with following CLI: qemu-system-x86_64 -smp 1,maxcpus=4 -numa node,cpus=0-1 -numa node,cpus=2-3 -monitor stdio -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1 end it errored out with: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1: node-id=1 must match numa node specified with -numa option As you see we already have all user provide properties for cpu (including invalid ones) reported, what we are missing is suggestion for valid node-id. How about following error message: qemu-system-x86_64: -device qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0,node-id=1: invalid node-id, must be 0 > > Thanks, > Laurent