From nobody Thu May 16 20:26:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1591402221; cv=none; d=zohomail.com; s=zohoarc; b=IIBEiGnCX9Cqm0ddsDKUwFcGFG5SmTI21xEJy5tgntxedPd/kRkAea93AsKT+17DFVtSgQzL4DebpeR9cj8duUjA6cPtIulLiABMAltH4IHMAeWL32wZw3bCdB0IlLO7xZrNpjesPF3gVvP3/gpWBLZFjOUnKdR1gk+WOF7kMzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591402221; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nGu5zl31QURpSxB2TB/dC9eMZ6AizjAwYdT2DNGjdZ0=; b=IeUaY1vKk2M4wyqf/WVwZeylGViU1EPDVxNtamrctOBYwldTetbmM2glvei/jp+e/bacMi2Xcf8ZpnmTX2kkYftIa+Js+g5vgyLQeyoA7JL5mcKzDg13c6gpmXzHujZum553rptBWWlI5bdYZWkNiov0wRlzdOl+kr1d3DN9hw4= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159140222150376.27537790919007; Fri, 5 Jun 2020 17:10:21 -0700 (PDT) Received: from localhost ([::1]:46656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhMPj-0006s0-Qp for importer@patchew.org; Fri, 05 Jun 2020 20:10:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOu-0005fu-Bb for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:28 -0400 Received: from mga02.intel.com ([134.134.136.20]:45983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOs-0006I8-Ta for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:27 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2020 17:09:20 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.254.185.105]) by fmsmga004.fm.intel.com with ESMTP; 05 Jun 2020 17:09:20 -0700 IronPort-SDR: ZIvAfdgbGCHlK3MxYR6uf8QnuAglQsiMQ30amp8XYF5Mhc4ipz1guhig+A53KV+u3DuyLakzes Rtl0lg+4qw9Q== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: CYlHCHOsvEr6hQNs71+ubzxd+QHWrmWll61TDGcMLiMZgAZXchL0A7ShZ0Eb2y799N7M4HpVyD TPFhIRF9Dmog== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,478,1583222400"; d="scan'208";a="294853316" From: Vishal Verma To: Subject: [PATCH v5 1/3] diffs-allowed: add the SRAT AML to diffs-allowed Date: Fri, 5 Jun 2020 18:09:09 -0600 Message-Id: <20200606000911.9896-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200606000911.9896-1-vishal.l.verma@intel.com> References: <20200606000911.9896-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.20; envelope-from=vishal.l.verma@intel.com; helo=mga02.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 20:09:20 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In anticipation of a change to the SRAT generation in qemu, add the AML file to diffs-allowed. Signed-off-by: Vishal Verma --- tests/qtest/bios-tables-test-allowed-diff.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..e8f2766a63 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,4 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/SRAT.dimmpxm", +"tests/data/acpi/q35/SRAT.dimmpxm", +"tests/data/acpi/virt/SRAT.memhp", --=20 2.26.2 From nobody Thu May 16 20:26:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1591402222; cv=none; d=zohomail.com; s=zohoarc; b=jJabURL4sSHhgoTOqoyYbv0/4gxQzH8EtYnyeG6TnHjdOkTWcb2H0yLpxqC+X578B7oLUAcr1vE0Zj6iauy0ilbP5A/cTSTwEOoD+23QrgkvyqbjH+WkPHbbK7ui+C8txztgqm4Pshaa3dIJtLeWUo3QJOxbUVG5cd0u136UJJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591402222; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=T6hKwbjccw6beMofQ7hetX/K/Kb6SIFyGRv9DX8FcNE=; b=D6SZhdlb/7ysvfNpS579rAHu6od9i5Hihac0QwxPW2RUjB1iiWcbrycFoXXZWj+TmANv1PLhQBgGcthSXfIDQ48HJZ8Noskwu8+QPlda1XNy0upNLF3jQJlYcUvFyr7Wg5SUNhHe+LE5267Udxz0ajL5emZIpdnRlrCPWymmG2A= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591402222826451.28058729459735; Fri, 5 Jun 2020 17:10:22 -0700 (PDT) Received: from localhost ([::1]:46776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhMPl-0006v1-GM for importer@patchew.org; Fri, 05 Jun 2020 20:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOv-0005gG-Ej for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:29 -0400 Received: from mga02.intel.com ([134.134.136.20]:45983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOu-0006I8-9z for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:29 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2020 17:09:21 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.254.185.105]) by fmsmga004.fm.intel.com with ESMTP; 05 Jun 2020 17:09:20 -0700 IronPort-SDR: o6oOSsW3bDqQs+rlCiTYXi8AoDkONjQCF25Ilzk20Mv3KH7/eZpUPFfy+Pm1MP4+mUC5XVGmiI 3Jr32BtRoA9w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: XlV+3n5n0ZEf+YHkXAZYOvD9rBB0GKP+lpMuwdqBFryc+IltBT1AezzS1Q+B2yKDafUQyVJ0PQ C2xOFFfG3yLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,478,1583222400"; d="scan'208";a="294853323" From: Vishal Verma To: Subject: [PATCH v5 2/3] hw/acpi/nvdimm: add a helper to augment SRAT generation Date: Fri, 5 Jun 2020 18:09:10 -0600 Message-Id: <20200606000911.9896-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200606000911.9896-1-vishal.l.verma@intel.com> References: <20200606000911.9896-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.20; envelope-from=vishal.l.verma@intel.com; helo=mga02.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 20:09:20 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" NVDIMMs can belong to their own proximity domains, as described by the NFIT. In such cases, the SRAT needs to have Memory Affinity structures in the SRAT for these NVDIMMs, otherwise Linux doesn't populate node data structures properly during NUMA initialization. See the following for an example failure case. https://lore.kernel.org/linux-nvdimm/20200416225438.15208-1-vishal.l.verma@= intel.com/ Introduce a new helper, nvdimm_build_srat(), and call it for both the i386 and arm versions of 'build_srat()' to augment the SRAT with memory affinity information for NVDIMMs. The relevant command line options to exercise this are below. Nodes 0-1 contain CPUs and regular memory, and nodes 2-3 are the NVDIMM address space. -object memory-backend-ram,id=3Dmem0,size=3D2048M -numa node,nodeid=3D0,memdev=3Dmem0, -numa cpu,node-id=3D0,socket-id=3D0 -object memory-backend-ram,id=3Dmem1,size=3D2048M -numa node,nodeid=3D1,memdev=3Dmem1, -numa cpu,node-id=3D1,socket-id=3D1 -numa node,nodeid=3D2, -object memory-backend-file,id=3Dnvmem0,share,mem-path=3Dnvdimm-0,size= =3D16384M,align=3D1G -device nvdimm,memdev=3Dnvmem0,id=3Dnv0,label-size=3D2M,node=3D2 -numa node,nodeid=3D3, -object memory-backend-file,id=3Dnvmem1,share,mem-path=3Dnvdimm-1,size= =3D16384M,align=3D1G -device nvdimm,memdev=3Dnvmem1,id=3Dnv1,label-size=3D2M,node=3D3 Cc: Jingqi Liu Cc: Michael S. Tsirkin Reviewed-by: Jingqi Liu Reviewed-by: Igor Mammedov Signed-off-by: Vishal Verma --- hw/acpi/nvdimm.c | 23 +++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 4 ++++ hw/i386/acpi-build.c | 5 +++++ include/hw/mem/nvdimm.h | 1 + 4 files changed, 33 insertions(+) diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 9316d12b70..8f7cc16add 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -28,6 +28,7 @@ =20 #include "qemu/osdep.h" #include "qemu/uuid.h" +#include "qapi/error.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/bios-linker-loader.h" @@ -1334,6 +1335,28 @@ static void nvdimm_build_ssdt(GArray *table_offsets,= GArray *table_data, free_aml_allocator(); } =20 +void nvdimm_build_srat(GArray *table_data) +{ + GSList *device_list =3D nvdimm_get_device_list(); + + for (; device_list; device_list =3D device_list->next) { + AcpiSratMemoryAffinity *numamem =3D NULL; + DeviceState *dev =3D device_list->data; + Object *obj =3D OBJECT(dev); + uint64_t addr, size; + int node; + + node =3D object_property_get_int(obj, PC_DIMM_NODE_PROP, &error_ab= ort); + addr =3D object_property_get_uint(obj, PC_DIMM_ADDR_PROP, &error_a= bort); + size =3D object_property_get_uint(obj, PC_DIMM_SIZE_PROP, &error_a= bort); + + numamem =3D acpi_data_push(table_data, sizeof *numamem); + build_srat_memory(numamem, addr, size, node, + MEM_AFFINITY_ENABLED | MEM_AFFINITY_NON_VOLATILE= ); + } + g_slist_free(device_list); +} + void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, NVDIMMState *state, uint32_t ram_slots) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 1b0a584c7b..2cbccd5fe2 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -539,6 +539,10 @@ build_srat(GArray *table_data, BIOSLinker *linker, Vir= tMachineState *vms) } } =20 + if (ms->nvdimms_state->is_enabled) { + nvdimm_build_srat(table_data); + } + if (ms->device_memory) { numamem =3D acpi_data_push(table_data, sizeof *numamem); build_srat_memory(numamem, ms->device_memory->base, diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2e15f6848e..d996525e2c 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2428,6 +2428,11 @@ build_srat(GArray *table_data, BIOSLinker *linker, M= achineState *machine) MEM_AFFINITY_ENABLED); } } + + if (machine->nvdimms_state->is_enabled) { + nvdimm_build_srat(table_data); + } + slots =3D (table_data->len - numa_start) / sizeof *numamem; for (; slots < pcms->numa_nodes + 2; slots++) { numamem =3D acpi_data_push(table_data, sizeof *numamem); diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index a3c08955e8..b67a1aedf6 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -155,6 +155,7 @@ typedef struct NVDIMMState NVDIMMState; void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io, struct AcpiGenericAddress dsm_io, FWCfgState *fw_cfg, Object *owner); +void nvdimm_build_srat(GArray *table_data); void nvdimm_build_acpi(GArray *table_offsets, GArray *table_data, BIOSLinker *linker, NVDIMMState *state, uint32_t ram_slots); --=20 2.26.2 From nobody Thu May 16 20:26:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1591402305; cv=none; d=zohomail.com; s=zohoarc; b=SCBz6YA6GpnnTIKd25QVnGlcjAh7QS+Ij4B3Cx1h3f8a/hBxhwbo0Te1ySCnHw+0zoFUVddVf7d/p+jrHdL5RA9GNd82JXvmRvwjY+l6+WgGBvYIGRJL6xTRACiP8r11ZteFAB++OlHgN3edOiEpXe3/dVqUnMorIkyInq6Mdcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591402305; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p3ALiV5qaZVzoV+ip66XAO26Gyy4yoJoXGmhd8r2Kxk=; b=hH1w0Yn3e4IlRVQDG3UDAG9u5y1jEdspCQ/NO0zXAkG2NgiZs3sX2A4VvSUOepNvSXj/o3f7G8nCfv536UozSziGAwNQR/DWwWGgTsTjVlac1GuBMpZ8I+MAubPFSahyb6K2O7Hg17UwzKtRmq/ejKClSsv6U4zORKZWeJ4IlhI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159140230539680.98932900642399; Fri, 5 Jun 2020 17:11:45 -0700 (PDT) Received: from localhost ([::1]:51948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhMR6-0000i3-72 for importer@patchew.org; Fri, 05 Jun 2020 20:11:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOw-0005gc-AC for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:30 -0400 Received: from mga02.intel.com ([134.134.136.20]:45990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhMOv-0006IW-48 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 20:09:30 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2020 17:09:22 -0700 Received: from vverma7-mobl4.lm.intel.com ([10.254.185.105]) by fmsmga004.fm.intel.com with ESMTP; 05 Jun 2020 17:09:21 -0700 IronPort-SDR: yeCAwfBTXvFQ+B5Ifs31+UQaITEW7fMnQvXLYAjwcysdpYPocrc/j1RjHZNmtWqKx1sNOMLZN4 noGjvR0nPoww== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: 1YXrsLj0BX3XCIhfJUBRR5NzZyVU3orkGcLs4UQ6EC5kokvfSRPGxSaPLozJSvmE2tHxJXveD5 s7YBa6ly/66w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,478,1583222400"; d="scan'208";a="294853326" From: Vishal Verma To: Subject: [PATCH v5 3/3] tests/acpi: update expected SRAT files Date: Fri, 5 Jun 2020 18:09:11 -0600 Message-Id: <20200606000911.9896-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200606000911.9896-1-vishal.l.verma@intel.com> References: <20200606000911.9896-1-vishal.l.verma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.20; envelope-from=vishal.l.verma@intel.com; helo=mga02.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/05 20:09:20 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Laurent Vivier , Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , jingqi.liu@intel.com, Dave Hansen , Eduardo Habkost , Vishal Verma , Paolo Bonzini , Igor Mammedov , Dan Williams , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Update expected SRAT files for the change to account for NVDIMM NUMA nodes in the SRAT. AML diffs: tests/data/acpi/pc/SRAT.dimmpxm: --- /tmp/asl-3P2IL0.dsl 2020-05-28 15:11:02.326439263 -0600 +++ /tmp/asl-1N4IL0.dsl 2020-05-28 15:11:02.325439280 -0600 @@ -3,7 +3,7 @@ * AML/ASL+ Disassembler version 20190509 (64-bit version) * Copyright (c) 2000 - 2019 Intel Corporation * - * Disassembly of tests/data/acpi/pc/SRAT.dimmpxm, Thu May 28 15:11:02 2020 + * Disassembly of /tmp/aml-4D4IL0, Thu May 28 15:11:02 2020 * * ACPI Data Table [SRAT] * @@ -13,7 +13,7 @@ [000h 0000 4] Signature : "SRAT" [System Resource = Affinity Table] [004h 0004 4] Table Length : 00000188 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 80 +[009h 0009 1] Checksum : 68 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCSRAT" [018h 0024 4] Oem Revision : 00000001 @@ -140,15 +140,15 @@ [138h 0312 1] Subtable Type : 01 [Memory Affinity] [139h 0313 1] Length : 28 -[13Ah 0314 4] Proximity Domain : 00000000 +[13Ah 0314 4] Proximity Domain : 00000002 [13Eh 0318 2] Reserved1 : 0000 -[140h 0320 8] Base Address : 0000000000000000 -[148h 0328 8] Address Length : 0000000000000000 +[140h 0320 8] Base Address : 0000000108000000 +[148h 0328 8] Address Length : 0000000008000000 [150h 0336 4] Reserved2 : 00000000 -[154h 0340 4] Flags (decoded below) : 00000000 - Enabled : 0 +[154h 0340 4] Flags (decoded below) : 00000005 + Enabled : 1 Hot Pluggable : 0 - Non-Volatile : 0 + Non-Volatile : 1 [158h 0344 8] Reserved3 : 0000000000000000 [160h 0352 1] Subtable Type : 01 [Memory Affinity] tests/data/acpi/q35/SRAT.dimmpxm: --- /tmp/asl-HW2LL0.dsl 2020-05-28 15:11:05.446384514 -0600 +++ /tmp/asl-8MYLL0.dsl 2020-05-28 15:11:05.445384532 -0600 @@ -3,7 +3,7 @@ * AML/ASL+ Disassembler version 20190509 (64-bit version) * Copyright (c) 2000 - 2019 Intel Corporation * - * Disassembly of tests/data/acpi/q35/SRAT.dimmpxm, Thu May 28 15:11:05 20= 20 + * Disassembly of /tmp/aml-2CYLL0, Thu May 28 15:11:05 2020 * * ACPI Data Table [SRAT] * @@ -13,7 +13,7 @@ [000h 0000 4] Signature : "SRAT" [System Resource = Affinity Table] [004h 0004 4] Table Length : 00000188 [008h 0008 1] Revision : 01 -[009h 0009 1] Checksum : 80 +[009h 0009 1] Checksum : 68 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCSRAT" [018h 0024 4] Oem Revision : 00000001 @@ -140,15 +140,15 @@ [138h 0312 1] Subtable Type : 01 [Memory Affinity] [139h 0313 1] Length : 28 -[13Ah 0314 4] Proximity Domain : 00000000 +[13Ah 0314 4] Proximity Domain : 00000002 [13Eh 0318 2] Reserved1 : 0000 -[140h 0320 8] Base Address : 0000000000000000 -[148h 0328 8] Address Length : 0000000000000000 +[140h 0320 8] Base Address : 0000000108000000 +[148h 0328 8] Address Length : 0000000008000000 [150h 0336 4] Reserved2 : 00000000 -[154h 0340 4] Flags (decoded below) : 00000000 - Enabled : 0 +[154h 0340 4] Flags (decoded below) : 00000005 + Enabled : 1 Hot Pluggable : 0 - Non-Volatile : 0 + Non-Volatile : 1 [158h 0344 8] Reserved3 : 0000000000000000 [160h 0352 1] Subtable Type : 01 [Memory Affinity] tests/data/acpi/virt/SRAT.memhp: --- /tmp/asl-E32WL0.dsl 2020-05-28 15:19:56.976095582 -0600 +++ /tmp/asl-Y69WL0.dsl 2020-05-28 15:19:56.974095617 -0600 @@ -3,7 +3,7 @@ * AML/ASL+ Disassembler version 20190509 (64-bit version) * Copyright (c) 2000 - 2019 Intel Corporation * - * Disassembly of tests/data/acpi/virt/SRAT.memhp, Thu May 28 15:19:56 2020 + * Disassembly of /tmp/aml-2CCXL0, Thu May 28 15:19:56 2020 * * ACPI Data Table [SRAT] * @@ -11,9 +11,9 @@ */ [000h 0000 4] Signature : "SRAT" [System Resource = Affinity Table] -[004h 0004 4] Table Length : 000000BA +[004h 0004 4] Table Length : 000000E2 [008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 43 +[009h 0009 1] Checksum : 5C [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPCSRAT" [018h 0024 4] Oem Revision : 00000001 @@ -65,18 +65,32 @@ [094h 0148 4] Proximity Domain : 00000001 [098h 0152 2] Reserved1 : 0000 -[09Ah 0154 8] Base Address : 0000000080000000 -[0A2h 0162 8] Address Length : 00000000F0000000 +[09Ah 0154 8] Base Address : 0000000088000000 +[0A2h 0162 8] Address Length : 0000000008000000 [0AAh 0170 4] Reserved2 : 00000000 -[0AEh 0174 4] Flags (decoded below) : 00000003 +[0AEh 0174 4] Flags (decoded below) : 00000005 + Enabled : 1 + Hot Pluggable : 0 + Non-Volatile : 1 +[0B2h 0178 8] Reserved3 : 0000000000000000 + +[0BAh 0186 1] Subtable Type : 01 [Memory Affinity] +[0BBh 0187 1] Length : 28 + +[0BCh 0188 4] Proximity Domain : 00000001 +[0C0h 0192 2] Reserved1 : 0000 +[0C2h 0194 8] Base Address : 0000000080000000 +[0CAh 0202 8] Address Length : 00000000F0000000 +[0D2h 0210 4] Reserved2 : 00000000 +[0D6h 0214 4] Flags (decoded below) : 00000003 Enabled : 1 Hot Pluggable : 1 Non-Volatile : 0 -[0B2h 0178 8] Reserved3 : 0000000000000000 +[0DAh 0218 8] Reserved3 : 0000000000000000 Signed-off-by: Vishal Verma --- tests/data/acpi/pc/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 392 -> 392 bytes tests/data/acpi/virt/SRAT.memhp | Bin 186 -> 226 bytes tests/qtest/bios-tables-test-allowed-diff.h | 3 --- 4 files changed, 3 deletions(-) diff --git a/tests/data/acpi/pc/SRAT.dimmpxm b/tests/data/acpi/pc/SRAT.dimm= pxm index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93= a111fb1c0c76a 100644 GIT binary patch delta 51 scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp delta 51 icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx diff --git a/tests/data/acpi/q35/SRAT.dimmpxm b/tests/data/acpi/q35/SRAT.di= mmpxm index f5c0267ea24bb404b6b4e687390140378fbdc3f1..5a13c61b9041c6045c29643bf93= a111fb1c0c76a 100644 GIT binary patch delta 51 scmeBR?qKE$4ss0XU}Rum%-G0fz$nec00kUCF%aN@Pz(&LlS3Je0lmQmhyVZp delta 51 icmeBR?qKE$4ss0XU}RumY}m+Uz$ndt8%z#mGzI{_tp$hx diff --git a/tests/data/acpi/virt/SRAT.memhp b/tests/data/acpi/virt/SRAT.me= mhp index 1b57db2072e7f7e2085c4a427aa31c7383851b71..9a35adb40c6f7cd822e5af37abb= a8aad033617cb 100644 GIT binary patch delta 43 rcmdnR_=3Du4!ILI;N5d#AQbIe4p$wD1K76@=3DaC