From nobody Mon May 13 05:03:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=reject dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1709909888; cv=pass; d=zohomail.com; s=zohoarc; b=iEmoOTTioUHEwRpyD6n7qffUpmkL6kWhH7BH7NpepoXbSFB4NmJ2flMzI0T+47/kKVOQyK4vK2gwMn1Wb/7Iu28GrheR3I/HP4IhY8t0X/N6L7xreK4XC7tc3v8/DFUZX40TSe3zGNWJIQ29X89fquxUPeMYCCsXuNbTgHuXExE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709909888; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8+Nfb9Fp9svwTRraIIDVALUSYVvUG9WY8BWqf0gGVtg=; b=Vf/DFUq6RH/2n1bLxZjZTuDSlpSq8/A3VYDCQ2yWYRqerIjgLjQILs785G9CgubiJsm0G5jZ7YKJ8XWpP+CLJd01wIFQO3FK6tt06J3FBqkqXTSzsYK7gOKJZNdU4nzKAYc4iuLfo+yfrEmY8mKc5d+Q7gCJtEjwIbZWy4aWlrk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709909888078103.75184490100776; Fri, 8 Mar 2024 06:58:08 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ribdo-00038I-Nx; Fri, 08 Mar 2024 09:56:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribdd-0002t5-Fj; Fri, 08 Mar 2024 09:56:01 -0500 Received: from mail-bn8nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:2418::601] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribda-0005Ip-OX; Fri, 08 Mar 2024 09:55:57 -0500 Received: from PA7P264CA0227.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:372::14) by DS0PR12MB8319.namprd12.prod.outlook.com (2603:10b6:8:f7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.27; Fri, 8 Mar 2024 14:55:49 +0000 Received: from SN1PEPF0002636D.namprd02.prod.outlook.com (2603:10a6:102:372:cafe::d) by PA7P264CA0227.outlook.office365.com (2603:10a6:102:372::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26 via Frontend Transport; Fri, 8 Mar 2024 14:55:49 +0000 Received: from mail.nvidia.com (216.228.118.233) by SN1PEPF0002636D.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Fri, 8 Mar 2024 14:55:47 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Fri, 8 Mar 2024 06:55:26 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Fri, 8 Mar 2024 06:55:26 -0800 Received: from host-10-63-191-31.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Fri, 8 Mar 2024 06:55:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C166snbXI41zTfT3fPSkDGZBkM28R8UCU4f4b+/QuMzvsyPXmk1gCa8EwNqdV/LAa3P9pkx7h2+MdKA5wU7379hTXHmwLMg43Zl+rw/Dwja5XIy1i2x1Ulsjpq3bThzi/vqZluYqCx59xRjDlT4p1QzrH9+SYCk3JNMObN8IsciwOX6gJDGEPJB0Zle2pr8YK1DrG1TbLUwjE+9MF2PLt2Fd5j0pQn5UCuEbt0hBxQ8kl1EzMWuwAWWCHI7vgsjNogXGTffXHQXgoyni4+i3Coxsk4emZXGlx6E+ZRZeVaaL44NiGWA9/YJW3uS6ecWoCauu8FYeuGhUoZb7vkCH8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8+Nfb9Fp9svwTRraIIDVALUSYVvUG9WY8BWqf0gGVtg=; b=Mc6LMcyYyadZjFOWHnURBfx0YrdVEH3jtBMoTkPIapdOqsZhY00wXEIU5UgtUSCtruPENX35sNF+VUxqh5xnO8VJq1qzR2p+UpCtJx6YVVsZwPCBu+HOXq148dzcJJBsk4KGGCZVJdEi8dUYnPXOOQjk0NJt3Se9IWLD6vacP8431Kn8JTRTmO9D3rHslhoKHjQ8UK5tbF7avv98tDEzpb/keVKKDSovipwXV7+mx7Qd9BbW9uJyiBqiVzLo8PyhNnME4Eb8GZSXMfHN8n7RQPXPggH9LU2+hwtFmjPPSwvujpo8/x6tMc3qA1TeOjqd9706spe1+46TzqUR6j6ZrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8+Nfb9Fp9svwTRraIIDVALUSYVvUG9WY8BWqf0gGVtg=; b=D8agL/Y4iJokIFXXyiYlxjGVhGvI1m/nCuw3ECgH6WzvXhnmbUFxBZGbu/BzniGK2nSWrynnLCdmgFGOm5EnnGu7YAkE/NoQLegdSLBzdrG1Bxxsj/nhf1nqvFTZMR/aPF0h90f3jLBIv9BuulMXdKf3KsI+YDoPBKf7//ugjsSowAFyL/ZP1OE1UAfwM6sTImOOQ4gJ8dSg+x//SOgSLvOuXkVah3A61LpVz13d/BIaD/FuWr88fEBMnAr330+hOhabfr5SmtuDP12SCHz6EJsavV3cw7iaLh2rIGTn6y2FbIBLoRessAemy18s51OIdi0pb8sWcXQ0Rtee2b9l2g== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; 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 (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C From: To: , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , Subject: [PATCH v9 1/3] qom: new object to associate device to NUMA node Date: Fri, 8 Mar 2024 14:55:23 +0000 Message-ID: <20240308145525.10886-2-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308145525.10886-1-ankita@nvidia.com> References: <20240308145525.10886-1-ankita@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636D:EE_|DS0PR12MB8319:EE_ X-MS-Office365-Filtering-Correlation-Id: 471798c5-f0e0-40c8-b77c-08dc3f7fd6cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vrtNJgmfdGsLkwUgQ1eEYCrXXKUncCH02qXU8jZovIf6532HTrKO3x1SX77ZTdwNzHN8JqVQoJNxgauJ5ZyQohP75jA49zES36vQyR3arOSvYPjBYbwnFfvtBpKLLjZAeYElojxrRN1Z+oRyaHBqdmsaULfdDMFmiuucPvuu9ZDgtr7q3ne0UscSCOYws6V5FUnMudnR/lzEGuUGM0Yd9vPpmQzAUbhiapjPzY9SHOcZa2O+qWyusXUpmFT1+DKavcM7wAfPyWrOeSxcuiAbpLA34s+QIxJpjMALbYMFqCwK5XfJLCXk9FQK/+biGXrW8dPoymLUmW/V2Yem/PX7GnhufY5z8ADTckavfBXYSc87VKn0oF8whFZz16NbcS02gT/V1qRSSJL+xZ1lIZRz2KfpxltuzMufW0VDwNzgAe8xSbih6GBGzp0kW42bO/TRHeeWtxgyltGqIqwRzjt4Uy43y905zletSCeT0rAigH0r4LfUabsAylH4KtMJpYqMb3aEbitP433GIxEfyq3udbWRoAX0sjQ8WrxbdEYUS6biS5vSQWK/CNTq+m5+SV4Jd3hCX9k/iKHENMDm7N9zp2WZ3q8GQ9UgtO0/seV2f3v7+CtOnCGEhj5mgnzjV2D8s3aSFnMxSw9SZ6d9k6E3qZraaRubhaGoTg8Mk4zceceuGAbSBODCu2HqwGoPr3WcrWTivRs2OY5Ybg309q4PfUpxzv9LPz/cDXMJUwVnYmQB9tbIA2SKsF5LLA82Mfpp9tAK9uUwgpvwlWsNSC6dIQ== X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(376005)(36860700004)(7416005)(82310400014)(921011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 14:55:47.5811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 471798c5-f0e0-40c8-b77c-08dc3f7fd6cc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8319 Received-SPF: softfail client-ip=2a01:111:f403:2418::601; envelope-from=ankita@nvidia.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.572, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1709909888715100001 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal NVIDIA GPU's support MIG (Mult-Instance GPUs) feature [1], which allows partitioning of the GPU device resources (including device memory) into several (upto 8) isolated instances. Each of the partitioned memory needs a dedicated NUMA node to operate. The partitions are not fixed and they can be created/deleted at runtime. Unfortunately Linux OS does not provide a means to dynamically create/destr= oy NUMA nodes and such feature implementation is not expected to be trivial. T= he nodes that OS discovers at the boot time while parsing SRAT remains fixed. = So we utilize the Generic Initiator (GI) Affinity structures that allows association between nodes and devices. Multiple GI structures per BDF is possible, allowing creation of multiple nodes by exposing unique PXM in each of these structures. Implement the mechanism to build the GI affinity structures as Qemu current= ly does not. Introduce a new acpi-generic-initiator object to allow host admin link a device with an associated NUMA node. Qemu maintains this association and use this object to build the requisite GI Affinity Structure. When multiple NUMA nodes are associated with a device, it is required to create those many number of acpi-generic-initiator objects, each representi= ng a unique device:node association. Following is one of a decoded GI affinity structure in VM ACPI SRAT. [0C8h 0200 1] Subtable Type : 05 [Generic Initiator Affini= ty] [0C9h 0201 1] Length : 20 [0CAh 0202 1] Reserved1 : 00 [0CBh 0203 1] Device Handle Type : 01 [0CCh 0204 4] Proximity Domain : 00000007 [0D0h 0208 16] Device Handle : 00 00 20 00 00 00 00 00 00 0= 0 00 00 00 00 00 00 [0E0h 0224 4] Flags (decoded below) : 00000001 Enabled : 1 [0E4h 0228 4] Reserved2 : 00000000 [0E8h 0232 1] Subtable Type : 05 [Generic Initiator Affini= ty] [0E9h 0233 1] Length : 20 An admin can provide a range of acpi-generic-initiator objects, each associating a device (by providing the id through pci-dev argument) to the desired NUMA node (using the node argument). Currently, only PCI device is supported. For the grace hopper system, create a range of 8 nodes and associate that with the device using the acpi-generic-initiator object. While a configurat= ion of less than 8 nodes per device is allowed, such configuration will prevent utilization of the feature to the fullest. The following sample creates 8 nodes per PCI device for a VM with 2 PCI devices and link them to the respecitve PCI device using acpi-generic-initiator objects: -numa node,nodeid=3D2 -numa node,nodeid=3D3 -numa node,nodeid=3D4 \ -numa node,nodeid=3D5 -numa node,nodeid=3D6 -numa node,nodeid=3D7 \ -numa node,nodeid=3D8 -numa node,nodeid=3D9 \ -device vfio-pci-nohotplug,host=3D0009:01:00.0,bus=3Dpcie.0,addr=3D04.0,rom= bar=3D0,id=3Ddev0 \ -object acpi-generic-initiator,id=3Dgi0,pci-dev=3Ddev0,node=3D2 \ -object acpi-generic-initiator,id=3Dgi1,pci-dev=3Ddev0,node=3D3 \ -object acpi-generic-initiator,id=3Dgi2,pci-dev=3Ddev0,node=3D4 \ -object acpi-generic-initiator,id=3Dgi3,pci-dev=3Ddev0,node=3D5 \ -object acpi-generic-initiator,id=3Dgi4,pci-dev=3Ddev0,node=3D6 \ -object acpi-generic-initiator,id=3Dgi5,pci-dev=3Ddev0,node=3D7 \ -object acpi-generic-initiator,id=3Dgi6,pci-dev=3Ddev0,node=3D8 \ -object acpi-generic-initiator,id=3Dgi7,pci-dev=3Ddev0,node=3D9 \ -numa node,nodeid=3D10 -numa node,nodeid=3D11 -numa node,nodeid=3D12 \ -numa node,nodeid=3D13 -numa node,nodeid=3D14 -numa node,nodeid=3D15 \ -numa node,nodeid=3D16 -numa node,nodeid=3D17 \ -device vfio-pci-nohotplug,host=3D0009:01:01.0,bus=3Dpcie.0,addr=3D05.0,rom= bar=3D0,id=3Ddev1 \ -object acpi-generic-initiator,id=3Dgi8,pci-dev=3Ddev1,node=3D10 \ -object acpi-generic-initiator,id=3Dgi9,pci-dev=3Ddev1,node=3D11 \ -object acpi-generic-initiator,id=3Dgi10,pci-dev=3Ddev1,node=3D12 \ -object acpi-generic-initiator,id=3Dgi11,pci-dev=3Ddev1,node=3D13 \ -object acpi-generic-initiator,id=3Dgi12,pci-dev=3Ddev1,node=3D14 \ -object acpi-generic-initiator,id=3Dgi13,pci-dev=3Ddev1,node=3D15 \ -object acpi-generic-initiator,id=3Dgi14,pci-dev=3Ddev1,node=3D16 \ -object acpi-generic-initiator,id=3Dgi15,pci-dev=3Ddev1,node=3D17 \ Link: https://www.nvidia.com/en-in/technologies/multi-instance-gpu [1] Cc: Jonathan Cameron Cc: Alex Williamson Cc: Markus Armbruster Reviewed-by: Jonathan Cameron Acked-by: Markus Armbruster Signed-off-by: Ankit Agrawal --- hw/acpi/acpi_generic_initiator.c | 71 ++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/acpi_generic_initiator.h | 22 ++++++++ qapi/qom.json | 17 ++++++ 4 files changed, 111 insertions(+) create mode 100644 hw/acpi/acpi_generic_initiator.c create mode 100644 include/hw/acpi/acpi_generic_initiator.h diff --git a/hw/acpi/acpi_generic_initiator.c b/hw/acpi/acpi_generic_initia= tor.c new file mode 100644 index 0000000000..130d6ae8c1 --- /dev/null +++ b/hw/acpi/acpi_generic_initiator.c @@ -0,0 +1,71 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved + */ + +#include "qemu/osdep.h" +#include "hw/acpi/acpi_generic_initiator.h" +#include "hw/boards.h" +#include "qemu/error-report.h" + +typedef struct AcpiGenericInitiatorClass { + ObjectClass parent_class; +} AcpiGenericInitiatorClass; + +OBJECT_DEFINE_TYPE_WITH_INTERFACES(AcpiGenericInitiator, acpi_generic_init= iator, + ACPI_GENERIC_INITIATOR, OBJECT, + { TYPE_USER_CREATABLE }, + { NULL }) + +OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR) + +static void acpi_generic_initiator_init(Object *obj) +{ + AcpiGenericInitiator *gi =3D ACPI_GENERIC_INITIATOR(obj); + + gi->node =3D MAX_NODES; + gi->pci_dev =3D NULL; +} + +static void acpi_generic_initiator_finalize(Object *obj) +{ + AcpiGenericInitiator *gi =3D ACPI_GENERIC_INITIATOR(obj); + + g_free(gi->pci_dev); +} + +static void acpi_generic_initiator_set_pci_device(Object *obj, const char = *val, + Error **errp) +{ + AcpiGenericInitiator *gi =3D ACPI_GENERIC_INITIATOR(obj); + + gi->pci_dev =3D g_strdup(val); +} + +static void acpi_generic_initiator_set_node(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + AcpiGenericInitiator *gi =3D ACPI_GENERIC_INITIATOR(obj); + uint32_t value; + + if (!visit_type_uint32(v, name, &value, errp)) { + return; + } + + if (value >=3D MAX_NODES) { + error_printf("%s: Invalid NUMA node specified\n", + TYPE_ACPI_GENERIC_INITIATOR); + exit(1); + } + + gi->node =3D value; +} + +static void acpi_generic_initiator_class_init(ObjectClass *oc, void *data) +{ + object_class_property_add_str(oc, "pci-dev", NULL, + acpi_generic_initiator_set_pci_device); + object_class_property_add(oc, "node", "int", NULL, + acpi_generic_initiator_set_node, NULL, NULL); +} diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index fc1b952379..1424046164 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -1,5 +1,6 @@ acpi_ss =3D ss.source_set() acpi_ss.add(files( + 'acpi_generic_initiator.c', 'acpi_interface.c', 'aml-build.c', 'bios-linker-loader.c', diff --git a/include/hw/acpi/acpi_generic_initiator.h b/include/hw/acpi/acp= i_generic_initiator.h new file mode 100644 index 0000000000..16de1d3d80 --- /dev/null +++ b/include/hw/acpi/acpi_generic_initiator.h @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved + */ + +#ifndef ACPI_GENERIC_INITIATOR_H +#define ACPI_GENERIC_INITIATOR_H + +#include "qom/object_interfaces.h" + +#define TYPE_ACPI_GENERIC_INITIATOR "acpi-generic-initiator" + +typedef struct AcpiGenericInitiator { + /* private */ + Object parent; + + /* public */ + char *pci_dev; + uint16_t node; +} AcpiGenericInitiator; + +#endif diff --git a/qapi/qom.json b/qapi/qom.json index c53ef978ff..81727310b1 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -794,6 +794,21 @@ { 'struct': 'VfioUserServerProperties', 'data': { 'socket': 'SocketAddress', 'device': 'str' } } =20 +## +# @AcpiGenericInitiatorProperties: +# +# Properties for acpi-generic-initiator objects. +# +# @pci-dev: PCI device ID to be associated with the node +# +# @node: NUMA node associated with the PCI device +# +# Since: 9.0 +## +{ 'struct': 'AcpiGenericInitiatorProperties', + 'data': { 'pci-dev': 'str', + 'node': 'uint32' } } + ## # @RngProperties: # @@ -911,6 +926,7 @@ ## { 'enum': 'ObjectType', 'data': [ + 'acpi-generic-initiator', 'authz-list', 'authz-listfile', 'authz-pam', @@ -981,6 +997,7 @@ 'id': 'str' }, 'discriminator': 'qom-type', 'data': { + 'acpi-generic-initiator': 'AcpiGenericInitiatorProperties', 'authz-list': 'AuthZListProperties', 'authz-listfile': 'AuthZListFileProperties', 'authz-pam': 'AuthZPAMProperties', --=20 2.34.1 From nobody Mon May 13 05:03:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=reject dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1709909826; cv=pass; d=zohomail.com; s=zohoarc; b=GtMnQER4jynHr7EJrrjzd4Flo5XL/6HLW97d1ZhEQskNZ5QcWoH1z6VunF9mhPeZ2fK+yeDT9DR18BtRaY4GcrZLk7rjrdL0mkUBPsjHjkIw8JKV3nYD5kgBKV8FHIDbysCXAS66mmjUdtE4f1iT+abw8CfDEg8hwjvoir8ZXTI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709909826; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XGmgSxq6TNQBYjYu+WNFcbEr7nGnqIQQnoVPHZz6jIg=; b=U90WhF0BLOKz3+xlwMpIlIrFpV77j923ugFCDLitaDnoToENaIUpFFNOiCWs8aHhXOy/0nKzDxKYwOSwRlDYvICusonP0STseAbz4krwcOO/RalR4u35/4Ul1CuYEEImGVaEJFsZq4jwktwZGVvRenuKO7M40FFJp2Qz332/6eE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709909826554439.65355236581854; Fri, 8 Mar 2024 06:57:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ribdl-0002zE-Po; Fri, 08 Mar 2024 09:56:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribdV-0002qL-No; Fri, 08 Mar 2024 09:55:52 -0500 Received: from mail-bn7nam10on20601.outbound.protection.outlook.com ([2a01:111:f403:2009::601] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribdT-0005GL-E9; Fri, 08 Mar 2024 09:55:49 -0500 Received: from MW2PR16CA0011.namprd16.prod.outlook.com (2603:10b6:907::24) by IA1PR12MB7637.namprd12.prod.outlook.com (2603:10b6:208:427::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.27; Fri, 8 Mar 2024 14:55:40 +0000 Received: from MWH0EPF000A6735.namprd04.prod.outlook.com (2603:10b6:907:0:cafe::2b) by MW2PR16CA0011.outlook.office365.com (2603:10b6:907::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.40 via Frontend Transport; Fri, 8 Mar 2024 14:55:40 +0000 Received: from mail.nvidia.com (216.228.118.232) by MWH0EPF000A6735.mail.protection.outlook.com (10.167.249.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Fri, 8 Mar 2024 14:55:39 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Fri, 8 Mar 2024 06:55:26 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Fri, 8 Mar 2024 06:55:26 -0800 Received: from host-10-63-191-31.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Fri, 8 Mar 2024 06:55:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVHd72ioXeZyLYa2wT4NSHwEFMOqubdlSz5n3nkaklNUzHX0RFL/XEYQdCcYpzdfFot+HIKTJst0FavkMedfju82hBdlQn0glqZyxKkGfx+7bDSjNnytmownk4IQvhJgmVtLQp4FY96wm6ergEIE67hLP5WmDHKPGjnS+FobVJqLjDV6IjWp4hvqjgPZznj3gNzbr2FhUQCh+bNqwMd0ug3jPB2sgBWMqi/oJbGNytdlhRD7GVtJsUISI6q2JhtUJ36KyH/bg7TAp9jSrv0syQEKHpY4XQdpd+jff+xETA8gJrxqFfoWiVwtxs2QdwASyDG++v74onYpCvTY45l1zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XGmgSxq6TNQBYjYu+WNFcbEr7nGnqIQQnoVPHZz6jIg=; b=aAOtquiK+sSVgC5xa2AciD28JVb1dIRTF2RfF6zppfmapnptIWFgLaWe6C63EzTPSlY37tiwalRYacttXmY7YA4gpIOOyo8GLhEaygD5ygvsmk5kXiuvBgbhbZIWQhs9WQw+QUqaXKQQ7T0cuaNl+qEDzSRN4KKja4sFQjgWWviCXb6NlFanwoeon//a9VyK7y4wY3oX7aCoBpfMAJNSRBismycHVId8tlEA0UUNppj2qzHtwo6k8e/Nf+2HaMA4h/1Ewux7bVb+q/6XYADbMJNskw/iQfGzK8wE4VKp8XWP/VkHBfQ4iYE16LLcQAMku6um2nXSqz59lCOaXOKeHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XGmgSxq6TNQBYjYu+WNFcbEr7nGnqIQQnoVPHZz6jIg=; b=udCzSrl1VO6IBzMjHf4XYoIyJZwlYyWpVXtuy6XZh8+aZHTj/WOYxpPdOdpR/7LwMns21+Fl3j3BLmfC8ejiY67lDTiWt+hNA3eau3PDfXOvH4eKiOFpMOL87SumGhiDQ+tgboDye1+obLNgfU78HR6GiQZTDYPBJ4Pk65p0LJ7v9fwi2Y3bPHQrWcFt3iZcr5TBFy7ZlJfN9Owel1AyZxEvwzMpjI0zWbJPm+Jy4v7O+20ll9imxmeCV8yXX5Vwu0pWbL6a7TBLyUTOIn+ur3um3BzcEfvOZaPEY4EnrXJG9748uCOgJFws+yX5PGqS14Q6XtvKE8jKJwYxT1Unfw== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; 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 (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C From: To: , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , Subject: [PATCH v9 2/3] hw/acpi: Implement the SRAT GI affinity structure Date: Fri, 8 Mar 2024 14:55:24 +0000 Message-ID: <20240308145525.10886-3-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308145525.10886-1-ankita@nvidia.com> References: <20240308145525.10886-1-ankita@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000A6735:EE_|IA1PR12MB7637:EE_ X-MS-Office365-Filtering-Correlation-Id: a67b0b2b-7ca0-4679-19ea-08dc3f7fd230 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XDeQ3cKhydEuhYMejZg7+eAqEeadcIZmjNZFfj3q+OXq6CmRk/PbX8eBa8HZV2SeQrXJCfOrkCAR6e1ehRGmZdta73GxXxvr7DZsKKQpMuO90eVWN3TJW2dPEgodEwPDucJPI+5rN9JZpmSczoRcSQ33Sl5CbxWNy01btI3xt5U+eur5D82KRpajQT6gtY6Hj05gTmnln2AA2CqhlikPQ2YiiIsXveoz4zhvAUMO8CxVoRPH4NuBoRdrGKCqdSFsRITW1ngKwOOFcherhhS1/T8W6j2b1Z/ct/JVfMg9s+1V+FAnl9+NtViH18eJTE5itcsobGUKkFC3zfjw2sXrW/A1PyUcgIVWLHnmcZeI1LN51OU3whJzY300aWosbp13A6+3O9f7BMbDzSYNVLvpT+QsJDXL6owW3aIglY0KdQ2lJakX6NuUsxzVWUhBcemRV9AoMAB6oYdffIlmyolg16L0OciiBP4FkEPUz8D/zkfRyBmUW2B+kJmzwIg1d9NxnJWEiujI1A2CGmAu+mB/b3tF8itOEfhQqC1YeONWSQt4HhiMYK2D+6xY5HKgj5LF9baqgvEFQ1x+v4aBnB3KIMJW+vx6sPwDzUN3iEWGOFkWnt0ZMrnHxtrXHApENQaumhLnaeXvS+dNLPngnRm/wThaL73a94pFrkk8lDPSk9DdzDMWkDGpgobFTcOyOix7q2eDYOk21iL0HLQpKyMf3uVQO5eGbkkohVvglXwp8SqWsvP9/0tEb9jStJmNM4Xcdr9xlak9DPHUOYM72wBTwg== X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(82310400014)(36860700004)(376005)(7416005)(921011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 14:55:39.8750 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a67b0b2b-7ca0-4679-19ea-08dc3f7fd230 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A6735.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7637 Received-SPF: softfail client-ip=2a01:111:f403:2009::601; envelope-from=ankita@nvidia.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.572, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1709909828401100003 From: Ankit Agrawal ACPI spec provides a scheme to associate "Generic Initiators" [1] (e.g. heterogeneous processors and accelerators, GPUs, and I/O devices with integrated compute or DMA engines GPUs) with Proximity Domains. This is achieved using Generic Initiator Affinity Structure in SRAT. During bootup, Linux kernel parse the ACPI SRAT to determine the PXM ids and create a NUMA node for each unique PXM ID encountered. Qemu currently do not implement these structures while building SRAT. Add GI structures while building VM ACPI SRAT. The association between device and node are stored using acpi-generic-initiator object. Lookup presence of all such objects and use them to build these structures. The structure needs a PCI device handle [2] that consists of the device BDF. The vfio-pci device corresponding to the acpi-generic-initiator object is located to determine the BDF. [1] ACPI Spec 6.3, Section 5.2.16.6 [2] ACPI Spec 6.3, Table 5.80 Cc: Jonathan Cameron Cc: Alex Williamson Cc: Cedric Le Goater Reviewed-by: Jonathan Cameron Signed-off-by: Ankit Agrawal --- hw/acpi/acpi_generic_initiator.c | 77 ++++++++++++++++++++++++ hw/acpi/hmat.c | 2 +- hw/arm/virt-acpi-build.c | 3 + hw/core/numa.c | 3 +- include/hw/acpi/acpi_generic_initiator.h | 25 ++++++++ include/sysemu/numa.h | 1 + 6 files changed, 109 insertions(+), 2 deletions(-) diff --git a/hw/acpi/acpi_generic_initiator.c b/hw/acpi/acpi_generic_initia= tor.c index 130d6ae8c1..17b9a052f5 100644 --- a/hw/acpi/acpi_generic_initiator.c +++ b/hw/acpi/acpi_generic_initiator.c @@ -5,7 +5,9 @@ =20 #include "qemu/osdep.h" #include "hw/acpi/acpi_generic_initiator.h" +#include "hw/acpi/aml-build.h" #include "hw/boards.h" +#include "hw/pci/pci_device.h" #include "qemu/error-report.h" =20 typedef struct AcpiGenericInitiatorClass { @@ -47,6 +49,7 @@ static void acpi_generic_initiator_set_node(Object *obj, = Visitor *v, Error **errp) { AcpiGenericInitiator *gi =3D ACPI_GENERIC_INITIATOR(obj); + MachineState *ms =3D MACHINE(qdev_get_machine()); uint32_t value; =20 if (!visit_type_uint32(v, name, &value, errp)) { @@ -60,6 +63,7 @@ static void acpi_generic_initiator_set_node(Object *obj, = Visitor *v, } =20 gi->node =3D value; + ms->numa_state->nodes[gi->node].has_gi =3D true; } =20 static void acpi_generic_initiator_class_init(ObjectClass *oc, void *data) @@ -69,3 +73,76 @@ static void acpi_generic_initiator_class_init(ObjectClas= s *oc, void *data) object_class_property_add(oc, "node", "int", NULL, acpi_generic_initiator_set_node, NULL, NULL); } + +/* + * ACPI 6.3: + * Table 5-78 Generic Initiator Affinity Structure + */ +static void +build_srat_generic_pci_initiator_affinity(GArray *table_data, int node, + PCIDeviceHandle *handle) +{ + uint8_t index; + + build_append_int_noprefix(table_data, 5, 1); /* Type */ + build_append_int_noprefix(table_data, 32, 1); /* Length */ + build_append_int_noprefix(table_data, 0, 1); /* Reserved */ + build_append_int_noprefix(table_data, 1, 1); /* Device Handle Type: P= CI */ + build_append_int_noprefix(table_data, node, 4); /* Proximity Domain */ + + /* Device Handle - PCI */ + build_append_int_noprefix(table_data, handle->segment, 2); + build_append_int_noprefix(table_data, handle->bdf, 2); + for (index =3D 0; index < 12; index++) { + build_append_int_noprefix(table_data, 0, 1); + } + + build_append_int_noprefix(table_data, GEN_AFFINITY_ENABLED, 4); /* Fla= gs */ + build_append_int_noprefix(table_data, 0, 4); /* Reserved */ +} + +static int build_all_acpi_generic_initiators(Object *obj, void *opaque) +{ + MachineState *ms =3D MACHINE(qdev_get_machine()); + AcpiGenericInitiator *gi; + GArray *table_data =3D opaque; + PCIDeviceHandle dev_handle; + PCIDevice *pci_dev; + Object *o; + + if (!object_dynamic_cast(obj, TYPE_ACPI_GENERIC_INITIATOR)) { + return 0; + } + + gi =3D ACPI_GENERIC_INITIATOR(obj); + if (gi->node >=3D ms->numa_state->num_nodes) { + error_printf("%s: Specified node %d is invalid.\n", + TYPE_ACPI_GENERIC_INITIATOR, gi->node); + exit(1); + } + + o =3D object_resolve_path_type(gi->pci_dev, TYPE_PCI_DEVICE, NULL); + if (!o) { + error_printf("%s: Specified device must be a PCI device.\n", + TYPE_ACPI_GENERIC_INITIATOR); + exit(1); + } + + pci_dev =3D PCI_DEVICE(o); + + dev_handle.segment =3D 0; + dev_handle.bdf =3D PCI_BUILD_BDF(pci_bus_num(pci_get_bus(pci_dev)), + pci_dev->devfn); + + build_srat_generic_pci_initiator_affinity(table_data, + gi->node, &dev_handle); + + return 0; +} + +void build_srat_generic_pci_initiator(GArray *table_data) +{ + object_child_foreach_recursive(object_get_root(), + build_all_acpi_generic_initiators, + table_data); +} diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c index 3042d223c8..2242981e18 100644 --- a/hw/acpi/hmat.c +++ b/hw/acpi/hmat.c @@ -214,7 +214,7 @@ static void hmat_build_table_structs(GArray *table_data= , NumaState *numa_state) } =20 for (i =3D 0; i < numa_state->num_nodes; i++) { - if (numa_state->nodes[i].has_cpu) { + if (numa_state->nodes[i].has_cpu || numa_state->nodes[i].has_gi) { initiator_list[num_initiator++] =3D i; } } diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 8bc35a483c..a2b3a2eb25 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -58,6 +58,7 @@ #include "migration/vmstate.h" #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h" +#include "hw/acpi/acpi_generic_initiator.h" =20 #define ARM_SPI_BASE 32 =20 @@ -558,6 +559,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, Virt= MachineState *vms) } } =20 + build_srat_generic_pci_initiator(table_data); + if (ms->nvdimms_state->is_enabled) { nvdimm_build_srat(table_data); } diff --git a/hw/core/numa.c b/hw/core/numa.c index f08956ddb0..58a32f1564 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -229,7 +229,8 @@ void parse_numa_hmat_lb(NumaState *numa_state, NumaHmat= LBOptions *node, node->target, numa_state->num_nodes); return; } - if (!numa_info[node->initiator].has_cpu) { + if (!numa_info[node->initiator].has_cpu && + !numa_info[node->initiator].has_gi) { error_setg(errp, "Invalid initiator=3D%d, it isn't an " "initiator proximity domain", node->initiator); return; diff --git a/include/hw/acpi/acpi_generic_initiator.h b/include/hw/acpi/acp= i_generic_initiator.h index 16de1d3d80..a304bad73e 100644 --- a/include/hw/acpi/acpi_generic_initiator.h +++ b/include/hw/acpi/acpi_generic_initiator.h @@ -19,4 +19,29 @@ typedef struct AcpiGenericInitiator { uint16_t node; } AcpiGenericInitiator; =20 +/* + * ACPI 6.3: + * Table 5-81 Flags =E2=80=93 Generic Initiator Affinity Structure + */ +typedef enum { + /* + * If clear, the OSPM ignores the contents of the Generic + * Initiator/Port Affinity Structure. This allows system firmware + * to populate the SRAT with a static number of structures, but only + * enable them as necessary. + */ + GEN_AFFINITY_ENABLED =3D (1 << 0), +} GenericAffinityFlags; + +/* + * ACPI 6.3: + * Table 5-80 Device Handle - PCI + */ +typedef struct PCIDeviceHandle { + uint16_t segment; + uint16_t bdf; +} PCIDeviceHandle; + +void build_srat_generic_pci_initiator(GArray *table_data); + #endif diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 4173ef2afa..825cfe86bc 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -41,6 +41,7 @@ struct NodeInfo { struct HostMemoryBackend *node_memdev; bool present; bool has_cpu; + bool has_gi; uint8_t lb_info_provided; uint16_t initiator; uint8_t distance[MAX_NODES]; --=20 2.34.1 From nobody Mon May 13 05:03:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=reject dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1709909865; cv=pass; d=zohomail.com; s=zohoarc; b=dhhgniHGuJreM0E4Qdr5MoDw/6RBZtoGjSK22hhRmcu87RbWwmRXLVZkFWpJl8H8HKwykCy/Nd3AmFYDtYyirNhH+ZDMPitTJ7AnBUMDqCv6PA+MkwWEkiAxTTQU/BHBUu0ydzu7a7Gpkyo+xyrF3hkX7BVlFPJw1R+HDaNaza8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709909865; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=46TmEwnba3f9pvo72kaw4E9+tlqVVNLLm5gs8smzUmY=; b=T+tnBcorVtDfQdSURfb8JLAtHnkKhcEHjGB69fr1b8LGbOEdZoSctzDnnQoTdBII0ZCwPtVosBKBv8OLSM0JvMpKbiHBRniPZcYhddIwSBBqcbtFwNudv1UR3J/2fFIrvFnHQkGKDIQzYGxbtBflnCrK4G22tG35I5iqFe++W7E= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; 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; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709909865564598.9752894171028; Fri, 8 Mar 2024 06:57:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ribdm-000377-BD; Fri, 08 Mar 2024 09:56:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribdg-0002tJ-E9; Fri, 08 Mar 2024 09:56:01 -0500 Received: from mail-dm6nam04on20600.outbound.protection.outlook.com ([2a01:111:f403:2409::600] helo=NAM04-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ribdc-0005Ix-NC; Fri, 08 Mar 2024 09:55:58 -0500 Received: from SN1PR12CA0105.namprd12.prod.outlook.com (2603:10b6:802:21::40) by SA3PR12MB7879.namprd12.prod.outlook.com (2603:10b6:806:306::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.26; Fri, 8 Mar 2024 14:55:49 +0000 Received: from SN1PEPF0002636A.namprd02.prod.outlook.com (2603:10b6:802:21:cafe::8f) by SN1PR12CA0105.outlook.office365.com (2603:10b6:802:21::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.27 via Frontend Transport; Fri, 8 Mar 2024 14:55:49 +0000 Received: from mail.nvidia.com (216.228.118.233) by SN1PEPF0002636A.mail.protection.outlook.com (10.167.241.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Fri, 8 Mar 2024 14:55:49 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Fri, 8 Mar 2024 06:55:27 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Fri, 8 Mar 2024 06:55:26 -0800 Received: from host-10-63-191-31.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend Transport; Fri, 8 Mar 2024 06:55:26 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JM7s9lSMG2srz2uypziyWiHMJuxiBXkGoGU4YkNz14DwVN5+ugR6rYup23z5msj57JdQ0V7fLLKZEfcD0KLXe2/L2nNoPcB0yqrIVRB7s0aQhlvsI33XvfbrMj2VNCWBLWgmQrbGa6pt+akDXafqtjz8CjHC3k/4fUnv31vm70U8bQtXw/eQ9rwK6mNECNT8he0PlQ4l9nGttGeVgdF0e4X1gzIWq9wahFiWSQ3UOSK9Mahha0WHaquql4IVdvUlhmZEeWLvT/2KI6n7N8MrHaJu2wIHT37jYyFUiRIXsm56jHp1KTDb5WAGe5uJLaIj2kGRB146ewB5qkYOtnKhnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=46TmEwnba3f9pvo72kaw4E9+tlqVVNLLm5gs8smzUmY=; b=g9kBwql1wvQXtzIM2D6nOLnWVn10Nn8St3SkaXhAAwfYZ0pCDvNFcCRA1ofidDQ6svoIDCSbt4TltJR7+UAe6sPFcfq3MMO82lXHVh378E/Y7v113VrzvfcvuhJN+Fs1Ly2TIR4qLfODEYF07cRcQc61xIrBDaLJelKmc03FT+l4ZFIxLeLSINPKtkwsnt6wUqvFF3xX/5/tQZOwXvFyTTrrtYloeCoYCtBh3sadvjH41gMHQbjbIH3VVSgdUhnNkLVEMQUY8vudW6pstSFjHiRi4fvvmr3oEUMg0ZFUDgoCPL7asZQdjJ30S1N87QLhj13Au14sfoLleTcNQUW9pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=46TmEwnba3f9pvo72kaw4E9+tlqVVNLLm5gs8smzUmY=; b=SzT7JpLTvUZyGncsbHaNDCqPrAhn/nYtSCouY1kKJy1Jn8OYoiPYIyoSfDYeuF+H9VOWjwN5U2Gy6UHECrvTzUUGIvNF9W+mMN0M/4YSUJJSmUHo6ojpkLW0cDDmtz5BTuC5QxVtYw+JzPKUKzxNACOFA9UDdNeo6ixkzl/TBHspKTRMWD1drfLM+JlGo6ro/2MR/oQdnuP3QY22HHzAb9AWpo+zIpAtS8W1D21ydF3Qbr5T/TirLoGkdVbAs+iwPFXWoP18Zfgp17ODam70I1g88W73H/iOK37bGXNQxr1wZiWd0P/emj/n1OoBA5JvF7IGcIfqMOc4HFe7u1F/0w== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; 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 (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C From: To: , , , , , , , , , , , , , , , , , , , CC: , , , , , , , , , , Subject: [PATCH v9 3/3] hw/i386/acpi-build: Add support for SRAT Generic Initiator structures Date: Fri, 8 Mar 2024 14:55:25 +0000 Message-ID: <20240308145525.10886-4-ankita@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308145525.10886-1-ankita@nvidia.com> References: <20240308145525.10886-1-ankita@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636A:EE_|SA3PR12MB7879:EE_ X-MS-Office365-Filtering-Correlation-Id: adbf5c4d-7c14-48fe-05f9-08dc3f7fd7f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ErDLEGwXvoyqnPpb0J+b382RG06j9bQ7AaHVMYGKYu87vAsXxQP9jOrYlqECd2VwK8pP86sqAM+bhWmUrrDuJOSEzbpJ45deH8M0MvPAA4mCgOJD+2uvxvKGu0L7xBfMQcOEKptIO6wlmLLgQ93c777hkodNaD/+Jae5UhXepnZ4c44XAL74sbOiWNi62aEP7nvSuDmzk33RHJmWgst7yLzO2iXqRN0epBMK/O1NkSQc+re7w733zKAZW8Q9+ro1ie0oITh9QnQRcsGsOyglHdy/TEQlDuWB1WjgcWDCRnaoQ5A+7R3SQddXD0ZDGr2SfZ5SS1gkAN582o1H/UikKvLnrB16JLQQB04VT3JVrgM9yPK0OYVb6Dxo7aFsBdsJDf267NQJMA0HPFW4qt/sPetSmBm10D4Vu2Soj6bnLQGk9fAyunnHkMvzKhu+SDuJ+zAj+PnMq5h0g4XyMJhWSdz4pKF0hpwL2vj7PWgu0nZjy5GALyS/jA4skTkPkWHG68lj1acYFj8ffxGYzANpigK7h3v+LwYyyrgbDxDop3x2IXyDB3pTQ2zf9FkGn06GKTxBfqDrq8dA6wxY0EG0ci+QRmF/kqj7NHbTjeTgcDrW31UCwCPH+XTdJIoB0jVjXzDsO7Zz3uqTyp4p8m19dJKo6BHEWApzMWkJ1NYXjJ6u1YMxetJR2o1z7t+ofbNoFwUwb4FM2P+BmEJOHaTdFunJV/r0Jf5ZtMiXOVtvPCsXQ4lhZGoNWmy3p6dscVLZPy0O9u7d/QYol3AvOmRT4Q== X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(36860700004)(376005)(82310400014)(7416005)(921011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 14:55:49.5179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: adbf5c4d-7c14-48fe-05f9-08dc3f7fd7f9 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7879 Received-SPF: softfail client-ip=2a01:111:f403:2409::600; envelope-from=ankita@nvidia.com; helo=NAM04-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.572, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1709909866567100007 Content-Type: text/plain; charset="utf-8" From: Ankit Agrawal The acpi-generic-initiator object is added to allow a host device to be linked with a NUMA node. Qemu use it to build the SRAT Generic Initiator Affinity structure [1]. Add support for i386. [1] ACPI Spec 6.3, Section 5.2.16.6 Suggested-by: Jonathan Cameron Signed-off-by: Ankit Agrawal Reviewed-by: Jonathan Cameron --- hw/i386/acpi-build.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1e178341de..b65202fc07 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -68,6 +68,7 @@ #include "hw/acpi/utils.h" #include "hw/acpi/pci.h" #include "hw/acpi/cxl.h" +#include "hw/acpi/acpi_generic_initiator.h" =20 #include "qom/qom-qobject.h" #include "hw/i386/amd_iommu.h" @@ -2056,6 +2057,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, Ma= chineState *machine) build_srat_memory(table_data, 0, 0, 0, MEM_AFFINITY_NOFLAGS); } =20 + build_srat_generic_pci_initiator(table_data); + /* * Entry is required for Windows to enable memory hotplug in OS * and for Linux to enable SWIOTLB when booted with less than --=20 2.34.1