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=-6.8 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 1ABFAC32792 for ; Thu, 3 Oct 2019 13:45:20 +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 DF59E20873 for ; Thu, 3 Oct 2019 13:45:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF59E20873 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 ([::1]:36400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG1Py-0002u6-T5 for qemu-devel@archiver.kernel.org; Thu, 03 Oct 2019 09:45:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55224) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG1PA-0002UZ-Kl for qemu-devel@nongnu.org; Thu, 03 Oct 2019 09:44:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iG1P7-0004IS-A8 for qemu-devel@nongnu.org; Thu, 03 Oct 2019 09:44:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iG1P4-0004Fz-Kw for qemu-devel@nongnu.org; Thu, 03 Oct 2019 09:44:23 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3BEE18C4285; Thu, 3 Oct 2019 13:44:18 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43296194B2; Thu, 3 Oct 2019 13:44:13 +0000 (UTC) Date: Thu, 3 Oct 2019 15:44:11 +0200 From: Igor Mammedov To: Tao Xu Subject: Re: [PATCH v12 08/11] hmat acpi: Build Memory Proximity Domain Attributes Structure(s) Message-ID: <20191003154411.66296772@redhat.com> In-Reply-To: <20190920074349.2616-9-tao3.xu@intel.com> References: <20190920074349.2616-1-tao3.xu@intel.com> <20190920074349.2616-9-tao3.xu@intel.com> 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Thu, 03 Oct 2019 13:44:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: ehabkost@redhat.com, jingqi.liu@intel.com, fan.du@intel.com, qemu-devel@nongnu.org, Daniel Black , Jonathan Cameron , dan.j.williams@intel.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 20 Sep 2019 15:43:46 +0800 Tao Xu wrote: > From: Liu Jingqi > > HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > (HMAT). The specification references below link: > http://www.uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf > > It describes the memory attributes, such as memory side cache > attributes and bandwidth and latency details, related to the > Memory Proximity Domain. The software is > expected to use this information as hint for optimization. > > This structure describes Memory Proximity Domain Attributes by memory > subsystem and its associativity with processor proximity domain as well as > hint for memory usage. > > In the linux kernel, the codes in drivers/acpi/hmat/hmat.c parse and report > the platform's HMAT tables. > > Reviewed-by: Daniel Black > Reviewed-by: Jonathan Cameron > Signed-off-by: Liu Jingqi > Signed-off-by: Tao Xu > --- > > No changes in v12. > > Changes in v11: > - Move numa option patches forward. > --- > hw/acpi/Kconfig | 5 +++ > hw/acpi/Makefile.objs | 1 + > hw/acpi/hmat.c | 101 ++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/hmat.h | 45 +++++++++++++++++++ > hw/i386/acpi-build.c | 5 +++ > 5 files changed, 157 insertions(+) > create mode 100644 hw/acpi/hmat.c > create mode 100644 hw/acpi/hmat.h > > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index 7c59cf900b..039bb99efa 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -7,6 +7,7 @@ config ACPI_X86 > select ACPI_NVDIMM > select ACPI_CPU_HOTPLUG > select ACPI_MEMORY_HOTPLUG > + select ACPI_HMAT > > config ACPI_X86_ICH > bool > @@ -31,3 +32,7 @@ config ACPI_VMGENID > bool > default y > depends on PC > + > +config ACPI_HMAT > + bool > + depends on ACPI > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 9bb2101e3b..c05019b059 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -6,6 +6,7 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > +common-obj-$(CONFIG_ACPI_HMAT) += hmat.o > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > > common-obj-y += acpi_interface.o > diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c > new file mode 100644 > index 0000000000..1368fce7ee > --- /dev/null > +++ b/hw/acpi/hmat.c > @@ -0,0 +1,101 @@ > +/* > + * HMAT ACPI Implementation > + * > + * Copyright(C) 2019 Intel Corporation. > + * > + * Author: > + * Liu jingqi > + * Tao Xu > + * > + * HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > + * (HMAT) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > + */ > + > +#include "qemu/osdep.h" > +#include "sysemu/numa.h" > +#include "hw/acpi/hmat.h" > + > +/* > + * ACPI 6.3: > + * 5.2.27.3 Memory Proximity Domain Attributes Structure: Table 5-145 > + */ > +static void build_hmat_mpda(GArray *table_data, uint16_t flags, int initiator, > + int mem_node) > +{ > + > + /* Memory Proximity Domain Attributes Structure */ > + /* Type */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Length */ > + build_append_int_noprefix(table_data, 40, 4); > + /* Flags */ > + build_append_int_noprefix(table_data, flags, 2); > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Proximity Domain for the Attached Initiator */ > + build_append_int_noprefix(table_data, initiator, 4); ^^^ make this argument uint16_t > + /* Proximity Domain for the Memory */ > + build_append_int_noprefix(table_data, mem_node, 4); ^^^ ditto > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); > + /* > + * Reserved: > + * Previously defined as the Start Address of the System Physical > + * Address Range. Deprecated since ACPI Spec 6.3. > + */ > + build_append_int_noprefix(table_data, 0, 8); > + /* > + * Reserved: > + * Previously defined as the Range Length of the region in bytes. > + * Deprecated since ACPI Spec 6.3. > + */ > + build_append_int_noprefix(table_data, 0, 8); > +} > + > +/* Build HMAT sub table structures */ > +static void hmat_build_table_structs(GArray *table_data, NumaState *nstat) 'nstat' is rather obscure, suggest replace it with numa_state in this patch/series > +{ > + uint16_t flags; > + int i; > + > + for (i = 0; i < nstat->num_nodes; i++) { > + flags = 0; > + > + if (nstat->nodes[i].initiator_valid) { > + flags |= HMAT_PROX_INIT_VALID; > + } > + > + build_hmat_mpda(table_data, flags, nstat->nodes[i].initiator, i); > + } > +} > + > +void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat) > +{ > + uint64_t hmat_start; s/uint64_t/int/ and initialize it at the declaration site > + > + hmat_start = table_data->len; > + > + /* reserve space for HMAT header */ > + acpi_data_push(table_data, 40); > + > + hmat_build_table_structs(table_data, nstat); > + > + build_header(linker, table_data, > + (void *)(table_data->data + hmat_start), > + "HMAT", table_data->len - hmat_start, 2, NULL, NULL); > +} > diff --git a/hw/acpi/hmat.h b/hw/acpi/hmat.h > new file mode 100644 > index 0000000000..0c1839cf6f > --- /dev/null > +++ b/hw/acpi/hmat.h > @@ -0,0 +1,45 @@ > +/* > + * HMAT ACPI Implementation Header > + * > + * Copyright(C) 2019 Intel Corporation. > + * > + * Author: > + * Liu jingqi > + * Tao Xu > + * > + * HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > + * (HMAT) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > + */ > + > +#ifndef HMAT_H > +#define HMAT_H > + > +#include "hw/acpi/acpi-defs.h" > +#include "hw/acpi/acpi.h" > +#include "hw/acpi/bios-linker-loader.h" > +#include "hw/acpi/aml-build.h" Do you really need all of these headers for declaring build_hmat()? > + > +/* > + * ACPI 6.3: 5.2.27.3 Memory Proximity Domain Attributes Structure, > + * Table 5-145, Field "flag", Bit [0]: set to 1 to indicate that data in > + * the Proximity Domain for the Attached Initiator field is valid. > + * Other bits reserved. > + */ > +#define HMAT_PROX_INIT_VALID 0x1 shortening INITIATOR to INIT makes it too vague, just use INITIATOR same for PROX. (applies to other places in this series with similar names) > +void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat); > + > +#endif > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index e54e571a75..7f2e05f1a9 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -68,6 +68,7 @@ > #include "hw/i386/intel_iommu.h" > > #include "hw/acpi/ipmi.h" > +#include "hw/acpi/hmat.h" > > /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and > * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows > @@ -2698,6 +2699,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) > acpi_add_table(table_offsets, tables_blob); > build_slit(tables_blob, tables->linker, machine); > } > + if (machine->numa_state->hmat_enabled) { > + acpi_add_table(table_offsets, tables_blob); > + build_hmat(tables_blob, tables->linker, machine->numa_state); > + } > } > if (acpi_get_mcfg(&mcfg)) { > acpi_add_table(table_offsets, tables_blob);