From patchwork Fri May 29 13:33:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Privoznik X-Patchwork-Id: 11578685 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67F2C14C0 for ; Fri, 29 May 2020 13:36:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3D70A206F1 for ; Fri, 29 May 2020 13:36:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hOzTePJu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D70A206F1 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jefBC-0007eN-Ek for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 May 2020 09:36:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jef96-0003cn-2h for qemu-devel@nongnu.org; Fri, 29 May 2020 09:34:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44922 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jef94-0000Sj-Iv for qemu-devel@nongnu.org; Fri, 29 May 2020 09:33:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590759236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O8P//djl76OEZ/i7yMkFcQgXn2zA5wT8aQEpprExjxE=; b=hOzTePJu4iguzSq8r/+hg0IpFeO7oywT46AjvQWkBkdJgKku1/cy/09gFeXyvQsnY+6Kjz Wwu3vODpYYV5nHsSsGatPi8mzTgpTo63tNpg4YEaAyPVFZEuBXOZ2XnQPzceqh5cXlpFcS gaiQYLpMgi2z29uDRQ+V8QJCW8x77QA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-rtiOUZNOMgK55k-8NOdT9w-1; Fri, 29 May 2020 09:33:54 -0400 X-MC-Unique: rtiOUZNOMgK55k-8NOdT9w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B1876835B4A; Fri, 29 May 2020 13:33:53 +0000 (UTC) Received: from lisa.redhat.com (unknown [10.40.192.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F4015D9D5; Fri, 29 May 2020 13:33:52 +0000 (UTC) From: Michal Privoznik To: qemu-devel@nongnu.org Subject: [PATCH 1/3] qapi: Make @associativity, @policy and @line of NumaHmatCacheOptions optional Date: Fri, 29 May 2020 15:33:46 +0200 Message-Id: <196dfb8cf7e71ea13c70da12a7c2dfcd1672c958.1590753455.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=mprivozn@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 23:43:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jingqi.liu@intel.com, tao3.xu@intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The documentation to `-numa hmat-cache` says that @node-id, @size and @level are the only required attributes. The rest (@associativity, @policy and @line) is optional. Well, not quite - if I try to start QEMU with only the three required attributes defined the QAPI code is complaining about associativity missing. Signed-off-by: Michal Privoznik --- qapi/machine.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index ff7b5032e3..952784f8ba 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -723,9 +723,9 @@ 'node-id': 'uint32', 'size': 'size', 'level': 'uint8', - 'associativity': 'HmatCacheAssociativity', - 'policy': 'HmatCacheWritePolicy', - 'line': 'uint16' }} + '*associativity': 'HmatCacheAssociativity', + '*policy': 'HmatCacheWritePolicy', + '*line': 'uint16' }} ## # @HostMemPolicy: From patchwork Fri May 29 13:33:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Privoznik X-Patchwork-Id: 11578681 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F6E2159A for ; Fri, 29 May 2020 13:34:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5433D2100A for ; Fri, 29 May 2020 13:34:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Wn6GLjEP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5433D2100A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jef9p-0005T5-Gx for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 May 2020 09:34:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jef95-0003d4-RG for qemu-devel@nongnu.org; Fri, 29 May 2020 09:33:59 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54577 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jef94-0000UA-Nf for qemu-devel@nongnu.org; Fri, 29 May 2020 09:33:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590759238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8m8XGXzSlg/aHizKpT5tky9a9FO2x/l397fqNhWct5A=; b=Wn6GLjEPvbUVJ+WY/Du4ENPlZiI/0bLBezHH68EmLCzyFNg7Wr4dYyDjkQN1jkFOGJm3EA YUZ/n/aS48cgFcXiVwQpBLCn9wM4Iq4IEjMBmnv5ms0o+Ajx6bCC7/XCqeE9RgiYuNLfjV iKSiG4fdb0vESNk3lEd9WqGeb+Ms/3Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-466-HER5EnZENiqT1UzRqsuS9w-1; Fri, 29 May 2020 09:33:56 -0400 X-MC-Unique: HER5EnZENiqT1UzRqsuS9w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F2191005510; Fri, 29 May 2020 13:33:55 +0000 (UTC) Received: from lisa.redhat.com (unknown [10.40.192.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CD585D9D5; Fri, 29 May 2020 13:33:53 +0000 (UTC) From: Michal Privoznik To: qemu-devel@nongnu.org Subject: [PATCH 2/3] numa: Allow HMAT cache to be defined before HMAT latency/bandwidth Date: Fri, 29 May 2020 15:33:47 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=mprivozn@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 23:43:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jingqi.liu@intel.com, tao3.xu@intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Currently, when defining a HMAT cache for a NUMA node (in parse_numa_hmat_cache()) there is this check that forces users to define HMAT latency/bandwidth first. There is no real need for this, because nothing in the parse function relies on that and the HMAT table is constructed way later - when ACPI table is constructed. Signed-off-by: Michal Privoznik --- hw/core/numa.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index 316bc50d75..338453461c 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -384,7 +384,6 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmatCacheOptions *node, Error **errp) { int nb_numa_nodes = ms->numa_state->num_nodes; - NodeInfo *numa_info = ms->numa_state->nodes; NumaHmatCacheOptions *hmat_cache = NULL; if (node->node_id >= nb_numa_nodes) { @@ -393,13 +392,6 @@ void parse_numa_hmat_cache(MachineState *ms, NumaHmatCacheOptions *node, return; } - if (numa_info[node->node_id].lb_info_provided != (BIT(0) | BIT(1))) { - error_setg(errp, "The latency and bandwidth information of " - "node-id=%" PRIu32 " should be provided before memory side " - "cache attributes", node->node_id); - return; - } - if (node->level < 1 || node->level >= HMAT_LB_LEVELS) { error_setg(errp, "Invalid level=%" PRIu8 ", it should be larger than 0 " "and less than or equal to %d", node->level, From patchwork Fri May 29 13:33:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Privoznik X-Patchwork-Id: 11578683 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFB6C1392 for ; Fri, 29 May 2020 13:34:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C69F32145D for ; Fri, 29 May 2020 13:34:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TbNsTa9v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C69F32145D 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jef9r-0005Wv-R7 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 May 2020 09:34:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jef99-0003jM-9v for qemu-devel@nongnu.org; Fri, 29 May 2020 09:34:03 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:41115 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jef98-0000Vp-DU for qemu-devel@nongnu.org; Fri, 29 May 2020 09:34:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590759241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+qKCJYY1eLXH3iNqNa3XOp3oHRdpyFizDgWDOHjCZRE=; b=TbNsTa9vzJDTJQIUchx/AW5dk+B4q2CpJNIwsKtSvFfQpW33OHdK8iJ2lE0gkrfue5+HBy DOwHgLPi4+G1l+QGkEhFJv4Lb5B4w772HI2kYDXgTbVjOEYPwNkb2yLwXG5W6aVMplUrK0 tqwy8OH8oqm4JB50LIViqhAEsnUmpp8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-_mtn-UkYMLqINoFEuoZqWQ-1; Fri, 29 May 2020 09:34:00 -0400 X-MC-Unique: _mtn-UkYMLqINoFEuoZqWQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DE7D580183C; Fri, 29 May 2020 13:33:58 +0000 (UTC) Received: from lisa.redhat.com (unknown [10.40.192.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E2265D9D5; Fri, 29 May 2020 13:33:55 +0000 (UTC) From: Michal Privoznik To: qemu-devel@nongnu.org Subject: [PATCH 3/3] numa: Initialize node initiator with respect to .has_cpu Date: Fri, 29 May 2020 15:33:48 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=mprivozn@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/29 03:05:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jingqi.liu@intel.com, tao3.xu@intel.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The initiator attribute of a NUMA node is documented as the 'NUMA node that has best performance to given NUMA node'. If a NUMA node has at least one CPU there can hardly be a different node with better performace and thus all NUMA nodes which have a CPU are initiators to themselves. Reflect this fact when initializing the attribute. Signed-off-by: Michal Privoznik --- hw/core/numa.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index 338453461c..1c9bc761cc 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -136,11 +136,15 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, numa_info[nodenr].node_memdev = MEMORY_BACKEND(o); } - /* - * If not set the initiator, set it to MAX_NODES. And if - * HMAT is enabled and this node has no cpus, QEMU will raise error. - */ - numa_info[nodenr].initiator = MAX_NODES; + /* Initialize initiator to either the current NUMA node (if + * it has at least one CPU), or to MAX_NODES. If HMAT is + * enabled an error will be raised later in + * numa_validate_initiator(). */ + if (numa_info[nodenr].has_cpu) + numa_info[nodenr].initiator = nodenr; + else + numa_info[nodenr].initiator = MAX_NODES; + if (node->has_initiator) { if (!ms->numa_state->hmat_enabled) { error_setg(errp, "ACPI Heterogeneous Memory Attribute Table "